diff --git a/Runtime/GuruCore/Runtime/Analytics/Analytics.Ads.cs b/Runtime/GuruCore/Runtime/Analytics/Analytics.Ads.cs
index 7db0b7d..611e155 100644
--- a/Runtime/GuruCore/Runtime/Analytics/Analytics.Ads.cs
+++ b/Runtime/GuruCore/Runtime/Analytics/Analytics.Ads.cs
@@ -235,7 +235,6 @@ namespace Guru
 		        { "type", type }
 	        };
 	        if(!string.IsNullOrEmpty(scene)) dict[ParameterItemName] = scene;
-            LogEvent(EventATTResult, dict);
         }
 
         /// <summary>
diff --git a/Runtime/GuruCore/Runtime/Analytics/Analytics.Custom.cs b/Runtime/GuruCore/Runtime/Analytics/Analytics.Custom.cs
index 49e328c..85cc880 100644
--- a/Runtime/GuruCore/Runtime/Analytics/Analytics.Custom.cs
+++ b/Runtime/GuruCore/Runtime/Analytics/Analytics.Custom.cs
@@ -207,12 +207,12 @@ namespace Guru
 	    private static void SetATTStatus()
 	    {
 		    string status = ATTManager.GetStatus();
-		    GuruAnalytics.SetUserProperty(ParameterATTStatus, status);
+		    GuruAnalytics.Instance.SetUserProperty(ParameterATTStatus, status);
 	    }
 
 	    private static void SetIDFV()
 	    {
-		    GuruAnalytics.SetIDFV(DeviceIDHelper.IDFV);
+		    GuruAnalytics.Instance.SetIDFV(DeviceIDHelper.IDFV);
 	    }
 
 		private static void SetIDFA()
@@ -228,7 +228,7 @@ namespace Guru
 			
 			if (!string.IsNullOrEmpty(IPMConfig.ADJUST_IDFA))
 			{
-				GuruAnalytics.SetIDFA(IPMConfig.ADJUST_IDFA);
+				GuruAnalytics.Instance.SetIDFA(IPMConfig.ADJUST_IDFA);
 				_hasGotIDFA = true;
 			}
 		}
diff --git a/Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.Message.cs b/Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.Message.cs
index 837a66c..7cf0a75 100644
--- a/Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.Message.cs
+++ b/Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.Message.cs
@@ -8,14 +8,31 @@ namespace Guru
 	public static partial class FirebaseUtil
 	{
 		private static int _messageRetry = 5;
-		public static bool? IsInitMessage;
-		
+		// public static bool? IsInitMessage;
+		private static bool _isAutoFetchFcmToken = true;
+		private static bool _isFetchOnce = false;
+
+		public static void SetAutoFetchFcmToken(bool value)
+		{
+			_isAutoFetchFcmToken = value;
+		}
+
 		public static void InitializeMessage()
 		{
+			if (_isAutoFetchFcmToken)
+			{
+				StartFetchFcmToken();
+			}
+		}
+		
+		public static void StartFetchFcmToken()
+		{
+			if (_isFetchOnce) return;
+			_isFetchOnce = true;
+			
 			FirebaseMessaging.TokenReceived += OnTokenReceived;
 			FirebaseMessaging.MessageReceived += OnMessageReceived;
 			GetFCMToken();
-			IsInitMessage = true;
 		}
 
 		private static void GetFCMToken()