diff --git a/tools/Az.Tools.Predictor/Az.Tools.Predictor.Test/AzPredictorTelemetryTests.cs b/tools/Az.Tools.Predictor/Az.Tools.Predictor.Test/AzPredictorTelemetryTests.cs
index b5f225623890..463e028f212d 100644
--- a/tools/Az.Tools.Predictor/Az.Tools.Predictor.Test/AzPredictorTelemetryTests.cs
+++ b/tools/Az.Tools.Predictor/Az.Tools.Predictor.Test/AzPredictorTelemetryTests.cs
@@ -55,6 +55,12 @@ public AzPredictorTelemetryTests(ModelFixture modelFixture)
         [InlineData(@"C:\Users\MyName\exe")]
         [InlineData(@"az storage")]
         [InlineData(@"get")]
+        [InlineData(@"-StorageAccountKey""xxx""NewAzStorageContainer -context xxx")]
+        [InlineData(@"-StorageAccountKey\""xxx\""NewAzStorageContainer -context xxx")]
+        [InlineData(@"-StorageAccountKey""xxx""New-AzStorageContainer -context xxx")]
+        [InlineData(@"New-AzureStorageContext-StorageAccountName ""xxx"" -StorageAccountKey ""xxx""")]
+        [InlineData(@"sig=xxxxxxxxxxx/Sensor-Azure")]
+        [InlineData(@"sig=Signature/Test-Sensor-Azu")]
         public async Task VerifyOnCommandLineAcceptedForOneUnsupportedCommandHistory(string inputData)
         {
             var expectedTelemetryCount = 2;
@@ -151,6 +157,7 @@ public async Task VerifyOnCommandLineAcceptedForOneSupportedCommandWithoutParame
         [InlineData("Get-AzRoleAssignment -ObjectId ***", "Remove-AzRoleAssignment -RoleDefinitionId (Get-AzRoleAssignment -ObjectId xxxx)")]
         [InlineData("Get-AzResourceGroup -Location:***", "Get-AzResourceGroup rg1 -Location:WestUS3")]
         [InlineData("Get-AzResourceGroup", "Get-AzResourceGroup rg1 WestUS3")]
+        [InlineData("New-AzureStorageContext -StorageAccountKey *** -StorageAccountName ***", @"New-AzureStorageContext -StorageAccountName ""accountName"" -StorageAccountKey ""accountKey""")]
         public async Task VerifyOnCommandLineAcceptedForOneSupportedCommandWithParameter(string expectedValue, string inputData)
         {
             var expectedTelemetryCount = 2;
@@ -556,8 +563,15 @@ public async Task VerifyOnCommandLineAcceptedException()
         [InlineData("Set-Az", "Set-Az")]
         [InlineData("Get-azR", "Get-azR")]
         [InlineData("start_of_snippet", "NonVerb-AzResource")]
-        [InlineData("start_of_snippet", "Get")]
-        [InlineData("start_of_snippet", "Set-")]
+        [InlineData("Get", "Get")]
+        [InlineData("Set-", "Set-")]
+        [InlineData("New-AzureStorageContext -StorageAccountKey *** -StorageAccountName ***", @"New-AzureStorageContext -StorageAccountName ""accountName"" -StorageAccountKey ""accountKey""")]
+        [InlineData("start_of_snippet", @"-StorageAccountKey""xxx""NewAzStorageContainer -context xxx")]
+        [InlineData("start_of_snippet", @"-StorageAccountKey\""xxx\""NewAzStorageContainer -context xxx")]
+        [InlineData("start_of_snippet", @"-StorageAccountKey""xxx""New-AzStorageContainer -context xxx")]
+        [InlineData("start_of_snippet", @"New-AzureStorageContext-StorageAccountName ""xxx"" -StorageAccountKey ""xxx""")]
+        [InlineData("start_of_snippet", @"sig=xxxxxxxxxxx/Sensor-Azure")]
+        [InlineData("start_of_snippet", @"sig=Signature/Test-Sensor-Azu")]
         public void VerifyUserInputInGetSuggestionEvent(string expectedUserInput, string input)
         {
             var expectedTelemetryCount = 1;
diff --git a/tools/Az.Tools.Predictor/Az.Tools.Predictor/Az.Tools.Predictor.psd1 b/tools/Az.Tools.Predictor/Az.Tools.Predictor/Az.Tools.Predictor.psd1
index 9e702b3e6006..56c4a8e25f7b 100644
--- a/tools/Az.Tools.Predictor/Az.Tools.Predictor/Az.Tools.Predictor.psd1
+++ b/tools/Az.Tools.Predictor/Az.Tools.Predictor/Az.Tools.Predictor.psd1
@@ -11,7 +11,7 @@
 RootModule = 'Az.Tools.Predictor.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.1.0'
+ModuleVersion = '1.1.1'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core'
diff --git a/tools/Az.Tools.Predictor/Az.Tools.Predictor/ChangeLog.md b/tools/Az.Tools.Predictor/Az.Tools.Predictor/ChangeLog.md
index 4d7e4d05fcdf..228b4791a573 100644
--- a/tools/Az.Tools.Predictor/Az.Tools.Predictor/ChangeLog.md
+++ b/tools/Az.Tools.Predictor/Az.Tools.Predictor/ChangeLog.md
@@ -19,6 +19,9 @@
 -->
 ## Upcoming Release
 
+## Version 1.1.1
+* Updated data collection mechanism
+
 ## Version 1.1.0
 * Updated data collection mechanism
 
diff --git a/tools/Az.Tools.Predictor/Az.Tools.Predictor/Telemetry/GetSuggestionTelemetryData.cs b/tools/Az.Tools.Predictor/Az.Tools.Predictor/Telemetry/GetSuggestionTelemetryData.cs
index 80981bf123e9..c7f634454792 100644
--- a/tools/Az.Tools.Predictor/Az.Tools.Predictor/Telemetry/GetSuggestionTelemetryData.cs
+++ b/tools/Az.Tools.Predictor/Az.Tools.Predictor/Telemetry/GetSuggestionTelemetryData.cs
@@ -36,7 +36,7 @@ public sealed class GetSuggestionTelemetryData : ITelemetryData
         /// <summary>
         /// The telemetry property name for "Prediction".
         /// </summary>
-        public const string PropertyNamePrediction = "Prediction";
+        public const string PropertyNamePrediction = "Prediction2";
 
         /// <summary>
         /// The telemetry property name for "SuggestionSessionId".
diff --git a/tools/Az.Tools.Predictor/Az.Tools.Predictor/Telemetry/HistoryTelemetryData.cs b/tools/Az.Tools.Predictor/Az.Tools.Predictor/Telemetry/HistoryTelemetryData.cs
index bc441e3a7f6e..39df2372bb67 100644
--- a/tools/Az.Tools.Predictor/Az.Tools.Predictor/Telemetry/HistoryTelemetryData.cs
+++ b/tools/Az.Tools.Predictor/Az.Tools.Predictor/Telemetry/HistoryTelemetryData.cs
@@ -24,7 +24,7 @@ public sealed class HistoryTelemetryData : ITelemetryData
         /// <summary>
         /// The telemetry property name for "Command".
         /// </summary>
-        public const string PropertyNameCommand = "Command";
+        public const string PropertyNameCommand = "Command2";
 
         /// <summary>
         /// The telemetry property name for "Success".
diff --git a/tools/Az.Tools.Predictor/Directory.Build.props b/tools/Az.Tools.Predictor/Directory.Build.props
index ca534589d0b5..36f0cb7612db 100644
--- a/tools/Az.Tools.Predictor/Directory.Build.props
+++ b/tools/Az.Tools.Predictor/Directory.Build.props
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Version>1.1.0</Version>
+    <Version>1.1.1</Version>
     <Authors>Microsoft Corporation</Authors>
     <Company>Microsoft Corporation</Company>
     <Copyright>Microsoft Corporation. All rights reserved.</Copyright>