diff --git a/.gitignore b/.gitignore
index ad42991..fd7eecf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,4 +68,7 @@ fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
 IDEWorkspaceChecks.plist
-*.DS_Store
\ No newline at end of file
+*.DS_Store
+
+
+RudderConfig.plist
\ No newline at end of file
diff --git a/Example/Podfile b/Example/Podfile
index 14e6d00..0484729 100644
--- a/Example/Podfile
+++ b/Example/Podfile
@@ -5,11 +5,6 @@ platform :ios, '10.0'
 target 'Rudder-Appsflyer_Example' do
   pod 'Rudder-Appsflyer', :path => '../'
 
-  target 'Rudder-Appsflyer_Tests' do
-    inherit! :search_paths
-
-    pod 'FBSnapshotTestCase'
-  end
   
   post_install do |installer|
     installer.pods_project.build_configurations.each do |config|
@@ -17,4 +12,4 @@ target 'Rudder-Appsflyer_Example' do
     end
   end
   
-end
+end
\ No newline at end of file
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
index edf2f61..4f3d100 100644
--- a/Example/Podfile.lock
+++ b/Example/Podfile.lock
@@ -1,25 +1,18 @@
 PODS:
-  - AppsFlyerFramework (6.9.1):
-    - AppsFlyerFramework/Main (= 6.9.1)
-  - AppsFlyerFramework/Main (6.9.1)
-  - FBSnapshotTestCase (2.1.4):
-    - FBSnapshotTestCase/SwiftSupport (= 2.1.4)
-  - FBSnapshotTestCase/Core (2.1.4)
-  - FBSnapshotTestCase/SwiftSupport (2.1.4):
-    - FBSnapshotTestCase/Core
-  - Rudder (1.8.0)
-  - Rudder-Appsflyer (2.1.0):
-    - AppsFlyerFramework (~> 6.9.1)
-    - Rudder (~> 1.0)
+  - AppsFlyerFramework (6.10.1):
+    - AppsFlyerFramework/Main (= 6.10.1)
+  - AppsFlyerFramework/Main (6.10.1)
+  - Rudder (1.13.0)
+  - Rudder-Appsflyer (2.2.0):
+    - AppsFlyerFramework (~> 6.10)
+    - Rudder (~> 1.12)
 
 DEPENDENCIES:
-  - FBSnapshotTestCase
   - Rudder-Appsflyer (from `../`)
 
 SPEC REPOS:
   trunk:
     - AppsFlyerFramework
-    - FBSnapshotTestCase
     - Rudder
 
 EXTERNAL SOURCES:
@@ -27,11 +20,10 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  AppsFlyerFramework: dc9aa675faa8e1a2ed40fb295d3c5408ee2b972a
-  FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
-  Rudder: 0a5272646aa3b89295526cea2bf54d092044848a
-  Rudder-Appsflyer: e1f26d1d24d3a9351c7079b3f9c87815680da426
+  AppsFlyerFramework: 88a6eed37ad52bcee4ad74232efa8e22809d06c9
+  Rudder: 840bf4dfd9816ce6a82cb8870f1a2d4a44ed2652
+  Rudder-Appsflyer: 94b945c1dff963d5e655719980453ccbb9c083eb
 
-PODFILE CHECKSUM: 72f0e785b3e2e2c1b9276c5aee9c1558d47208ad
+PODFILE CHECKSUM: 49c77f0049a9ff4b4e9202c3918c8ff06a57b815
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.0
diff --git a/Example/Rudder-Appsflyer.xcodeproj/project.pbxproj b/Example/Rudder-Appsflyer.xcodeproj/project.pbxproj
index 759c12e..507aa0f 100644
--- a/Example/Rudder-Appsflyer.xcodeproj/project.pbxproj
+++ b/Example/Rudder-Appsflyer.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		54ABD99D4E454E0BF0B20DCA /* Pods_Rudder_Appsflyer_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 75D3CAB1638F53CA7265705D /* Pods_Rudder_Appsflyer_Tests.framework */; };
 		6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
 		6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; };
 		6003F592195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
@@ -21,9 +20,13 @@
 		6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
 		6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; };
 		6003F5BC195388D20070C39A /* Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F5BB195388D20070C39A /* Tests.m */; };
-		6CE5DED7F4D6B8D05D699640 /* Pods_Rudder_Appsflyer_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5286571A438A84D7BB640B2 /* Pods_Rudder_Appsflyer_Example.framework */; };
 		71719F9F1E33DC2100824A3D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71719F9D1E33DC2100824A3D /* LaunchScreen.storyboard */; };
 		873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */; };
+		C1EC4B6E45C9733D3F6310BD /* Pods_Rudder_Appsflyer_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A5779B4112B227674BEB6A0 /* Pods_Rudder_Appsflyer_Example.framework */; };
+		F63C976529E80C04008C81C5 /* AppTrackingTransparency.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F63C976429E80C04008C81C5 /* AppTrackingTransparency.framework */; };
+		F694A85829E7C973006F53CC /* RudderConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = F694A85729E7C973006F53CC /* RudderConfig.swift */; };
+		F694A85A29E7C9A7006F53CC /* RudderConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = F694A85929E7C9A7006F53CC /* RudderConfig.plist */; };
+		F694A85C29E7E610006F53CC /* SampleRudderConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = F694A85B29E7E610006F53CC /* SampleRudderConfig.plist */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -37,10 +40,8 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		1BD3AE254B2E89F62B19D972 /* Pods-Rudder-Appsflyer_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Rudder-Appsflyer_Tests.debug.xcconfig"; path = "Target Support Files/Pods-Rudder-Appsflyer_Tests/Pods-Rudder-Appsflyer_Tests.debug.xcconfig"; sourceTree = "<group>"; };
-		22A0D40EE60E017AFC71E313 /* Pods-Rudder-Appsflyer_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Rudder-Appsflyer_Example.release.xcconfig"; path = "Target Support Files/Pods-Rudder-Appsflyer_Example/Pods-Rudder-Appsflyer_Example.release.xcconfig"; sourceTree = "<group>"; };
-		34BB885B8615589B3E9D1EBC /* Pods-Rudder-Appsflyer_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Rudder-Appsflyer_Tests.release.xcconfig"; path = "Target Support Files/Pods-Rudder-Appsflyer_Tests/Pods-Rudder-Appsflyer_Tests.release.xcconfig"; sourceTree = "<group>"; };
 		4F6BF5867985B17F530A4FAB /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
+		5776857352FC3BAAA13BAE09 /* Pods-Rudder-Appsflyer_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Rudder-Appsflyer_Example.debug.xcconfig"; path = "Target Support Files/Pods-Rudder-Appsflyer_Example/Pods-Rudder-Appsflyer_Example.debug.xcconfig"; sourceTree = "<group>"; };
 		5DEFB86FC76D20A863F9AD7A /* Rudder-Appsflyer.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = "Rudder-Appsflyer.podspec"; path = "../Rudder-Appsflyer.podspec"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		6003F58A195388D20070C39A /* Rudder-Appsflyer_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Rudder-Appsflyer_Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		6003F58D195388D20070C39A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -61,12 +62,16 @@
 		6003F5B9195388D20070C39A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		6003F5BB195388D20070C39A /* Tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = "<group>"; };
 		606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = "<group>"; };
+		6A5779B4112B227674BEB6A0 /* Pods_Rudder_Appsflyer_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Rudder_Appsflyer_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		71719F9E1E33DC2100824A3D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		723A1422FB77ECE447F73246 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
-		75D3CAB1638F53CA7265705D /* Pods_Rudder_Appsflyer_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Rudder_Appsflyer_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		7D3FAC1D808B0A77C9789F94 /* Pods-Rudder-Appsflyer_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Rudder-Appsflyer_Example.release.xcconfig"; path = "Target Support Files/Pods-Rudder-Appsflyer_Example/Pods-Rudder-Appsflyer_Example.release.xcconfig"; sourceTree = "<group>"; };
 		873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		D2BD9542964781980025C44A /* Pods-Rudder-Appsflyer_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Rudder-Appsflyer_Example.debug.xcconfig"; path = "Target Support Files/Pods-Rudder-Appsflyer_Example/Pods-Rudder-Appsflyer_Example.debug.xcconfig"; sourceTree = "<group>"; };
-		F5286571A438A84D7BB640B2 /* Pods_Rudder_Appsflyer_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Rudder_Appsflyer_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		F63C976429E80C04008C81C5 /* AppTrackingTransparency.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppTrackingTransparency.framework; path = System/Library/Frameworks/AppTrackingTransparency.framework; sourceTree = SDKROOT; };
+		F694A85629E7C972006F53CC /* Rudder-Appsflyer_Example-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Rudder-Appsflyer_Example-Bridging-Header.h"; sourceTree = "<group>"; };
+		F694A85729E7C973006F53CC /* RudderConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RudderConfig.swift; sourceTree = "<group>"; };
+		F694A85929E7C9A7006F53CC /* RudderConfig.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = RudderConfig.plist; sourceTree = "<group>"; };
+		F694A85B29E7E610006F53CC /* SampleRudderConfig.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = SampleRudderConfig.plist; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -74,10 +79,11 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F63C976529E80C04008C81C5 /* AppTrackingTransparency.framework in Frameworks */,
 				6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */,
 				6003F592195388D20070C39A /* UIKit.framework in Frameworks */,
 				6003F58E195388D20070C39A /* Foundation.framework in Frameworks */,
-				6CE5DED7F4D6B8D05D699640 /* Pods_Rudder_Appsflyer_Example.framework in Frameworks */,
+				C1EC4B6E45C9733D3F6310BD /* Pods_Rudder_Appsflyer_Example.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -88,7 +94,6 @@
 				6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */,
 				6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */,
 				6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */,
-				54ABD99D4E454E0BF0B20DCA /* Pods_Rudder_Appsflyer_Tests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -98,10 +103,8 @@
 		031A6A9332EF8D7C8B270402 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				D2BD9542964781980025C44A /* Pods-Rudder-Appsflyer_Example.debug.xcconfig */,
-				22A0D40EE60E017AFC71E313 /* Pods-Rudder-Appsflyer_Example.release.xcconfig */,
-				1BD3AE254B2E89F62B19D972 /* Pods-Rudder-Appsflyer_Tests.debug.xcconfig */,
-				34BB885B8615589B3E9D1EBC /* Pods-Rudder-Appsflyer_Tests.release.xcconfig */,
+				5776857352FC3BAAA13BAE09 /* Pods-Rudder-Appsflyer_Example.debug.xcconfig */,
+				7D3FAC1D808B0A77C9789F94 /* Pods-Rudder-Appsflyer_Example.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -130,12 +133,12 @@
 		6003F58C195388D20070C39A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				F63C976429E80C04008C81C5 /* AppTrackingTransparency.framework */,
 				6003F58D195388D20070C39A /* Foundation.framework */,
 				6003F58F195388D20070C39A /* CoreGraphics.framework */,
 				6003F591195388D20070C39A /* UIKit.framework */,
 				6003F5AF195388D20070C39A /* XCTest.framework */,
-				F5286571A438A84D7BB640B2 /* Pods_Rudder_Appsflyer_Example.framework */,
-				75D3CAB1638F53CA7265705D /* Pods_Rudder_Appsflyer_Tests.framework */,
+				6A5779B4112B227674BEB6A0 /* Pods_Rudder_Appsflyer_Example.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -143,6 +146,7 @@
 		6003F593195388D20070C39A /* Example for Rudder-Appsflyer */ = {
 			isa = PBXGroup;
 			children = (
+				F694A85529E7C961006F53CC /* RudderConfig */,
 				6003F59C195388D20070C39A /* _AppDelegate.h */,
 				6003F59D195388D20070C39A /* _AppDelegate.m */,
 				873B8AEA1B1F5CCA007FD442 /* Main.storyboard */,
@@ -196,6 +200,17 @@
 			name = "Podspec Metadata";
 			sourceTree = "<group>";
 		};
+		F694A85529E7C961006F53CC /* RudderConfig */ = {
+			isa = PBXGroup;
+			children = (
+				F694A85729E7C973006F53CC /* RudderConfig.swift */,
+				F694A85629E7C972006F53CC /* Rudder-Appsflyer_Example-Bridging-Header.h */,
+				F694A85929E7C9A7006F53CC /* RudderConfig.plist */,
+				F694A85B29E7E610006F53CC /* SampleRudderConfig.plist */,
+			);
+			path = RudderConfig;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -203,11 +218,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "Rudder-Appsflyer_Example" */;
 			buildPhases = (
-				539DF8B187145F46B183DC6D /* [CP] Check Pods Manifest.lock */,
+				2D44192878DC8AF79EA1ACA5 /* [CP] Check Pods Manifest.lock */,
 				6003F586195388D20070C39A /* Sources */,
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
-				15472CFA83B647175C323FD6 /* [CP] Embed Pods Frameworks */,
+				C2CE48AFFF8CD4D8FB570717 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -222,11 +237,9 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 6003F5C2195388D20070C39A /* Build configuration list for PBXNativeTarget "Rudder-Appsflyer_Tests" */;
 			buildPhases = (
-				7928E2DA6643CA3279EE5B95 /* [CP] Check Pods Manifest.lock */,
 				6003F5AA195388D20070C39A /* Sources */,
 				6003F5AB195388D20070C39A /* Frameworks */,
 				6003F5AC195388D20070C39A /* Resources */,
-				B1A3A734AA11370D917B1B12 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -248,6 +261,11 @@
 				LastUpgradeCheck = 0720;
 				ORGANIZATIONNAME = arnabp92;
 				TargetAttributes = {
+					6003F589195388D20070C39A = {
+						DevelopmentTeam = WPX9KRKA8B;
+						LastSwiftMigration = 1430;
+						ProvisioningStyle = Automatic;
+					};
 					6003F5AD195388D20070C39A = {
 						TestTargetID = 6003F589195388D20070C39A;
 					};
@@ -279,6 +297,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */,
+				F694A85A29E7C9A7006F53CC /* RudderConfig.plist in Resources */,
+				F694A85C29E7E610006F53CC /* SampleRudderConfig.plist in Resources */,
 				71719F9F1E33DC2100824A3D /* LaunchScreen.storyboard in Resources */,
 				6003F5A9195388D20070C39A /* Images.xcassets in Resources */,
 				6003F598195388D20070C39A /* InfoPlist.strings in Resources */,
@@ -296,25 +316,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		15472CFA83B647175C323FD6 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Rudder-Appsflyer_Example/Pods-Rudder-Appsflyer_Example-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/Rudder/Rudder.framework",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Rudder.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Rudder-Appsflyer_Example/Pods-Rudder-Appsflyer_Example-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		539DF8B187145F46B183DC6D /* [CP] Check Pods Manifest.lock */ = {
+		2D44192878DC8AF79EA1ACA5 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -336,44 +338,22 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		7928E2DA6643CA3279EE5B95 /* [CP] Check Pods Manifest.lock */ = {
+		C2CE48AFFF8CD4D8FB570717 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Rudder-Appsflyer_Tests-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		B1A3A734AA11370D917B1B12 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Rudder-Appsflyer_Tests/Pods-Rudder-Appsflyer_Tests-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/FBSnapshotTestCase/FBSnapshotTestCase.framework",
+				"${PODS_ROOT}/Target Support Files/Pods-Rudder-Appsflyer_Example/Pods-Rudder-Appsflyer_Example-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/Rudder/Rudder.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSnapshotTestCase.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Rudder.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Rudder-Appsflyer_Tests/Pods-Rudder-Appsflyer_Tests-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Rudder-Appsflyer_Example/Pods-Rudder-Appsflyer_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -384,6 +364,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				6003F59E195388D20070C39A /* _AppDelegate.m in Sources */,
+				F694A85829E7C973006F53CC /* RudderConfig.swift in Sources */,
 				6003F5A7195388D20070C39A /* _ViewController.m in Sources */,
 				6003F59A195388D20070C39A /* main.m in Sources */,
 			);
@@ -512,17 +493,24 @@
 		};
 		6003F5C0195388D20070C39A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D2BD9542964781980025C44A /* Pods-Rudder-Appsflyer_Example.debug.xcconfig */;
+			baseConfigurationReference = 5776857352FC3BAAA13BAE09 /* Pods-Rudder-Appsflyer_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = WPX9KRKA8B;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Rudder-Appsflyer/Rudder-Appsflyer-Prefix.pch";
 				INFOPLIST_FILE = "Rudder-Appsflyer/Rudder-Appsflyer-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.3;
 				MODULE_NAME = ExampleApp;
 				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.rudderstack.ios.appsflyer.device-mode";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_OBJC_BRIDGING_HEADER = "Rudder-Appsflyer/RudderConfig/Rudder-Appsflyer_Example-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 4.0;
 				WRAPPER_EXTENSION = app;
 			};
@@ -530,17 +518,23 @@
 		};
 		6003F5C1195388D20070C39A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 22A0D40EE60E017AFC71E313 /* Pods-Rudder-Appsflyer_Example.release.xcconfig */;
+			baseConfigurationReference = 7D3FAC1D808B0A77C9789F94 /* Pods-Rudder-Appsflyer_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = WPX9KRKA8B;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Rudder-Appsflyer/Rudder-Appsflyer-Prefix.pch";
 				INFOPLIST_FILE = "Rudder-Appsflyer/Rudder-Appsflyer-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.3;
 				MODULE_NAME = ExampleApp;
 				ONLY_ACTIVE_ARCH = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.rudderstack.ios.appsflyer.device-mode";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_OBJC_BRIDGING_HEADER = "Rudder-Appsflyer/RudderConfig/Rudder-Appsflyer_Example-Bridging-Header.h";
 				SWIFT_VERSION = 4.0;
 				WRAPPER_EXTENSION = app;
 			};
@@ -548,8 +542,8 @@
 		};
 		6003F5C3195388D20070C39A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1BD3AE254B2E89F62B19D972 /* Pods-Rudder-Appsflyer_Tests.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PLATFORM_DIR)/Developer/Library/Frameworks",
@@ -573,8 +567,8 @@
 		};
 		6003F5C4195388D20070C39A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 34BB885B8615589B3E9D1EBC /* Pods-Rudder-Appsflyer_Tests.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PLATFORM_DIR)/Developer/Library/Frameworks",
diff --git a/Example/Rudder-Appsflyer/Base.lproj/Main.storyboard b/Example/Rudder-Appsflyer/Base.lproj/Main.storyboard
index e9e93c1..5e2bed5 100644
--- a/Example/Rudder-Appsflyer/Base.lproj/Main.storyboard
+++ b/Example/Rudder-Appsflyer/Base.lproj/Main.storyboard
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="whP-gf-Uak">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="whP-gf-Uak">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -14,18 +13,115 @@
             <objects>
                 <viewController id="whP-gf-Uak" customClass="_ViewController" sceneMemberID="viewController">
                     <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="uEw-UM-LJ8"/>
-                        <viewControllerLayoutGuide type="bottom" id="Mvr-aV-6Um"/>
+                        <viewControllerLayoutGuide type="top" id="pfD-am-Lp0"/>
+                        <viewControllerLayoutGuide type="bottom" id="Phu-UQ-DyG"/>
                     </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="TpU-gO-2f1">
+                    <view key="view" contentMode="scaleToFill" id="O5k-Ma-h47">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <subviews>
+                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wR9-MF-RGY">
+                                <rect key="frame" x="0.0" y="20" width="375" height="647"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="k82-tg-rJc">
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="300"/>
+                                        <subviews>
+                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="n5A-BR-TMi">
+                                                <rect key="frame" x="10" y="0.0" width="355" height="300"/>
+                                                <subviews>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Mcy-ia-sr1">
+                                                        <rect key="frame" x="0.0" y="0.0" width="355" height="60"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="60" id="xav-HZ-VaI"/>
+                                                        </constraints>
+                                                        <state key="normal" title="Button"/>
+                                                        <buttonConfiguration key="configuration" style="tinted" title="Identify without traits">
+                                                            <fontDescription key="titleFontDescription" type="system" pointSize="14"/>
+                                                        </buttonConfiguration>
+                                                        <connections>
+                                                            <action selector="onButtonTap:" destination="whP-gf-Uak" eventType="touchUpInside" id="ydB-y8-kcW"/>
+                                                        </connections>
+                                                    </button>
+                                                    <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="92O-2f-dd1">
+                                                        <rect key="frame" x="0.0" y="80" width="355" height="60"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="60" id="77i-iU-uO1"/>
+                                                        </constraints>
+                                                        <state key="normal" title="Button"/>
+                                                        <buttonConfiguration key="configuration" style="tinted" title="Identify with traits">
+                                                            <fontDescription key="titleFontDescription" type="system" pointSize="14"/>
+                                                        </buttonConfiguration>
+                                                        <connections>
+                                                            <action selector="onButtonTap:" destination="whP-gf-Uak" eventType="touchUpInside" id="0IM-SK-BVw"/>
+                                                        </connections>
+                                                    </button>
+                                                    <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gik-S1-7Os">
+                                                        <rect key="frame" x="0.0" y="160" width="355" height="60"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="60" id="W1F-TJ-S7f"/>
+                                                        </constraints>
+                                                        <state key="normal" title="Button"/>
+                                                        <buttonConfiguration key="configuration" style="tinted" title="Custom Event name with properties">
+                                                            <fontDescription key="titleFontDescription" type="system" pointSize="14"/>
+                                                        </buttonConfiguration>
+                                                        <connections>
+                                                            <action selector="onButtonTap:" destination="whP-gf-Uak" eventType="touchUpInside" id="vIb-TX-p10"/>
+                                                        </connections>
+                                                    </button>
+                                                    <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Muo-Hm-mTL">
+                                                        <rect key="frame" x="0.0" y="240" width="355" height="60"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="60" id="m9g-mh-zbR"/>
+                                                        </constraints>
+                                                        <state key="normal" title="Button"/>
+                                                        <buttonConfiguration key="configuration" style="tinted" title="Alias">
+                                                            <fontDescription key="titleFontDescription" type="system" pointSize="14"/>
+                                                        </buttonConfiguration>
+                                                        <connections>
+                                                            <action selector="onButtonTap:" destination="whP-gf-Uak" eventType="touchUpInside" id="Yd0-Fd-O41"/>
+                                                        </connections>
+                                                    </button>
+                                                </subviews>
+                                            </stackView>
+                                        </subviews>
+                                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                        <constraints>
+                                            <constraint firstItem="n5A-BR-TMi" firstAttribute="top" secondItem="k82-tg-rJc" secondAttribute="top" id="2d4-00-IPw"/>
+                                            <constraint firstItem="n5A-BR-TMi" firstAttribute="leading" secondItem="k82-tg-rJc" secondAttribute="leading" constant="10" id="mLk-RQ-bWQ"/>
+                                            <constraint firstAttribute="trailing" secondItem="n5A-BR-TMi" secondAttribute="trailing" constant="10" id="tAB-dN-iJI"/>
+                                            <constraint firstAttribute="bottom" secondItem="n5A-BR-TMi" secondAttribute="bottom" id="uCi-JG-p7Z"/>
+                                        </constraints>
+                                    </view>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstItem="k82-tg-rJc" firstAttribute="top" secondItem="wR9-MF-RGY" secondAttribute="top" id="T5I-FI-CTv"/>
+                                    <constraint firstItem="k82-tg-rJc" firstAttribute="leading" secondItem="wR9-MF-RGY" secondAttribute="leading" id="U2L-JG-0yX"/>
+                                    <constraint firstAttribute="trailing" secondItem="k82-tg-rJc" secondAttribute="trailing" id="b4e-O3-Rv2"/>
+                                    <constraint firstAttribute="bottom" secondItem="k82-tg-rJc" secondAttribute="bottom" id="fbi-wV-fXw"/>
+                                    <constraint firstItem="k82-tg-rJc" firstAttribute="width" secondItem="wR9-MF-RGY" secondAttribute="width" id="ksM-4K-dzA"/>
+                                </constraints>
+                                <viewLayoutGuide key="contentLayoutGuide" id="H6d-Of-ttT"/>
+                                <viewLayoutGuide key="frameLayoutGuide" id="bCS-o8-mXD"/>
+                            </scrollView>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="wR9-MF-RGY" firstAttribute="width" secondItem="O5k-Ma-h47" secondAttribute="width" id="AaM-VN-7UD"/>
+                            <constraint firstAttribute="trailing" secondItem="wR9-MF-RGY" secondAttribute="trailing" id="CTe-bV-6yo"/>
+                            <constraint firstItem="Phu-UQ-DyG" firstAttribute="top" secondItem="wR9-MF-RGY" secondAttribute="bottom" id="gAd-IX-14K"/>
+                            <constraint firstItem="wR9-MF-RGY" firstAttribute="leading" secondItem="O5k-Ma-h47" secondAttribute="leading" id="hYs-37-qtf"/>
+                            <constraint firstItem="wR9-MF-RGY" firstAttribute="top" secondItem="pfD-am-Lp0" secondAttribute="bottom" id="vdZ-up-iC6"/>
+                        </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="tc2-Qw-aMS" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="305" y="433"/>
+            <point key="canvasLocation" x="304.80000000000001" y="432.23388305847078"/>
         </scene>
     </scenes>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>
diff --git a/Example/Rudder-Appsflyer/Rudder-Appsflyer-Info.plist b/Example/Rudder-Appsflyer/Rudder-Appsflyer-Info.plist
index 7576a0d..686c467 100644
--- a/Example/Rudder-Appsflyer/Rudder-Appsflyer-Info.plist
+++ b/Example/Rudder-Appsflyer/Rudder-Appsflyer-Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSUserTrackingUsageDescription</key>
+	<string>Allow app to track your actions ?</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
diff --git a/Example/Rudder-Appsflyer/RudderConfig/Rudder-Appsflyer_Example-Bridging-Header.h b/Example/Rudder-Appsflyer/RudderConfig/Rudder-Appsflyer_Example-Bridging-Header.h
new file mode 100644
index 0000000..1b2cb5d
--- /dev/null
+++ b/Example/Rudder-Appsflyer/RudderConfig/Rudder-Appsflyer_Example-Bridging-Header.h
@@ -0,0 +1,4 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
diff --git a/Example/Rudder-Appsflyer/RudderConfig/RudderConfig.swift b/Example/Rudder-Appsflyer/RudderConfig/RudderConfig.swift
new file mode 100644
index 0000000..46b01a5
--- /dev/null
+++ b/Example/Rudder-Appsflyer/RudderConfig/RudderConfig.swift
@@ -0,0 +1,27 @@
+//
+//  RudderConfig.swift
+//  Rudder-Appsflyer
+//
+//  Created by Desu Sai Venkat on 12/04/23.
+//
+import Foundation
+
+@objc
+class RudderConfig: NSObject, Codable {
+    @objc let WRITE_KEY: String
+    @objc let PROD_DATA_PLANE_URL: String
+    @objc let PROD_CONTROL_PLANE_URL: String
+    @objc let LOCAL_DATA_PLANE_URL: String
+    @objc let LOCAL_CONTROL_PLANE_URL: String
+    @objc let DEV_DATA_PLANE_URL: String
+    @objc let DEV_CONTROL_PLANE_URL: String
+
+    @objc
+    class func create(from url: URL) -> RudderConfig? {
+        if let data = try? Data(contentsOf: url),
+           let rudderConfig = try? PropertyListDecoder().decode(RudderConfig.self, from: data) {
+            return rudderConfig
+        }
+        return nil
+    }
+}
diff --git a/Example/Rudder-Appsflyer/RudderConfig/SampleRudderConfig.plist b/Example/Rudder-Appsflyer/RudderConfig/SampleRudderConfig.plist
new file mode 100644
index 0000000..de06912
--- /dev/null
+++ b/Example/Rudder-Appsflyer/RudderConfig/SampleRudderConfig.plist
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!--
+   SampleRudderConfig.plist
+   Rudder-Appsflyer
+
+   Created by Desu Sai Venkat on 13/04/23.
+   Copyright (c) 2023 arnabp92. All rights reserved.
+-->
+<plist version="1.0">
+   <dict>
+      <key>WRITE_KEY</key>
+      <string></string>
+      <key>PROD_DATA_PLANE_URL</key>
+      <string></string>
+      <key>PROD_CONTROL_PLANE_URL</key>
+      <string></string>
+      <key>LOCAL_DATA_PLANE_URL</key>
+      <string></string>
+      <key>LOCAL_CONTROL_PLANE_URL</key>
+      <string></string>
+      <key>DEV_DATA_PLANE_URL</key>
+      <string></string>
+      <key>DEV_CONTROL_PLANE_URL</key>
+      <string></string>
+   </dict>
+</plist>
\ No newline at end of file
diff --git a/Example/Rudder-Appsflyer/_AppDelegate.m b/Example/Rudder-Appsflyer/_AppDelegate.m
index ed06219..281a2df 100644
--- a/Example/Rudder-Appsflyer/_AppDelegate.m
+++ b/Example/Rudder-Appsflyer/_AppDelegate.m
@@ -10,9 +10,8 @@
 #import <Rudder/Rudder.h>
 #import "RudderAppsflyerFactory.h"
 #import <AppsFlyerLib/AppsFlyerLib.h>
-
-static NSString *DATA_PLANE_URL = @"https://6fce-2405-201-c001-18cd-f190-b1cc-2af3-7028.ngrok.io";
-static NSString *WRITE_KEY = @"1pAKRv50y15Ti6UWpYroGJaO0Dj";
+#import <AppTrackingTransparency/AppTrackingTransparency.h>
+#import "Rudder_Appsflyer_Example-Swift.h"
 
 @implementation _AppDelegate
 
@@ -23,83 +22,27 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [[AppsFlyerLib shared] setAppsFlyerDevKey:@"<devKey>"];
     [[AppsFlyerLib shared] setAppleAppID:@"<appleAppId"];
     [AppsFlyerLib shared].isDebug = YES;
-    [[AppsFlyerLib shared] start];
     
+    [[AppsFlyerLib shared] waitForATTUserAuthorizationWithTimeoutInterval:30];
     
-    // And then initialize the Rudder SDK
-    RSConfigBuilder *builder = [[RSConfigBuilder alloc] init];
-    [builder withDataPlaneUrl:DATA_PLANE_URL];
-    [builder withTrackLifecycleEvens:YES];
-    [builder withRecordScreenViews:YES];
-    [builder withFactory:[RudderAppsflyerFactory instance]];
-    [builder withLoglevel:RSLogLevelDebug];
-    [RSClient getInstance:WRITE_KEY config:[builder build]];
     
-    [[RSClient sharedInstance] track:@"Order Completed" properties:@{
-    @"checkout_id": @"12345",
-    @"order_id": @"1234",
-    @"affiliation": @"Apple Store",
-    @"total": @20,
-    @"revenue": @15.0,
-    @"shipping": @22,
-    @"tax": @1,
-    @"discount": @1.5,
-    @"coupon": @"ImagePro",
-    @"currency": @"USD",
-    @"products": @[
-      @{
-        @"product_id": @"123",
-        @"sku": @"G-32",
-        @"name": @"Monopoly",
-        @"price": @14,
-        @"quantity": @1,
-        @"category": @"Games",
-        @"url": @"https://www.website.com/product/path",
-        @"image_url": @"https://www.website.com/product/path.jpg",
-      },
-      @{
-        @"product_id": @"345",
-        @"sku": @"F-32",
-        @"name": @"UNO",
-        @"price": @3.45,
-        @"quantity": @2,
-        @"category": @"Games",
-      },
-    ],
-  }];
+    /// Copy the `SampleRudderConfig.plist` and rename it to`RudderConfig.plist` on the same directory.
+    /// Update the values as per your need.
     
-    [[RSClient sharedInstance] track:@"first_purchase" properties:@{
-    @"checkout_id": @"12345",
-    @"order_id": @"1234",
-    @"affiliation": @"Apple Store",
-    @"total": @20,
-    @"revenue": @15.0,
-    @"shipping": @22,
-    @"tax": @1,
-    @"discount": @1.5,
-    @"coupon": @"ImagePro",
-    @"currency": @"USD",
-    @"products": @[
-      @{
-        @"product_id": @"123",
-        @"sku": @"G-32",
-        @"name": @"Monopoly",
-        @"price": @14,
-        @"quantity": @1,
-        @"category": @"Games",
-        @"url": @"https://www.website.com/product/path",
-        @"image_url": @"https://www.website.com/product/path.jpg",
-      },
-      @{
-        @"product_id": @"345",
-        @"sku": @"F-32",
-        @"name": @"UNO",
-        @"price": @3.45,
-        @"quantity": @2,
-        @"category": @"Games",
-      },
-    ],
-  }];
+    NSString *path = [[NSBundle mainBundle] pathForResource:@"RudderConfig" ofType:@"plist"];
+    if (path != nil) {
+        NSURL *url = [NSURL fileURLWithPath:path];
+        RudderConfig *rudderConfig = [RudderConfig createFrom:url];
+        if (rudderConfig != nil) {
+            RSConfigBuilder *builder = [[RSConfigBuilder alloc] init];
+            [builder withDataPlaneUrl:rudderConfig.PROD_DATA_PLANE_URL];
+            [builder withTrackLifecycleEvens:YES];
+            [builder withRecordScreenViews:YES];
+            [builder withFactory:[RudderAppsflyerFactory instance]];
+            [builder withLoglevel:RSLogLevelDebug];
+            [RSClient getInstance:rudderConfig.WRITE_KEY config:[builder build]];
+        }
+    }
     
     return YES;
 }
@@ -124,6 +67,13 @@ - (void)applicationWillEnterForeground:(UIApplication *)application
 - (void)applicationDidBecomeActive:(UIApplication *)application
 {
     // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+    [[AppsFlyerLib shared] start];
+    
+         
+         [ATTrackingManager requestTrackingAuthorizationWithCompletionHandler:^(ATTrackingManagerAuthorizationStatus status) {
+           NSLog(@"Status: %lu", (unsigned long)status);
+         }];
+    
 }
 
 - (void)applicationWillTerminate:(UIApplication *)application
diff --git a/Example/Rudder-Appsflyer/_ViewController.m b/Example/Rudder-Appsflyer/_ViewController.m
index e3d87be..0734d17 100644
--- a/Example/Rudder-Appsflyer/_ViewController.m
+++ b/Example/Rudder-Appsflyer/_ViewController.m
@@ -19,17 +19,7 @@ @implementation _ViewController
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-	// Do any additional setup after loading the view, typically from a nib.
-    
-    [[RSClient sharedInstance] track:@"account: created"];
-    [[RSClient sharedInstance] track:@"account: authenticated"];
-    [[RSClient sharedInstance] track:@"account: signed in"];
-    [[RSClient sharedInstance] identify:@"developer_user_id" traits:@{@"foo": @"bar", @"foo1": @"bar1", @"email": @"example@gmail.com"}];
-    [[RSClient sharedInstance] track:@"challenge: applied points" properties:@{@"key":@"value", @"foo": @"bar", @"c_prop": @{@"c_key_1": @"c_val_1"}}];
-    [[RSClient sharedInstance] track:@"congratulated" properties:@{@"total":@2.99, @"currency": @"USD"}];
-    
-    NSString *appsFlyerId = [[AppsFlyerLib shared] getAppsFlyerUID];
-    
+    // Do any additional setup after loading the view, typically from a nib
 }
 
 - (void)didReceiveMemoryWarning
@@ -38,4 +28,247 @@ - (void)didReceiveMemoryWarning
     // Dispose of any resources that can be recreated.
 }
 
+-(void) track {
+    [[RSClient sharedInstance] track:@"New Track event" properties:@{
+        @"key_1" : @"value_1",
+        @"key_2" : @"value_2"
+    }];
+    [[RSClient sharedInstance] track:@"Products Searched"
+                          properties:@{@"query": @"HDMI cable"}];
+    
+    NSDictionary *product1 = @{@"product_id": @"223344ffdds3ff3",
+                               @"sku": @"12345",
+                               @"name": @"Just Another Game",
+                               @"price": @22,
+                               @"position": @2,
+                               @"category": @"Games and Entertainment",
+                               @"url": @"https://www.myecommercewebsite.com/product",
+                               @"image_url": @"https://www.myecommercewebsite.com/product/path.jpg"};
+    
+    NSDictionary *product2 = @{@"product_id": @"343344ff5567ff3",
+                               @"sku": @"12346",
+                               @"name": @"Wrestling Trump Cards",
+                               @"price": @4,
+                               @"position": @21,
+                               @"category": @"Card Games"};
+    
+    NSArray *products = @[product1, product2];
+    
+    NSDictionary *properties = @{@"list_id": @"list1",
+                                 @"category": @"What's New",
+                                 @"products": products};
+    
+    [[RSClient sharedInstance] track:@"Product List Viewed" properties:properties];
+    
+    properties = @{@"product_id": @"123",
+                   @"sku": @"F15",
+                   @"category": @"Games",
+                   @"name": @"Game",
+                   @"brand": @"Gamepro",
+                   @"variant": @"111",
+                   @"price": @13.49,
+                   @"quantity": @11,
+                   @"coupon": @"DISC21",
+                   @"currency": @"USD",
+                   @"position": @1,
+                   @"url": @"https://www.website.com/product/path",
+                   @"image_url": @"https://www.website.com/product/path.png"};
+    
+    [[RSClient sharedInstance] track:@"Product Viewed" properties:properties];
+    
+    properties = @{@"wishlist_id": @"12345",
+                   @"wishlist_name": @"Games",
+                   @"product_id": @"235564423234",
+                   @"sku": @"F-17",
+                   @"category": @"Games",
+                   @"name": @"Cards",
+                   @"brand": @"Imagepro",
+                   @"variant": @"123",
+                   @"price": @8.99,
+                   @"quantity": @1,
+                   @"coupon": @"COUPON",
+                   @"position": @1,
+                   @"url": @"https://www.site.com/product/path",
+                   @"image_url": @"https://www.site.com/product/path.jpg"};
+    
+    [[RSClient sharedInstance] track:@"Product Added to Wishlist" properties:properties];
+    
+    properties = @{@"product_id": @"123",
+                   @"sku": @"F15",
+                   @"category": @"Games",
+                   @"name": @"Game",
+                   @"brand": @"Gamepro",
+                   @"variant": @"111",
+                   @"price": @13.49,
+                   @"quantity": @11,
+                   @"coupon": @"DISC21",
+                   @"position": @1,
+                   @"url": @"https://www.website.com/product/path",
+                   @"image_url": @"https://www.website.com/product/path.png"};
+    
+    [[RSClient sharedInstance] track:@"Product Added" properties:properties];
+    
+    
+    product1 = @{@"product_id": @"123",
+                               @"sku": @"G-32",
+                               @"name": @"Monopoly",
+                               @"price": @14,
+                               @"quantity": @1,
+                               @"category": @"Games",
+                               @"url": @"https://www.website.com/product/path",
+                               @"image_url": @"https://www.website.com/product/path.jpg"};
+    
+    product2 = @{@"product_id": @"345",
+                               @"sku": @"F-32",
+                               @"name": @"UNO",
+                               @"price": @3.45,
+                               @"quantity": @2,
+                               @"category": @"Games"};
+    
+    products = @[product1, product2];
+    
+    properties = @{@"order_id": @"1234",
+                                 @"affiliation": @"Apple Store",
+                                 @"value": @20,
+                                 @"revenue": @15.0,
+                                 @"shipping": @4,
+                                 @"tax": @1,
+                                 @"discount": @1.5,
+                                 @"coupon": @"ImagePro",
+                                 @"currency": @"USD",
+                                 @"products": products};
+    
+    [[RSClient sharedInstance] track:@"Checkout Started" properties:properties];
+    
+    [[RSClient sharedInstance] track:@"Order Completed" properties:@{@"checkout_id": @"12345",
+                                                                     @"order_id": @"1234",
+                                                                     @"affiliation": @"Apple Store",
+                                                                     @"total": @20,
+                                                                     @"revenue": @15.0,
+                                                                     @"shipping": @4,
+                                                                     @"tax": @1,
+                                                                     @"discount": @1.5,
+                                                                     @"coupon": @"ImagePro",
+                                                                     @"currency": @"USD",
+                                                                     @"products": @[
+                                                                                @{@"product_id": @"123",
+                                                                                  @"sku": @"G-32",
+                                                                                  @"name": @"Monopoly",
+                                                                                  @"price": @14,
+                                                                                  @"quantity": @1,
+                                                                                  @"category": @"Games",
+                                                                                  @"url": @"https://www.website.com/product/path",
+                                                                                  @"image_url": @"https://www.website.com/product/path.jpg"
+                                                                                },
+                                                                                @{@"product_id": @"345",
+                                                                                  @"sku": @"F-32",
+                                                                                  @"name": @"UNO",
+                                                                                  @"price": @3.45,
+                                                                                  @"quantity": @2,
+                                                                                  @"category": @"Games",
+                                                                                }]
+                                                                   }];
+    
+    [[RSClient sharedInstance] track:@"Promotion Viewed" properties:@{
+    @"promotion_id": @"promo1",
+    @"creative": @"banner1",
+    @"name": @"sale",
+    @"position": @"home_top"
+    }];
+
+    [[RSClient sharedInstance] track:@"Promotion Clicked" properties:@{
+    @"promotion_id": @"promo1",
+    @"creative": @"banner1",
+    @"name": @"sale",
+    @"position": @"home_top"
+    }];
+
+    [[RSClient sharedInstance] track:@"Payment Info Entered" properties:@{
+    @"checkout_id": @"12344",
+    @"order_id": @"123"
+    }];
+
+    [[RSClient sharedInstance] track:@"Product Shared" properties:@{
+    @"share_via": @"SMS",
+    @"share_message": @"Check this",
+    @"recipient": @"name@friendsemail.com",
+    @"product_id": @"12345872254426",
+    @"sku": @"F-13",
+    @"category": @"Games",
+    @"name": @"Cards",
+    @"brand": @"Maples",
+    @"variant": @"150s",
+    @"price": @15.99,
+    @"url": @"https://www.myecommercewebsite.com/product/prod",
+    @"image_url": @"https://www.myecommercewebsite.com/product/prod.jpg",
+    }];
+
+    [[RSClient sharedInstance] track:@"Cart Shared" properties:@{
+    @"share_via": @"SMS",
+    @"share_message": @"Check this",
+    @"recipient": @"friend@friendsemail.com",
+    @"cart_id": @"1234df2ddss",
+    @"products": @[@{@"product_id": @"125"}, @{@"product_id": @"297"}],
+    }];
+
+    [[RSClient sharedInstance] track:@"Product Reviewed" properties:@{
+    @"product_id": @"12345",
+    @"review_id": @"review12",
+    @"review_body": @"Good product, delivered in excellent condition",
+    @"rating": @"5",
+    }];
+
+    [[RSClient sharedInstance] track:@"Product Removed" properties:@{
+    @"product_id": @"123",
+    @"sku": @"F15",
+    @"category": @"Games",
+    @"name": @"Game",
+    @"brand": @"Gamepro",
+    @"variant": @"111",
+    @"price": @13.49,
+    @"quantity": @11,
+    @"coupon": @"DISC21",
+    @"position": @1,
+    @"url": @"https://www.website.com/product/path",
+    @"image_url": @"https://www.website.com/product/path.png",
+    }];
+    }
+
+- (IBAction)onButtonTap:(UIButton *)sender {
+    switch (sender.tag) {
+        case 0: {
+            [[RSClient sharedInstance] identify:@"test_userid_ios"];
+            break;
+        case 1: {
+            NSDate *birthday = [[NSDate alloc] init];
+            [[RSClient sharedInstance] identify:@"test_userid_ios" traits: @{
+                @"birthday": birthday,
+                @"address": @{
+                    @"city": @"Kolkata",
+                    @"country": @"India"
+                },
+                @"firstname": @"First Name",
+                @"lastname": @"Last Name",
+                @"name": @"Rudder-Bugsnag iOS",
+                @"gender": @"Male",
+                @"phone": @"0123456789",
+                @"email": @"test@gmail.com",
+                @"key-1": @"value-1",
+                @"key-2": @1234
+            }];
+            
+            
+        }
+            break;
+        case 2:
+            [self track];
+            
+            break;
+        case 3:
+            [[RSClient sharedInstance] alias:@"test_userid_ios_2"];
+            break;
+        }
+    }
+}
+
 @end
diff --git a/LICENSE b/LICENSE.md
similarity index 100%
rename from LICENSE
rename to LICENSE.md
diff --git a/Rudder-Appsflyer.podspec b/Rudder-Appsflyer.podspec
index 54a7220..cba775f 100644
--- a/Rudder-Appsflyer.podspec
+++ b/Rudder-Appsflyer.podspec
@@ -2,6 +2,9 @@ require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
+appsflyer_sdk_version = '~> 6.10'
+rudder_sdk_version = '~> 1.12'
+
 Pod::Spec.new do |s|
   s.name             = 'Rudder-Appsflyer'
   s.version          = package['version']
@@ -12,23 +15,32 @@ Rudder is a platform for collecting, storing and routing customer event data to
                        DESC
 
   s.homepage         = 'https://github.com/rudderlabs/rudder-integration-appsflyer-ios'
-  s.license          = { :type => "Apache", :file => "LICENSE" }
-  s.author           = { 'RudderStack' => 'arnab@rudderlabs.com' }
+  s.license          = { :type => "Apache", :file => "LICENSE.md" }
+  s.author           = { 'RudderStack' => 'sdk@rudderstack.com' }
   s.source           = { :git => 'https://github.com/rudderlabs/rudder-integration-appsflyer-ios.git', :tag => "v#{s.version}" }
   s.platform         = :ios, "9.0"
 
   s.ios.deployment_target = '10.0'
 
-  ## Ref: https://github.com/CocoaPods/CocoaPods/issues/10065
-  s.pod_target_xcconfig = {
-    'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64'
-  }
-  s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
-
   s.static_framework = true
 
   s.source_files = 'Rudder-Appsflyer/Classes/**/*'
 
-  s.dependency 'Rudder', '~> 1.0'
-  s.dependency 'AppsFlyerFramework', '~> 6.9.1'
+  if defined?($AppsflyerSDKVersion)
+    Pod::UI.puts "#{s.name}: Using user specified Appsflyer SDK version '#{$AppsflyerSDKVersion}'"
+    appsflyer_sdk_version = $AppsflyerSDKVersion
+  else
+    Pod::UI.puts "#{s.name}: Using default Appsflyer SDK version '#{appsflyer_sdk_version}'"
+  end
+
+  if defined?($RudderSDKVersion)
+    Pod::UI.puts "#{s.name}: Using user specified Rudder SDK version '#{$RudderSDKVersion}'"
+    rudder_sdk_version = $RudderSDKVersion
+  else
+    Pod::UI.puts "#{s.name}: Using default Rudder SDK version '#{rudder_sdk_version}'"
+  end
+
+
+  s.dependency 'Rudder', rudder_sdk_version
+  s.dependency 'AppsFlyerFramework', appsflyer_sdk_version
 end
diff --git a/Rudder-Appsflyer/Assets/.gitkeep b/Rudder-Appsflyer/Assets/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/Rudder-Appsflyer/Classes/.gitkeep b/Rudder-Appsflyer/Classes/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/Rudder-Appsflyer/Classes/RudderAppsflyerIntegration.m b/Rudder-Appsflyer/Classes/RudderAppsflyerIntegration.m
index 5555a63..5155736 100644
--- a/Rudder-Appsflyer/Classes/RudderAppsflyerIntegration.m
+++ b/Rudder-Appsflyer/Classes/RudderAppsflyerIntegration.m
@@ -11,6 +11,9 @@
 @implementation RudderAppsflyerIntegration
 
 NSString *const FIRSTPURCHASE = @"first_purchase";
+NSString *const CREATIVE = @"creative";
+NSArray<NSString*>* TRACK_RESERVED_KEYWORDS;
+
 
 #pragma mark - Initialization
 
@@ -18,6 +21,19 @@ - (instancetype)initWithConfig:(NSDictionary *)config withAnalytics:(nonnull RSC
     self = [super init];
     if (self) {
         isNewScreenEnabled = [[config objectForKey:@"useRichEventName"] boolValue];
+        TRACK_RESERVED_KEYWORDS = [[NSArray alloc] initWithObjects:KeyQuery,
+                                   KeyPrice,
+                                   KeyProductId,
+                                   KeyCategory,
+                                   KeyCurrency,
+                                   KeyProducts,
+                                   KeyQuantity,
+                                   KeyTotal,
+                                   KeyRevenue,
+                                   KeyOrderId,
+                                   KeyShareMessage,
+                                   CREATIVE,
+                                   KeyRating, nil];
     }
     return self;
 }
@@ -31,7 +47,7 @@ - (void)dump:(RSMessage *)message {
 - (void) processRudderEvent: (nonnull RSMessage *) message {
     NSString *type = message.type;
     if ([type isEqualToString:@"identify"]) {
-       [[AppsFlyerLib shared] setCustomerUserID:message.userId];
+        [[AppsFlyerLib shared] setCustomerUserID:message.userId];
         
         if ([message.context.traits[@"currencyCode"] isKindOfClass:[NSString class]]) {
             [AppsFlyerLib shared].currencyCode = [[NSString alloc] initWithFormat:@"%@", message.context.traits[@"currencyCode"]];
@@ -63,7 +79,7 @@ - (void) processRudderEvent: (nonnull RSMessage *) message {
             NSMutableDictionary *afProperties = [[NSMutableDictionary alloc] init];
             if ([eventName isEqualToString:ECommProductsSearched]) {
                 afEventName = AFEventSearch;
-                NSString *query = properties[@"query"];
+                NSString *query = properties[KeyQuery];
                 if (query != nil) {
                     [afProperties setValue:query forKey:AFEventParamSearchString];
                 }
@@ -71,7 +87,7 @@ - (void) processRudderEvent: (nonnull RSMessage *) message {
                 afEventName = AFEventContentView;
                 [self addProductProperties:properties params:afProperties];
             } else if ([eventName isEqualToString:ECommProductListViewed]) {
-                afEventName = @"af_list_view";
+                afEventName = AFEventListView;
                 [self addProductListViewedProperties:properties params:afProperties];
             } else if ([eventName isEqualToString:ECommProductAddedToWishList]) {
                 afEventName = AFEventAddToWishlist;
@@ -89,14 +105,50 @@ - (void) processRudderEvent: (nonnull RSMessage *) message {
                 afEventName = FIRSTPURCHASE;
                 [self addCheckoutProperties:properties params:afProperties];
             }
+            else if ([eventName isEqualToString:ECommPromotionViewed]){
+                afEventName = AFEventAdView;
+                if(properties[CREATIVE]) {
+                    [afProperties setValue:properties[CREATIVE] forKey:AFEventParamAdRevenueAdType];
+                }
+                if(properties[KeyCurrency]) {
+                    [afProperties setValue:properties[KeyCurrency] forKey:AFEventParamCurrency];
+                }
+            }
+            else if ([eventName isEqualToString:ECommPromotionClicked]){
+                afEventName = AFEventAdClick;
+                if(properties[CREATIVE]) {
+                    [afProperties setValue:properties[CREATIVE] forKey:AFEventParamAdRevenueAdType];
+                }
+                if(properties[KeyCurrency]) {
+                    [afProperties setValue:properties[KeyCurrency] forKey:AFEventParamCurrency];
+                }
+            }
+            else if ([eventName isEqualToString:ECommPaymentInfoEntered]) {
+                afEventName = AFEventAddPaymentInfo;
+            }
+            else if ([eventName isEqualToString:ECommProductShared] || [eventName isEqualToString:ECommCartShared]) {
+                afEventName = AFEventShare;
+                if(properties[KeyShareMessage]) {
+                    [afProperties setValue:properties[KeyShareMessage] forKey:AFEventParamDescription];
+                }
+            }
+            else if([eventName isEqualToString:ECommProductReviewed]) {
+                afEventName = AFEventRate;
+                if(properties[KeyProductId]) {
+                    [afProperties setValue:properties[KeyProductId] forKey:AFEventParamContentId];
+                }
+                if(properties[KeyRating]) {
+                    [afProperties setValue:properties[KeyRating] forKey:AFEventParamRatingValue];
+                }
+            }
             else if ([eventName isEqualToString:ECommProductRemoved]) {
                 afEventName = @"remove_from_cart";
                 if (properties != nil) {
-                    NSString *productId = properties[@"product_id"];
+                    NSString *productId = properties[KeyProductId];
                     if (productId != nil) {
                         [afProperties setValue:productId forKey:AFEventParamContentId];
                     }
-                    NSString *category = properties[@"category"];
+                    NSString *category = properties[KeyCategory];
                     if (category != nil) {
                         [afProperties setValue:category forKey:AFEventParamContentType];
                     }
@@ -105,6 +157,7 @@ - (void) processRudderEvent: (nonnull RSMessage *) message {
             else {
                 afEventName = [afEventName stringByReplacingOccurrencesOfString:@" " withString:@"_"];
             }
+            [self attachAllCustomProperties:afProperties properties:properties];
             [[AppsFlyerLib shared] logEvent:afEventName withValues:afProperties];
         }
     } else if ([type isEqualToString:@"screen"]) {
@@ -129,21 +182,21 @@ - (void) processRudderEvent: (nonnull RSMessage *) message {
 
 - (void) addCheckoutProperties: (NSDictionary *) properties params: (NSMutableDictionary *) params {
     if (properties != nil && params != nil) {
-        NSNumber *total = properties[@"total"];
+        NSNumber *total = properties[KeyTotal];
         if (total != nil) {
             [params setValue:total forKey:AFEventParamPrice];
         }
         
-        NSArray<NSDictionary*>* products = properties[@"products"];
+        NSArray<NSDictionary*>* products = properties[KeyProducts];
         NSMutableArray *productIds = [[NSMutableArray alloc] init];
         NSMutableArray *productCategories = [[NSMutableArray alloc] init];
         NSMutableArray *productQuants = [[NSMutableArray alloc] init];
         if (products != nil) {
             for (NSDictionary* product in products) {
                 if (product != nil) {
-                    NSString *productId = product[@"product_id"];
-                    NSString *productCategory = product[@"category"];
-                    NSString *productQuan = product[@"quantity"];
+                    NSString *productId = product[KeyProductId];
+                    NSString *productCategory = product[KeyCategory];
+                    NSString *productQuan = product[KeyQuantity];
                     if (productId != nil && productCategory != nil && productQuan != nil)  {
                         [productIds addObject:productId];
                         [productCategories addObject:productCategory];
@@ -156,37 +209,37 @@ - (void) addCheckoutProperties: (NSDictionary *) properties params: (NSMutableDi
         [params setValue:productCategories forKey:AFEventParamContentType];
         [params setValue:productQuants forKey:AFEventParamQuantity];
         
-        NSString *currency = properties[@"currency"];
+        NSString *currency = properties[KeyCurrency];
         if (currency != nil) {
             [params setValue:currency forKey:AFEventParamCurrency];
         }
         
-        NSString *orderId = properties[@"order_id"];
+        NSString *orderId = properties[KeyOrderId];
         if (orderId != nil) {
             [params setValue:orderId forKey:AFEventParamReceiptId];
-            [params setValue:orderId forKey:@"af_order_id"];
+            [params setValue:orderId forKey:AFEventParamOrderId];
         }
         
-        NSString *revenue = properties[@"revenue"];
+        NSString *revenue = properties[KeyRevenue];
         if (revenue != nil) {
             [params setValue:revenue forKey:AFEventParamRevenue];
         }
     }
 }
- 
+
 - (void) addProductListViewedProperties: (NSDictionary *) properties params: (NSMutableDictionary *) params {
     if (properties != nil && params != nil) {
-        NSString *category = properties[@"category"];
+        NSString *category = properties[KeyCategory];
         if (category != nil) {
             [params setValue:category forKey:AFEventParamContentType];
         }
         
-        NSArray<NSDictionary*>* products = properties[@"products"];
+        NSArray<NSDictionary*>* products = properties[KeyProducts];
         NSMutableArray *productParams = [[NSMutableArray alloc] init];
         if (products != nil) {
             for (NSDictionary* product in products) {
                 if (product != nil) {
-                    NSString *productId = product[@"product_id"];
+                    NSString *productId = product[KeyProductId];
                     if (productId != nil) {
                         [productParams addObject:productId];
                     }
@@ -199,27 +252,27 @@ - (void) addProductListViewedProperties: (NSDictionary *) properties params: (NS
 
 - (void) addProductProperties: (NSDictionary *) properties params: (NSMutableDictionary *) params {
     if (properties != nil && params != nil) {
-        NSString *price = properties[@"price"];
+        NSString *price = properties[KeyPrice];
         if (price != nil) {
             [params setValue:price forKey:AFEventParamPrice];
         }
         
-        NSString *productId = properties[@"product_id"];
+        NSString *productId = properties[KeyProductId];
         if (productId != nil) {
             [params setValue:productId forKey:AFEventParamContentId];
         }
         
-        NSString *category = properties[@"category"];
+        NSString *category = properties[KeyCategory];
         if (category != nil) {
             [params setValue:category forKey:AFEventParamContentType];
         }
         
-        NSString *currency = properties[@"currency"];
+        NSString *currency = properties[KeyCurrency];
         if (currency != nil) {
             [params setValue:currency forKey:AFEventParamCurrency];
         }
         
-        NSNumber *quantity = properties[@"quantity"];
+        NSNumber *quantity = properties[KeyQuantity];
         if (quantity != nil) {
             [params setValue:quantity forKey:AFEventParamQuantity];
         }
@@ -234,6 +287,19 @@ - (void)flush {
     // Appsflyer doesn't support flush functionality
 }
 
+- (void)attachAllCustomProperties:(NSMutableDictionary<NSString *, id> *)afEventProps properties:(NSDictionary<NSString *, id> *)properties {
+    if (properties == nil || properties.count == 0) {
+        return;
+    }
+    for (NSString *key in properties) {
+        id value = properties[key];
+        if ([TRACK_RESERVED_KEYWORDS containsObject:key] || key.length == 0) {
+            continue;
+        }
+        afEventProps[key] = value;
+    }
+}
+
 
 @end