diff --git a/PianoAnalytics-AppExtension.podspec b/PianoAnalytics-AppExtension.podspec
index ed5ec3f..11f042b 100644
--- a/PianoAnalytics-AppExtension.podspec
+++ b/PianoAnalytics-AppExtension.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name = 'PianoAnalytics-AppExtension'
-    s.version = '3.0.2'
+    s.version = '3.0.3'
     s.summary = 'Piano Analytics solution for extension Apple devices'
     s.homepage = 'https://github.com/at-internet/piano-analytics-apple'
     s.documentation_url = 'https://developers.atinternet-solutions.com/piano-analytics'
diff --git a/PianoAnalytics.podspec b/PianoAnalytics.podspec
index 4c51662..8a50404 100644
--- a/PianoAnalytics.podspec
+++ b/PianoAnalytics.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name = 'PianoAnalytics'
-    s.version = '3.0.2'
+    s.version = '3.0.3'
     s.summary = 'Piano Analytics library for Apple devices'
     s.homepage = 'https://github.com/at-internet/piano-analytics-apple'
     s.documentation_url = 'https://developers.atinternet-solutions.com/piano-analytics'
diff --git a/PianoAnalytics.xcodeproj/project.pbxproj b/PianoAnalytics.xcodeproj/project.pbxproj
index dc98312..e1af70c 100644
--- a/PianoAnalytics.xcodeproj/project.pbxproj
+++ b/PianoAnalytics.xcodeproj/project.pbxproj
@@ -213,7 +213,7 @@
 			name = Products;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		OBJ_5 /*  */ = {
+		OBJ_5 = {
 			isa = PBXGroup;
 			children = (
 				OBJ_6 /* Package.swift */,
@@ -225,7 +225,6 @@
 				OBJ_53 /* README.md */,
 				OBJ_54 /* PianoAnalytics-AppExtension.podspec */,
 			);
-			name = "";
 			sourceTree = "<group>";
 		};
 		OBJ_7 /* Sources */ = {
@@ -239,14 +238,14 @@
 		OBJ_8 /* PianoAnalytics */ = {
 			isa = PBXGroup;
 			children = (
-				OBJ_9 /* default.json */,
 				OBJ_10 /* AVInsights */,
-				OBJ_12 /* Configuration.swift */,
 				OBJ_13 /* Core */,
+				OBJ_24 /* Steps */,
+				OBJ_12 /* Configuration.swift */,
+				OBJ_9 /* default.json */,
 				OBJ_21 /* Event.swift */,
 				OBJ_22 /* Model.swift */,
 				OBJ_23 /* PianoAnalytics.swift */,
-				OBJ_24 /* Steps */,
 				OBJ_38 /* User.swift */,
 			);
 			name = PianoAnalytics;
@@ -320,7 +319,7 @@
 			knownRegions = (
 				en,
 			);
-			mainGroup = OBJ_5 /*  */;
+			mainGroup = OBJ_5;
 			productRefGroup = OBJ_48 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
diff --git a/Sources/PianoAnalytics/Core/Constants.swift b/Sources/PianoAnalytics/Core/Constants.swift
index 03f717e..944fcf1 100644
--- a/Sources/PianoAnalytics/Core/Constants.swift
+++ b/Sources/PianoAnalytics/Core/Constants.swift
@@ -358,7 +358,7 @@ public struct PA {
                     "device_timestamp_utc"
                 ]]
                 static let ForbiddenProperties: [String: Set<String>] = [:]
-                static let AllowedStorage: Set<String> = [PA.Privacy.Storage.Crash, PA.Privacy.Storage.Privacy, PA.Privacy.Storage.User]
+                static let AllowedStorage: Set<String> = [PA.Privacy.Storage.Crash, PA.Privacy.Storage.Privacy, PA.Privacy.Storage.User, PA.Privacy.Storage.VisitorId]
             }
         }
 
diff --git a/Sources/PianoAnalytics/Steps/InternalContextPropertiesStep.swift b/Sources/PianoAnalytics/Steps/InternalContextPropertiesStep.swift
index 3b65461..b9f1b13 100644
--- a/Sources/PianoAnalytics/Steps/InternalContextPropertiesStep.swift
+++ b/Sources/PianoAnalytics/Steps/InternalContextPropertiesStep.swift
@@ -74,7 +74,7 @@ final class InternalContextPropertiesStep: Step {
             ManufacturerProperty: Manufacturer,
             String(format: OsPropertiesFormat, "group"): osName,
             String(format: OsPropertiesFormat, "version"): osVersion,
-            String(format: OsPropertiesFormat, "name"): String(format: "%@ %@", osName, osVersion)
+            OsProperty: String(format: "%@ %@", osName, osVersion)
         ]
     }
 
@@ -116,14 +116,15 @@ final class InternalContextPropertiesStep: Step {
     static let DeviceScreenPropertiesFormat = "device_screen%@"
     static let DeviceScreenDiagonalProperty = String(format: DeviceScreenPropertiesFormat, "_diagonal")
     static let AppVersionProperty = "app_version"
-    static let ManufacturerProperty = "manufacturer"
-    static let ModelProperty = "model"
+    static let ManufacturerProperty = "device_manufacturer"
+    static let ModelProperty = "device_model"
+    static let OsProperty = "os"
     static let OsPropertiesFormat = "os_%@"
     static let EventCollectionPropertiesFormat = "event_collection_%@"
     static let BrowserLanguagePropertiesFormat = "browser_language%@"
 
     private static let Manufacturer = "Apple"
-    private static let EventCollectionVersion = "3.0.2"
+    private static let EventCollectionVersion = "3.0.3"
 
     #if os(tvOS)
     private static let Platform = "tvOS"