             if (params.count > 0) {
                 FIRAnalytics.logEvent(withName: eventName as! String,
                                       parameters: params as? [String : NSObject]);
-                logger.logParamSetWithSuccess(eventName as! String, value: params);
+                logger.logParamSetWithSuccess(EVENT_NAME, value: eventName as! String);
+                logger.logParamSetWithSuccess("params", value: params);
             }
             else {
                 FIRAnalytics.logEvent(withName: eventName as! String, parameters: nil);
-                logger.logParamSetWithSuccess(eventName as!String, value: parameters);
+                logger.logParamSetWithSuccess(EVENT_NAME, value: eventName as! String);
+                logger.logParamSetWithSuccess("params", value: "nil");
             }
         }
         else{
-            logger.logMissingParam(EVENT_NAME, methodName: "Firebase_tagEvent");
+            logger.logMissingParam(EVENT_NAME, methodName: FIR_TAG_EVENT);
         }
     }
 

            logger.logParamSetWithSuccess(USER_ID, value: userID as! String);
            params.removeValue(forKey: USER_ID);
        }
        else if (params.count > 0) {
            for (key, value) in params {
                FIRAnalytics.setUserPropertyString(value as? String, forName:key as! String);
                logger.logParamSetWithSuccess((key as? String)!, value: (value as? String)!);
            }
        }
        else {
            logger.logMissingParam(USER_ID, methodName: "Firebase_identify");
        }
    }


        self.FirebaseAnalyticsConf = FIRAnalyticsConfiguration();
        FIRApp.configure();

        cargo.registerTagHandler(self, key: FIR_INIT);
        cargo.registerTagHandler(self, key: FIR_IDENTIFY);
        cargo.registerTagHandler(self, key: FIR_TAG_SCREEN);
        cargo.registerTagHandler(self, key: FIR_TAG_EVENT);
    }

    /// Callback from GTM container designed to execute a specific method
