diff --git a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterProtocol.swift b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterProtocol.swift
index 9d95876..0f6c843 100644
--- a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterProtocol.swift	
+++ b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterProtocol.swift	
@@ -15,20 +15,20 @@ public protocol ClientParameterProtocol {
     
     var clientParameterModel: ClientParameterModelProtocol { get set }
 
-    func fetchClientParameters(requestParameters: [String: Any], timingOutIn timeout: Double, completionHandler:@escaping (AnyHashable?) -> ())
+    func fetchClientParameters(requestParameters: [String: Any], timingOutIn timeout: Double, completionHandler:@escaping ([String: AnyHashable]?) -> ())
 
     /// Default parameter for timeout scenarios. It will use the protocol extension method bydefault. Can override to send custom values.
-    func valueOnTimeout() -> AnyHashable
+    func valueOnTimeout() -> [String: AnyHashable]
 }
 
 public extension ClientParameterProtocol {
     
-    func valueOnTimeout() -> AnyHashable {
+    func valueOnTimeout() -> [String: AnyHashable] {
         return [Self.name: "failed_to_collect"]
     }
 
     /// The handler should call this method to pass the parameter back to the caller.
-    func returnParameters(_ isFlatMap: Bool, _ parameter: [String: AnyHashable]?, completionHandler: @escaping (AnyHashable?) -> ()) {
+    func returnParameters(_ isFlatMap: Bool, _ parameter: [String: AnyHashable]?, completionHandler: @escaping ([String: AnyHashable]?) -> ()) {
         guard let parameter = parameter else {
             return completionHandler(nil)
         }
diff --git a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterRegistry.swift b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterRegistry.swift
index 3044a14..996dfbc 100644
--- a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterRegistry.swift	
+++ b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterRegistry.swift	
@@ -78,7 +78,8 @@ import Foundation
                 for (index, item) in returnedList.enumerated() {
                     if let item = item {
                         parametersList = parametersList.merging(item) { (_, new) in new }
-                    } else if let defaultValue = parameterHandlerList[index].valueOnTimeout() as? [String: AnyHashable] {
+                    } else {
+                        let defaultValue = parameterHandlerList[index].valueOnTimeout()
                         parametersList = parametersList.merging(defaultValue) { (_, new) in new }
                     }
                 }
@@ -109,9 +110,7 @@ import Foundation
                                                        timingOutIn: timeout) { (receivedParameter) in
                     // Queue the results for merge.
                     parametersWorkQueue.async {
-                        if let receivedParameter = receivedParameter as? [String: AnyHashable] {
-                            returnedList[index] = receivedParameter
-                        }
+                        returnedList[index] = receivedParameter
                         group.leave() // Leaving is only done after setup (barriered).
                     }
                 }
diff --git a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h
index efa33b6..eb9fba9 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 1 && DEBUG
+#define ENABLE_HARD_CODED_RESPONSE 0 && DEBUG
 
 #if ENABLE_HARD_CODED_RESPONSE