diff --git a/MVMCore/MVMCore/ActionHandling/ActionHandler+ClientParameters.swift b/MVMCore/MVMCore/ActionHandling/ActionHandler+ClientParameters.swift
index 85fd4bb..9d6deab 100644
--- a/MVMCore/MVMCore/ActionHandling/ActionHandler+ClientParameters.swift
+++ b/MVMCore/MVMCore/ActionHandling/ActionHandler+ClientParameters.swift
@@ -31,7 +31,7 @@ public extension MVMCoreActionHandler {
         }
 
         do {
-            try ClientParameterRegistry.getParameters(with: clientParameters) { (clientParams) in
+            try ClientParameterRegistry().getParameters(with: clientParameters) { (clientParams) in
                 guard let clientParams = clientParams else {
                     stopLoadingOverlay()
                     completionHandler(actionMapWithClientParameters)
diff --git a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterRegistry.swift b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterRegistry.swift
index 9c4200b..23f5ca5 100644
--- a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterRegistry.swift	
+++ b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterRegistry.swift	
@@ -47,7 +47,7 @@ import Foundation
     ///  ]
     ///}
     /// completionHandler can return flat dictinary or a map. It depends on the paramters handler
-    static func getParameters(with clientParameters: [String: Any], completionHandler:@escaping ([String: Any]?) -> ()) throws {
+    func getParameters(with clientParameters: [String: Any], completionHandler:@escaping ([String: Any]?) -> ()) throws {
 
         guard let clientParameterRegistry = MVMCoreObject.sharedInstance()?.clientParameterRegistry,
               let clientParameterModel = try ClientParameterRegistry.getClientParameterModel(clientParameters) else {
diff --git a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h
index eb9fba9..efa33b6 100644
--- a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h
+++ b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #import "MVMCoreRequestParameters.h"
 
-#define ENABLE_HARD_CODED_RESPONSE 0 && DEBUG
+#define ENABLE_HARD_CODED_RESPONSE 1 && DEBUG
 
 #if ENABLE_HARD_CODED_RESPONSE