Merge remote-tracking branch 'origin/develop' into feature/issue_419_iOS6_removal

* origin/develop: Fixed issue around not calculating an SDLPutFile's currentOffset correctly. Updated unit tests to cover all SDLPutFiles, not just the first. Added in missing implementations of dictionary categories. Moved the import from SDLRPCStruct to implementation of all classes to remove build warning of redefinition Removed nonexistent files from project Added nullability annotations. Fixed issue using incorrect name for search address. Migrated to using a category instead of adding the classes to the subclass of SDLRPCStruct. Updated missing parameters. Updated setter/getter for all rpcs and structs to use convenience methods.
author: Muller, Alexander (A.) <amulle19@ford.com> 2017-01-19 13:06:09 -0800
committer: Muller, Alexander (A.) <amulle19@ford.com> 2017-01-19 13:06:09 -0800
commit: 60598db369fc814e92b448c549653edc57cf57b2 (patch)
tree: e4129f2d1ee07f6303bde12d6eaf160289a44a19
parent: 64bc1cd9db9f1cab94a0786cf4f09120b0aa4816 (diff)
parent: 69638e102c3f769a18145c0029a34f9b5f32f10b (diff)
download: sdl_ios-60598db369fc814e92b448c549653edc57cf57b2.tar.gz
174 files changed, 1565 insertions, 5690 deletions
diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec
index af2b17c54..4c640ff66 100644
--- a/SmartDeviceLink-iOS.podspec
+++ b/SmartDeviceLink-iOS.podspec
@@ -12,6 +12,7 @@ s.source_files = "SmartDeviceLink/*.{h,m}"
 s.requires_arc = true
 s.resource_bundles = { 'SmartDeviceLink' => ['SmartDeviceLink/Assets/**/*', 'SmartDeviceLink/iOS 7 Assets/*'] }
 s.public_header_files = [
+'SmartDeviceLink/NSMutableDictionary+Store.h',
 'SmartDeviceLink/SmartDeviceLink.h',
 'SmartDeviceLink/SDLJingle.h',
 'SmartDeviceLink/SDLProxy.h',
diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
index 6a2a02ed9..75ffff0a3 100644
--- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
+++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
@@ -863,6 +863,8 @@
 		5DFFB9151BD7C89700DB3F04 /* SDLConnectionManagerType.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DFFB9141BD7C89700DB3F04 /* SDLConnectionManagerType.h */; };
 		DA0C46AD1DCD35080001F2A8 /* SDLNames.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0C46AC1DCD35080001F2A8 /* SDLNames.m */; };
 		DA0C46AF1DCD41E30001F2A8 /* SDLMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = DA0C46AE1DCD41E30001F2A8 /* SDLMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DA318C1F1DD0F06C00C035AC /* NSMutableDictionary+Store.h in Headers */ = {isa = PBXBuildFile; fileRef = DA318C1D1DD0F06C00C035AC /* NSMutableDictionary+Store.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DA318C201DD0F06C00C035AC /* NSMutableDictionary+Store.m in Sources */ = {isa = PBXBuildFile; fileRef = DA318C1E1DD0F06C00C035AC /* NSMutableDictionary+Store.m */; };
 		DA4353DF1D271FD10099B8C4 /* CGPointUtilSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4353DE1D271FD10099B8C4 /* CGPointUtilSpec.m */; };
 		DA4353E31D2720A30099B8C4 /* SDLPinchGestureSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4353E21D2720A30099B8C4 /* SDLPinchGestureSpec.m */; };
 		DA4353E91D2721680099B8C4 /* DispatchTimerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4353E61D2721680099B8C4 /* DispatchTimerSpec.m */; };
@@ -1874,6 +1876,8 @@
 		5DFFB9141BD7C89700DB3F04 /* SDLConnectionManagerType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLConnectionManagerType.h; sourceTree = "<group>"; };
 		DA0C46AC1DCD35080001F2A8 /* SDLNames.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLNames.m; sourceTree = "<group>"; };
 		DA0C46AE1DCD41E30001F2A8 /* SDLMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLMacros.h; sourceTree = "<group>"; };
+		DA318C1D1DD0F06C00C035AC /* NSMutableDictionary+Store.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableDictionary+Store.h"; sourceTree = "<group>"; };
+		DA318C1E1DD0F06C00C035AC /* NSMutableDictionary+Store.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableDictionary+Store.m"; sourceTree = "<group>"; };
 		DA4353DE1D271FD10099B8C4 /* CGPointUtilSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CGPointUtilSpec.m; path = UtilitiesSpecs/Touches/CGPointUtilSpec.m; sourceTree = "<group>"; };
 		DA4353E21D2720A30099B8C4 /* SDLPinchGestureSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLPinchGestureSpec.m; path = UtilitiesSpecs/Touches/SDLPinchGestureSpec.m; sourceTree = "<group>"; };
 		DA4353E61D2721680099B8C4 /* DispatchTimerSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DispatchTimerSpec.m; path = UtilitiesSpecs/Touches/DispatchTimerSpec.m; sourceTree = "<group>"; };
@@ -3731,6 +3735,8 @@
 				E9C32B9B1AB20C5900F283AF /* EAAccessoryManager+SDLProtocols.m */,
 				E9C32B841AB20B4300F283AF /* NSThread+ThreadIndex.h */,
 				E9C32B851AB20B4300F283AF /* NSThread+ThreadIndex.m */,
+				DA318C1D1DD0F06C00C035AC /* NSMutableDictionary+Store.h */,
+				DA318C1E1DD0F06C00C035AC /* NSMutableDictionary+Store.m */,
 			);
 			name = "@categories";
 			sourceTree = "<group>";
@@ -3830,6 +3836,7 @@
 				5D3E48751D6F3B330000BFEF /* SDLAsynchronousOperation.h in Headers */,
 				DA9F7E631DCBFAC800ACAE48 /* SDLDateTime.h in Headers */,
 				5D61FCEA1A84238C00846EE7 /* SDLLayoutMode.h in Headers */,
+				DA318C1F1DD0F06C00C035AC /* NSMutableDictionary+Store.h in Headers */,
 				5D61FD7F1A84238C00846EE7 /* SDLSetAppIcon.h in Headers */,
 				5D61FDD11A84238C00846EE7 /* SDLTouchCoord.h in Headers */,
 				5D61FC7E1A84238C00846EE7 /* SDLDeleteSubMenu.h in Headers */,
@@ -4491,6 +4498,7 @@
 				DA9F7E9C1DCC052C00ACAE48 /* SDLLocationDetails.m in Sources */,
 				5D61FD7A1A84238C00846EE7 /* SDLScreenParams.m in Sources */,
 				5D61FC831A84238C00846EE7 /* SDLDeviceInfo.m in Sources */,
+				DA318C201DD0F06C00C035AC /* NSMutableDictionary+Store.m in Sources */,
 				5D7F87EC1CE3C1A1002DD7C4 /* SDLDeleteFileOperation.m in Sources */,
 				5D61FD641A84238C00846EE7 /* SDLResetGlobalProperties.m in Sources */,
 				5D60088B1BE3ED540094A505 /* SDLStateMachine.m in Sources */,
diff --git a/SmartDeviceLink/NSMutableDictionary+Store.h b/SmartDeviceLink/NSMutableDictionary+Store.h
new file mode 100644
index 000000000..dca054d94
--- /dev/null
+++ b/SmartDeviceLink/NSMutableDictionary+Store.h
@@ -0,0 +1,27 @@
+//
+//  NSMutableDictionary+Store.h
+//  SmartDeviceLink-iOS
+//
+//  Created by Muller, Alexander (A.) on 11/7/16.
+//  Copyright © 2016 smartdevicelink. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "SDLMacros.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NSString* SDLName SDL_SWIFT_ENUM;
+typedef NSString* SDLEnum SDL_SWIFT_ENUM;
+
+@interface NSMutableDictionary (Store)
+
+- (void)sdl_setObject:(NSObject *)object forName:(SDLName)name;
+- (nullable id)sdl_objectForName:(SDLName)name;
+- (nullable id)sdl_objectForName:(SDLName)name ofClass:(Class)classType;
+- (NSMutableArray *)sdl_objectsForName:(SDLName)name ofClass:(Class)classType;
+- (NSMutableArray<SDLEnum> *)sdl_enumsForName:(SDLName)name;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/NSMutableDictionary+Store.m b/SmartDeviceLink/NSMutableDictionary+Store.m
new file mode 100644
index 000000000..0fd7eec5c
--- /dev/null
+++ b/SmartDeviceLink/NSMutableDictionary+Store.m
@@ -0,0 +1,65 @@
+//
+//  NSMutableDictionary+Store.m
+//  SmartDeviceLink-iOS
+//
+//  Created by Muller, Alexander (A.) on 11/7/16.
+//  Copyright © 2016 smartdevicelink. All rights reserved.
+//
+
+#import "NSMutableDictionary+Store.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@implementation NSMutableDictionary (Store)
+
+- (void)sdl_setObject:(NSObject *)object forName:(SDLName)name {
+    if (object != nil) {
+        self[name] = object;
+    } else {
+        [self removeObjectForKey:name];
+    }
+}
+
+- (nullable id)sdl_objectForName:(SDLName)name {
+    return self[name];
+}
+
+- (nullable id)sdl_objectForName:(SDLName)name ofClass:(Class)classType {
+    NSObject *obj = [self sdl_objectForName:name];
+    if (obj == nil || [obj isKindOfClass:classType.class]) {
+        return obj;
+    } else {
+        return [[classType alloc] initWithDictionary:(NSDictionary *)obj];
+    }
+}
+
+- (NSMutableArray *)sdl_objectsForName:(SDLName)name ofClass:(Class)classType {
+    NSMutableArray *array = [self sdl_objectForName:name];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:classType.class]) {
+        return array;
+    } else {
+        NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSDictionary<NSString *, id> *dict in array) {
+            [newList addObject:[[classType alloc] initWithDictionary:dict]];
+        }
+        return newList;
+    }
+}
+
+- (NSMutableArray<SDLEnum> *)sdl_enumsForName:(SDLName)name {
+    NSMutableArray<SDLEnum> *array = [self sdl_objectForName:name];
+    if ([array count] < 1) {
+        return array;
+    } else {
+        NSMutableArray<SDLEnum> *newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (SDLEnum enumString in array) {
+            [newList addObject:enumString];
+        }
+        return newList;
+    }
+}
+
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLAbstractTransport.m b/SmartDeviceLink/SDLAbstractTransport.m
index 94649553b..4f2657bd2 100644
--- a/SmartDeviceLink/SDLAbstractTransport.m
+++ b/SmartDeviceLink/SDLAbstractTransport.m
@@ -2,6 +2,8 @@
 
 #import "SDLAbstractTransport.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @implementation SDLAbstractTransport
 
 - (instancetype)init {
@@ -28,3 +30,5 @@
 }
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLAddCommand.m b/SmartDeviceLink/SDLAddCommand.m
index 37d70d19c..ddf4ee4ce 100644
--- a/SmartDeviceLink/SDLAddCommand.m
+++ b/SmartDeviceLink/SDLAddCommand.m
@@ -4,6 +4,7 @@
 
 #import "SDLAddCommand.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLImage.h"
 #import "SDLMenuParams.h"
 #import "SDLNames.h"
@@ -68,61 +69,35 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setCmdID:(NSNumber<SDLInt> *)cmdID {
-    if (cmdID != nil) {
-        [parameters setObject:cmdID forKey:SDLNameCommandId];
-    } else {
-        [parameters removeObjectForKey:SDLNameCommandId];
-    }
+    [parameters sdl_setObject:cmdID forName:SDLNameCommandId];
 }
 
 - (NSNumber<SDLInt> *)cmdID {
-    return [parameters objectForKey:SDLNameCommandId];
+    return [parameters sdl_objectForName:SDLNameCommandId];
 }
 
 - (void)setMenuParams:(nullable SDLMenuParams *)menuParams {
-    if (menuParams != nil) {
-        [parameters setObject:menuParams forKey:SDLNameMenuParams];
-    } else {
-        [parameters removeObjectForKey:SDLNameMenuParams];
-    }
+    [parameters sdl_setObject:menuParams forName:SDLNameMenuParams];
 }
 
 - (nullable SDLMenuParams *)menuParams {
-    NSObject *obj = [parameters objectForKey:SDLNameMenuParams];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLMenuParams alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLMenuParams*)obj;
+    return [parameters sdl_objectForName:SDLNameMenuParams ofClass:SDLMenuParams.class];
 }
 
 - (void)setVrCommands:(nullable NSMutableArray<NSString *> *)vrCommands {
-    if (vrCommands != nil) {
-        [parameters setObject:vrCommands forKey:SDLNameVRCommands];
-    } else {
-        [parameters removeObjectForKey:SDLNameVRCommands];
-    }
+    [parameters sdl_setObject:vrCommands forName:SDLNameVRCommands];
 }
 
 - (nullable NSMutableArray<NSString *> *)vrCommands {
-    return [parameters objectForKey:SDLNameVRCommands];
+    return [parameters sdl_objectForName:SDLNameVRCommands];
 }
 
 - (void)setCmdIcon:(nullable SDLImage *)cmdIcon {
-    if (cmdIcon != nil) {
-        [parameters setObject:cmdIcon forKey:SDLNameCommandIcon];
-    } else {
-        [parameters removeObjectForKey:SDLNameCommandIcon];
-    }
+    [parameters sdl_setObject:cmdIcon forName:SDLNameCommandIcon];
 }
 
 - (nullable SDLImage *)cmdIcon {
-    NSObject *obj = [parameters objectForKey:SDLNameCommandIcon];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLImage*)obj;
+    return [parameters sdl_objectForName:SDLNameCommandIcon ofClass:SDLImage.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLAddCommandResponse.m b/SmartDeviceLink/SDLAddCommandResponse.m
index d5504c4c8..877b189ec 100644
--- a/SmartDeviceLink/SDLAddCommandResponse.m
+++ b/SmartDeviceLink/SDLAddCommandResponse.m
@@ -2,6 +2,7 @@
 
 #import "SDLAddCommandResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLAddSubMenu.m b/SmartDeviceLink/SDLAddSubMenu.m
index 8388acc10..4f8ef5109 100644
--- a/SmartDeviceLink/SDLAddSubMenu.m
+++ b/SmartDeviceLink/SDLAddSubMenu.m
@@ -2,6 +2,7 @@
 
 #import "SDLAddSubMenu.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -39,39 +40,27 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setMenuID:(NSNumber<SDLInt> *)menuID {
-    if (menuID != nil) {
-        [parameters setObject:menuID forKey:SDLNameMenuId];
-    } else {
-        [parameters removeObjectForKey:SDLNameMenuId];
-    }
+    [parameters sdl_setObject:menuID forName:SDLNameMenuId];
 }
 
 - (NSNumber<SDLInt> *)menuID {
-    return [parameters objectForKey:SDLNameMenuId];
+    return [parameters sdl_objectForName:SDLNameMenuId];
 }
 
 - (void)setPosition:(nullable NSNumber<SDLInt> *)position {
-    if (position != nil) {
-        [parameters setObject:position forKey:SDLNamePosition];
-    } else {
-        [parameters removeObjectForKey:SDLNamePosition];
-    }
+    [parameters sdl_setObject:position forName:SDLNamePosition];
 }
 
 - (nullable NSNumber<SDLInt> *)position {
-    return [parameters objectForKey:SDLNamePosition];
+    return [parameters sdl_objectForName:SDLNamePosition];
 }
 
 - (void)setMenuName:(NSString *)menuName {
-    if (menuName != nil) {
-        [parameters setObject:menuName forKey:SDLNameMenuName];
-    } else {
-        [parameters removeObjectForKey:SDLNameMenuName];
-    }
+    [parameters sdl_setObject:menuName forName:SDLNameMenuName];
 }
 
 - (NSString *)menuName {
-    return [parameters objectForKey:SDLNameMenuName];
+    return [parameters sdl_objectForName:SDLNameMenuName];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLAddSubMenuResponse.m b/SmartDeviceLink/SDLAddSubMenuResponse.m
index db483cf3a..41ab1d8ce 100644
--- a/SmartDeviceLink/SDLAddSubMenuResponse.m
+++ b/SmartDeviceLink/SDLAddSubMenuResponse.m
@@ -2,6 +2,7 @@
 
 #import "SDLAddSubMenuResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLAirbagStatus.m b/SmartDeviceLink/SDLAirbagStatus.m
index a320d40fc..453d08304 100644
--- a/SmartDeviceLink/SDLAirbagStatus.m
+++ b/SmartDeviceLink/SDLAirbagStatus.m
@@ -2,6 +2,7 @@
 
 #import "SDLAirbagStatus.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -9,107 +10,66 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLAirbagStatus
 
 - (void)setDriverAirbagDeployed:(SDLVehicleDataEventStatus)driverAirbagDeployed {
-    if (driverAirbagDeployed != nil) {
-        [store setObject:driverAirbagDeployed forKey:SDLNameDriverAirbagDeployed];
-    } else {
-        [store removeObjectForKey:SDLNameDriverAirbagDeployed];
-    }
+    [store sdl_setObject:driverAirbagDeployed forName:SDLNameDriverAirbagDeployed];
 }
 
 - (SDLVehicleDataEventStatus)driverAirbagDeployed {
-    NSObject *obj = [store objectForKey:SDLNameDriverAirbagDeployed];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNameDriverAirbagDeployed];
 }
 
 - (void)setDriverSideAirbagDeployed:(SDLVehicleDataEventStatus)driverSideAirbagDeployed {
-    if (driverSideAirbagDeployed != nil) {
-        [store setObject:driverSideAirbagDeployed forKey:SDLNameDriverSideAirbagDeployed];
-    } else {
-        [store removeObjectForKey:SDLNameDriverSideAirbagDeployed];
-    }
+    [store sdl_setObject:driverSideAirbagDeployed forName:SDLNameDriverSideAirbagDeployed];
 }
 
 - (SDLVehicleDataEventStatus)driverSideAirbagDeployed {
-    NSObject *obj = [store objectForKey:SDLNameDriverSideAirbagDeployed];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNameDriverSideAirbagDeployed];
 }
 
 - (void)setDriverCurtainAirbagDeployed:(SDLVehicleDataEventStatus)driverCurtainAirbagDeployed {
-    if (driverCurtainAirbagDeployed != nil) {
-        [store setObject:driverCurtainAirbagDeployed forKey:SDLNameDriverCurtainAirbagDeployed];
-    } else {
-        [store removeObjectForKey:SDLNameDriverCurtainAirbagDeployed];
-    }
+    [store sdl_setObject:driverCurtainAirbagDeployed forName:SDLNameDriverCurtainAirbagDeployed];
 }
 
 - (SDLVehicleDataEventStatus)driverCurtainAirbagDeployed {
-    NSObject *obj = [store objectForKey:SDLNameDriverCurtainAirbagDeployed];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNameDriverCurtainAirbagDeployed];
 }
 
 - (void)setPassengerAirbagDeployed:(SDLVehicleDataEventStatus)passengerAirbagDeployed {
-    if (passengerAirbagDeployed != nil) {
-        [store setObject:passengerAirbagDeployed forKey:SDLNamePassengerAirbagDeployed];
-    } else {
-        [store removeObjectForKey:SDLNamePassengerAirbagDeployed];
-    }
-}
+    [store sdl_setObject:passengerAirbagDeployed forName:SDLNamePassengerAirbagDeployed];}
 
 - (SDLVehicleDataEventStatus)passengerAirbagDeployed {
-    NSObject *obj = [store objectForKey:SDLNamePassengerAirbagDeployed];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNamePassengerAirbagDeployed];
 }
 
 - (void)setPassengerCurtainAirbagDeployed:(SDLVehicleDataEventStatus)passengerCurtainAirbagDeployed {
-    if (passengerCurtainAirbagDeployed != nil) {
-        [store setObject:passengerCurtainAirbagDeployed forKey:SDLNamePassengerCurtainAirbagDeployed];
-    } else {
-        [store removeObjectForKey:SDLNamePassengerCurtainAirbagDeployed];
-    }
+    [store sdl_setObject:passengerCurtainAirbagDeployed forName:SDLNamePassengerCurtainAirbagDeployed];
 }
 
 - (SDLVehicleDataEventStatus)passengerCurtainAirbagDeployed {
-    NSObject *obj = [store objectForKey:SDLNamePassengerCurtainAirbagDeployed];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNamePassengerCurtainAirbagDeployed];
 }
 
 - (void)setDriverKneeAirbagDeployed:(SDLVehicleDataEventStatus)driverKneeAirbagDeployed {
-    if (driverKneeAirbagDeployed != nil) {
-        [store setObject:driverKneeAirbagDeployed forKey:SDLNameDriverKneeAirbagDeployed];
-    } else {
-        [store removeObjectForKey:SDLNameDriverKneeAirbagDeployed];
-    }
+    [store sdl_setObject:driverKneeAirbagDeployed forName:SDLNameDriverKneeAirbagDeployed];
 }
 
 - (SDLVehicleDataEventStatus)driverKneeAirbagDeployed {
-    NSObject *obj = [store objectForKey:SDLNameDriverKneeAirbagDeployed];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNameDriverKneeAirbagDeployed];
 }
 
 - (void)setPassengerSideAirbagDeployed:(SDLVehicleDataEventStatus)passengerSideAirbagDeployed {
-    if (passengerSideAirbagDeployed != nil) {
-        [store setObject:passengerSideAirbagDeployed forKey:SDLNamePassengerSideAirbagDeployed];
-    } else {
-        [store removeObjectForKey:SDLNamePassengerSideAirbagDeployed];
-    }
+    [store sdl_setObject:passengerSideAirbagDeployed forName:SDLNamePassengerSideAirbagDeployed];
 }
 
 - (SDLVehicleDataEventStatus)passengerSideAirbagDeployed {
-    NSObject *obj = [store objectForKey:SDLNamePassengerSideAirbagDeployed];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNamePassengerSideAirbagDeployed];
 }
 
 - (void)setPassengerKneeAirbagDeployed:(SDLVehicleDataEventStatus)passengerKneeAirbagDeployed {
-    if (passengerKneeAirbagDeployed != nil) {
-        [store setObject:passengerKneeAirbagDeployed forKey:SDLNamePassengerKneeAirbagDeployed];
-    } else {
-        [store removeObjectForKey:SDLNamePassengerKneeAirbagDeployed];
-    }
+    [store sdl_setObject:passengerKneeAirbagDeployed forName:SDLNamePassengerKneeAirbagDeployed];
 }
 
 - (SDLVehicleDataEventStatus)passengerKneeAirbagDeployed {
-    NSObject *obj = [store objectForKey:SDLNamePassengerKneeAirbagDeployed];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNamePassengerKneeAirbagDeployed];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLAlert.m b/SmartDeviceLink/SDLAlert.m
index c1a1f04d4..2b5640505 100644
--- a/SmartDeviceLink/SDLAlert.m
+++ b/SmartDeviceLink/SDLAlert.m
@@ -2,6 +2,7 @@
 
 #import "SDLAlert.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "SDLSoftButton.h"
 #import "SDLTTSChunk.h"
@@ -73,117 +74,67 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setAlertText1:(nullable NSString *)alertText1 {
-    if (alertText1 != nil) {
-        [parameters setObject:alertText1 forKey:SDLNameAlertText1];
-    } else {
-        [parameters removeObjectForKey:SDLNameAlertText1];
-    }
+    [parameters sdl_setObject:alertText1 forName:SDLNameAlertText1];
 }
 
 - (nullable NSString *)alertText1 {
-    return [parameters objectForKey:SDLNameAlertText1];
+    return [parameters sdl_objectForName:SDLNameAlertText1];
 }
 
 - (void)setAlertText2:(nullable NSString *)alertText2 {
-    if (alertText2 != nil) {
-        [parameters setObject:alertText2 forKey:SDLNameAlertText2];
-    } else {
-        [parameters removeObjectForKey:SDLNameAlertText2];
-    }
+    [parameters sdl_setObject:alertText2 forName:SDLNameAlertText2];
 }
 
 - (nullable NSString *)alertText2 {
-    return [parameters objectForKey:SDLNameAlertText2];
+    return [parameters sdl_objectForName:SDLNameAlertText2];
 }
 
 - (void)setAlertText3:(nullable NSString *)alertText3 {
-    if (alertText3 != nil) {
-        [parameters setObject:alertText3 forKey:SDLNameAlertText3];
-    } else {
-        [parameters removeObjectForKey:SDLNameAlertText3];
-    }
+    [parameters sdl_setObject:alertText3 forName:SDLNameAlertText3];
 }
 
 - (nullable NSString *)alertText3 {
-    return [parameters objectForKey:SDLNameAlertText3];
+    return [parameters sdl_objectForName:SDLNameAlertText3];
 }
 
 - (void)setTtsChunks:(nullable NSMutableArray<SDLTTSChunk *> *)ttsChunks {
-    if (ttsChunks != nil) {
-        [parameters setObject:ttsChunks forKey:SDLNameTTSChunks];
-    } else {
-        [parameters removeObjectForKey:SDLNameTTSChunks];
-    }
+    [parameters sdl_setObject:ttsChunks forName:SDLNameTTSChunks];
 }
 
 - (nullable NSMutableArray<SDLTTSChunk *> *)ttsChunks {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameTTSChunks];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLTTSChunk *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameTTSChunks ofClass:SDLTTSChunk.class];
 }
 
 - (void)setDuration:(nullable NSNumber<SDLInt> *)duration {
-    if (duration != nil) {
-        [parameters setObject:duration forKey:SDLNameDuration];
-    } else {
-        [parameters removeObjectForKey:SDLNameDuration];
-    }
+    [parameters sdl_setObject:duration forName:SDLNameDuration];
 }
 
 - (nullable NSNumber<SDLInt> *)duration {
-    return [parameters objectForKey:SDLNameDuration];
+    return [parameters sdl_objectForName:SDLNameDuration];
 }
 
 - (void)setPlayTone:(nullable NSNumber<SDLBool> *)playTone {
-    if (playTone != nil) {
-        [parameters setObject:playTone forKey:SDLNamePlayTone];
-    } else {
-        [parameters removeObjectForKey:SDLNamePlayTone];
-    }
+    [parameters sdl_setObject:playTone forName:SDLNamePlayTone];
 }
 
 - (nullable NSNumber<SDLBool> *)playTone {
-    return [parameters objectForKey:SDLNamePlayTone];
+    return [parameters sdl_objectForName:SDLNamePlayTone];
 }
 
 - (void)setProgressIndicator:(nullable NSNumber<SDLBool> *)progressIndicator {
-    if (progressIndicator != nil) {
-        [parameters setObject:progressIndicator forKey:SDLNameProgressIndicator];
-    } else {
-        [parameters removeObjectForKey:SDLNameProgressIndicator];
-    }
+    [parameters sdl_setObject:progressIndicator forName:SDLNameProgressIndicator];
 }
 
 - (nullable NSNumber<SDLBool> *)progressIndicator {
-    return [parameters objectForKey:SDLNameProgressIndicator];
+    return [parameters sdl_objectForName:SDLNameProgressIndicator];
 }
 
 - (void)setSoftButtons:(nullable NSMutableArray<SDLSoftButton *> *)softButtons {
-    if (softButtons != nil) {
-        [parameters setObject:softButtons forKey:SDLNameSoftButtons];
-    } else {
-        [parameters removeObjectForKey:SDLNameSoftButtons];
-    }
+    [parameters sdl_setObject:softButtons forName:SDLNameSoftButtons];
 }
 
 - (nullable NSMutableArray<SDLSoftButton *> *)softButtons {
-    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:SDLNameSoftButtons];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLSoftButton *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLSoftButton alloc] initWithDictionary:dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameSoftButtons ofClass:SDLSoftButton.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLAlertManeuver.m b/SmartDeviceLink/SDLAlertManeuver.m
index 4aea64b46..433669cab 100644
--- a/SmartDeviceLink/SDLAlertManeuver.m
+++ b/SmartDeviceLink/SDLAlertManeuver.m
@@ -4,6 +4,7 @@
 
 #import "SDLAlertManeuver.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "SDLSoftButton.h"
 #import "SDLTTSChunk.h"
@@ -37,45 +38,19 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setTtsChunks:(nullable NSMutableArray<SDLTTSChunk *> *)ttsChunks {
-    if (ttsChunks != nil) {
-        [parameters setObject:ttsChunks forKey:SDLNameTTSChunks];
-    } else {
-        [parameters removeObjectForKey:SDLNameTTSChunks];
-    }
+    [parameters sdl_setObject:ttsChunks forName:SDLNameTTSChunks];
 }
 
 - (nullable NSMutableArray<SDLTTSChunk *> *)ttsChunks {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameTTSChunks];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLTTSChunk *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameTTSChunks ofClass:SDLTTSChunk.class];
 }
 
 - (void)setSoftButtons:(nullable NSMutableArray<SDLSoftButton *> *)softButtons {
-    if (softButtons != nil) {
-        [parameters setObject:softButtons forKey:SDLNameSoftButtons];
-    } else {
-        [parameters removeObjectForKey:SDLNameSoftButtons];
-    }
+    [parameters sdl_setObject:softButtons forName:SDLNameSoftButtons];
 }
 
 - (nullable NSMutableArray<SDLSoftButton *> *)softButtons {
-    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:SDLNameSoftButtons];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLSoftButton *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLSoftButton alloc] initWithDictionary:dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameSoftButtons ofClass:SDLSoftButton.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLAlertManeuverResponse.m b/SmartDeviceLink/SDLAlertManeuverResponse.m
index b66d13afe..99cc21cf5 100644
--- a/SmartDeviceLink/SDLAlertManeuverResponse.m
+++ b/SmartDeviceLink/SDLAlertManeuverResponse.m
@@ -3,6 +3,7 @@
 
 #import "SDLAlertManeuverResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLAlertResponse.m b/SmartDeviceLink/SDLAlertResponse.m
index e608b807c..f93a124e7 100644
--- a/SmartDeviceLink/SDLAlertResponse.m
+++ b/SmartDeviceLink/SDLAlertResponse.m
@@ -3,8 +3,11 @@
 
 #import "SDLAlertResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @implementation SDLAlertResponse
 
 - (instancetype)init {
@@ -14,15 +17,12 @@
 }
 
 - (void)setTryAgainTime:(nullable NSNumber<SDLInt> *)tryAgainTime {
-    if (tryAgainTime != nil) {
-        [parameters setObject:tryAgainTime forKey:SDLNameTryAgainTime];
-    } else {
-        [parameters removeObjectForKey:SDLNameTryAgainTime];
-    }
-}
+    [parameters sdl_setObject:tryAgainTime forName:SDLNameTryAgainTime];}
 
 - (nullable NSNumber<SDLInt> *)tryAgainTime {
     return [parameters objectForKey:SDLNameTryAgainTime];
 }
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLAppInfo.m b/SmartDeviceLink/SDLAppInfo.m
index 530e90632..a9102d40e 100644
--- a/SmartDeviceLink/SDLAppInfo.m
+++ b/SmartDeviceLink/SDLAppInfo.m
@@ -3,6 +3,7 @@
 
 #import "SDLAppInfo.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionString";
@@ -26,39 +27,27 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setAppDisplayName:(NSString *)appDisplayName {
-    if (appDisplayName != nil) {
-        [store setObject:appDisplayName forKey:SDLNameAppDisplayName];
-    } else {
-        [store removeObjectForKey:SDLNameAppDisplayName];
-    }
+    [store sdl_setObject:appDisplayName forName:SDLNameAppDisplayName];
 }
 
 - (NSString *)appDisplayName {
-    return [store objectForKey:SDLNameAppDisplayName];
+    return [store sdl_objectForName:SDLNameAppDisplayName];
 }
 
 - (void)setAppBundleID:(NSString *)appBundleID {
-    if (appBundleID != nil) {
-        [store setObject:appBundleID forKey:SDLNameAppBundleId];
-    } else {
-        [store removeObjectForKey:SDLNameAppBundleId];
-    }
+    [store sdl_setObject:appBundleID forName:SDLNameAppBundleId];
 }
 
 - (NSString *)appBundleID {
-    return [store objectForKey:SDLNameAppBundleId];
+    return [store sdl_objectForName:SDLNameAppBundleId];
 }
 
 - (void)setAppVersion:(NSString *)appVersion {
-    if (appVersion != nil) {
-        [store setObject:appVersion forKey:SDLNameAppVersion];
-    } else {
-        [store removeObjectForKey:SDLNameAppVersion];
-    }
+    [store sdl_setObject:appVersion forName:SDLNameAppVersion];
 }
 
 - (NSString *)appVersion {
-    return [store objectForKey:SDLNameAppVersion];
+    return [store sdl_objectForName:SDLNameAppVersion];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLAudioPassThruCapabilities.m b/SmartDeviceLink/SDLAudioPassThruCapabilities.m
index 5981de92d..268170757 100644
--- a/SmartDeviceLink/SDLAudioPassThruCapabilities.m
+++ b/SmartDeviceLink/SDLAudioPassThruCapabilities.m
@@ -4,6 +4,7 @@
 
 #import "SDLAudioPassThruCapabilities.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -11,42 +12,27 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLAudioPassThruCapabilities
 
 - (void)setSamplingRate:(SDLSamplingRate)samplingRate {
-    if (samplingRate != nil) {
-        [store setObject:samplingRate forKey:SDLNameSamplingRate];
-    } else {
-        [store removeObjectForKey:SDLNameSamplingRate];
-    }
+    [store sdl_setObject:samplingRate forName:SDLNameSamplingRate];
 }
 
 - (SDLSamplingRate)samplingRate {
-    NSObject *obj = [store objectForKey:SDLNameSamplingRate];
-    return (SDLSamplingRate)obj;
+    return [store sdl_objectForName:SDLNameSamplingRate];
 }
 
 - (void)setBitsPerSample:(SDLBitsPerSample)bitsPerSample {
-    if (bitsPerSample != nil) {
-        [store setObject:bitsPerSample forKey:SDLNameBitsPerSample];
-    } else {
-        [store removeObjectForKey:SDLNameBitsPerSample];
-    }
+    [store sdl_setObject:bitsPerSample forName:SDLNameBitsPerSample];
 }
 
 - (SDLBitsPerSample)bitsPerSample {
-    NSObject *obj = [store objectForKey:SDLNameBitsPerSample];
-    return (SDLBitsPerSample)obj;
+    return [store sdl_objectForName:SDLNameBitsPerSample];
 }
 
 - (void)setAudioType:(SDLAudioType)audioType {
-    if (audioType != nil) {
-        [store setObject:audioType forKey:SDLNameAudioType];
-    } else {
-        [store removeObjectForKey:SDLNameAudioType];
-    }
+    [store sdl_setObject:audioType forName:SDLNameAudioType];
 }
 
 - (SDLAudioType)audioType {
-    NSObject *obj = [store objectForKey:SDLNameAudioType];
-    return (SDLAudioType)obj;
+    return [store sdl_objectForName:SDLNameAudioType];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLBeltStatus.m b/SmartDeviceLink/SDLBeltStatus.m
index 7f376761a..d65a1fd74 100644
--- a/SmartDeviceLink/SDLBeltStatus.m
+++ b/SmartDeviceLink/SDLBeltStatus.m
@@ -3,6 +3,7 @@
 
 #import "SDLBeltStatus.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "SDLVehicleDataEventStatus.h"
 
@@ -11,198 +12,123 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLBeltStatus
 
 - (void)setDriverBeltDeployed:(SDLVehicleDataEventStatus)driverBeltDeployed {
-    if (driverBeltDeployed != nil) {
-        [store setObject:driverBeltDeployed forKey:SDLNameDriverBeltDeployed];
-    } else {
-        [store removeObjectForKey:SDLNameDriverBeltDeployed];
-    }
+    [store sdl_setObject:driverBeltDeployed forName:SDLNameDriverBeltDeployed];
 }
 
 - (SDLVehicleDataEventStatus)driverBeltDeployed {
-    NSObject *obj = [store objectForKey:SDLNameDriverBeltDeployed];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNameDriverBeltDeployed];
 }
 
 - (void)setPassengerBeltDeployed:(SDLVehicleDataEventStatus)passengerBeltDeployed {
-    if (passengerBeltDeployed != nil) {
-        [store setObject:passengerBeltDeployed forKey:SDLNamePassengerBeltDeployed];
-    } else {
-        [store removeObjectForKey:SDLNamePassengerBeltDeployed];
-    }
+    [store sdl_setObject:passengerBeltDeployed forName:SDLNamePassengerBeltDeployed];
 }
 
 - (SDLVehicleDataEventStatus)passengerBeltDeployed {
-    NSObject *obj = [store objectForKey:SDLNamePassengerBeltDeployed];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNamePassengerBeltDeployed];
 }
 
 - (void)setPassengerBuckleBelted:(SDLVehicleDataEventStatus)passengerBuckleBelted {
-    if (passengerBuckleBelted != nil) {
-        [store setObject:passengerBuckleBelted forKey:SDLNamePassengerBuckleBelted];
-    } else {
-        [store removeObjectForKey:SDLNamePassengerBuckleBelted];
-    }
+    [store sdl_setObject:passengerBuckleBelted forName:SDLNamePassengerBuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)passengerBuckleBelted {
-    NSObject *obj = [store objectForKey:SDLNamePassengerBuckleBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNamePassengerBuckleBelted];
 }
 
 - (void)setDriverBuckleBelted:(SDLVehicleDataEventStatus)driverBuckleBelted {
-    if (driverBuckleBelted != nil) {
-        [store setObject:driverBuckleBelted forKey:SDLNameDriverBuckleBelted];
-    } else {
-        [store removeObjectForKey:SDLNameDriverBuckleBelted];
-    }
+    [store sdl_setObject:driverBuckleBelted forName:SDLNameDriverBuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)driverBuckleBelted {
-    NSObject *obj = [store objectForKey:SDLNameDriverBuckleBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNameDriverBuckleBelted];
 }
 
 - (void)setLeftRow2BuckleBelted:(SDLVehicleDataEventStatus)leftRow2BuckleBelted {
-    if (leftRow2BuckleBelted != nil) {
-        [store setObject:leftRow2BuckleBelted forKey:SDLNameLeftRow2BuckleBelted];
-    } else {
-        [store removeObjectForKey:SDLNameLeftRow2BuckleBelted];
-    }
+    [store sdl_setObject:leftRow2BuckleBelted forName:SDLNameLeftRow2BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)leftRow2BuckleBelted {
-    NSObject *obj = [store objectForKey:SDLNameLeftRow2BuckleBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNameLeftRow2BuckleBelted];
 }
 
 - (void)setPassengerChildDetected:(SDLVehicleDataEventStatus)passengerChildDetected {
-    if (passengerChildDetected != nil) {
-        [store setObject:passengerChildDetected forKey:SDLNamePassengerChildDetected];
-    } else {
-        [store removeObjectForKey:SDLNamePassengerChildDetected];
-    }
+    [store sdl_setObject:passengerChildDetected forName:SDLNamePassengerChildDetected];
 }
 
 - (SDLVehicleDataEventStatus)passengerChildDetected {
-    NSObject *obj = [store objectForKey:SDLNamePassengerChildDetected];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNamePassengerChildDetected];
 }
 
 - (void)setRightRow2BuckleBelted:(SDLVehicleDataEventStatus)rightRow2BuckleBelted {
-    if (rightRow2BuckleBelted != nil) {
-        [store setObject:rightRow2BuckleBelted forKey:SDLNameRightRow2BuckleBelted];
-    } else {
-        [store removeObjectForKey:SDLNameRightRow2BuckleBelted];
-    }
+    [store sdl_setObject:rightRow2BuckleBelted forName:SDLNameRightRow2BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)rightRow2BuckleBelted {
-    NSObject *obj = [store objectForKey:SDLNameRightRow2BuckleBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNameRightRow2BuckleBelted];
 }
 
 - (void)setMiddleRow2BuckleBelted:(SDLVehicleDataEventStatus)middleRow2BuckleBelted {
-    if (middleRow2BuckleBelted != nil) {
-        [store setObject:middleRow2BuckleBelted forKey:SDLNameMiddleRow2BuckleBelted];
-    } else {
-        [store removeObjectForKey:SDLNameMiddleRow2BuckleBelted];
-    }
+    [store sdl_setObject:middleRow2BuckleBelted forName:SDLNameMiddleRow2BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)middleRow2BuckleBelted {
-    NSObject *obj = [store objectForKey:SDLNameMiddleRow2BuckleBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNameMiddleRow2BuckleBelted];
 }
 
 - (void)setMiddleRow3BuckleBelted:(SDLVehicleDataEventStatus)middleRow3BuckleBelted {
-    if (middleRow3BuckleBelted != nil) {
-        [store setObject:middleRow3BuckleBelted forKey:SDLNameMiddleRow3BuckleBelted];
-    } else {
-        [store removeObjectForKey:SDLNameMiddleRow3BuckleBelted];
-    }
+    [store sdl_setObject:middleRow3BuckleBelted forName:SDLNameMiddleRow3BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)middleRow3BuckleBelted {
-    NSObject *obj = [store objectForKey:SDLNameMiddleRow3BuckleBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNameMiddleRow3BuckleBelted];
 }
 
 - (void)setLeftRow3BuckleBelted:(SDLVehicleDataEventStatus)leftRow3BuckleBelted {
-    if (leftRow3BuckleBelted != nil) {
-        [store setObject:leftRow3BuckleBelted forKey:SDLNameLeftRow3BuckleBelted];
-    } else {
-        [store removeObjectForKey:SDLNameLeftRow3BuckleBelted];
-    }
+    [store sdl_setObject:leftRow3BuckleBelted forName:SDLNameLeftRow3BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)leftRow3BuckleBelted {
-    NSObject *obj = [store objectForKey:SDLNameLeftRow3BuckleBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNameLeftRow3BuckleBelted];
 }
 
 - (void)setRightRow3BuckleBelted:(SDLVehicleDataEventStatus)rightRow3BuckleBelted {
-    if (rightRow3BuckleBelted != nil) {
-        [store setObject:rightRow3BuckleBelted forKey:SDLNameRightRow3BuckleBelted];
-    } else {
-        [store removeObjectForKey:SDLNameRightRow3BuckleBelted];
-    }
+    [store sdl_setObject:rightRow3BuckleBelted forName:SDLNameRightRow3BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)rightRow3BuckleBelted {
-    NSObject *obj = [store objectForKey:SDLNameRightRow3BuckleBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNameRightRow3BuckleBelted];
 }
 
 - (void)setLeftRearInflatableBelted:(SDLVehicleDataEventStatus)leftRearInflatableBelted {
-    if (leftRearInflatableBelted != nil) {
-        [store setObject:leftRearInflatableBelted forKey:SDLNameLeftRearInflatableBelted];
-    } else {
-        [store removeObjectForKey:SDLNameLeftRearInflatableBelted];
-    }
+    [store sdl_setObject:leftRearInflatableBelted forName:SDLNameLeftRearInflatableBelted];
 }
 
 - (SDLVehicleDataEventStatus)leftRearInflatableBelted {
-    NSObject *obj = [store objectForKey:SDLNameLeftRearInflatableBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNameLeftRearInflatableBelted];
 }
 
 - (void)setRightRearInflatableBelted:(SDLVehicleDataEventStatus)rightRearInflatableBelted {
-    if (rightRearInflatableBelted != nil) {
-        [store setObject:rightRearInflatableBelted forKey:SDLNameRightRearInflatableBelted];
-    } else {
-        [store removeObjectForKey:SDLNameRightRearInflatableBelted];
-    }
+    [store sdl_setObject:rightRearInflatableBelted forName:SDLNameRightRearInflatableBelted];
 }
 
 - (SDLVehicleDataEventStatus)rightRearInflatableBelted {
-    NSObject *obj = [store objectForKey:SDLNameRightRearInflatableBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNameRightRearInflatableBelted];
 }
 
 - (void)setMiddleRow1BeltDeployed:(SDLVehicleDataEventStatus)middleRow1BeltDeployed {
-    if (middleRow1BeltDeployed != nil) {
-        [store setObject:middleRow1BeltDeployed forKey:SDLNameMiddleRow1BeltDeployed];
-    } else {
-        [store removeObjectForKey:SDLNameMiddleRow1BeltDeployed];
-    }
+    [store sdl_setObject:middleRow1BeltDeployed forName:SDLNameMiddleRow1BeltDeployed];
 }
 
 - (SDLVehicleDataEventStatus)middleRow1BeltDeployed {
-    NSObject *obj = [store objectForKey:SDLNameMiddleRow1BeltDeployed];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNameMiddleRow1BeltDeployed];
 }
 
 - (void)setMiddleRow1BuckleBelted:(SDLVehicleDataEventStatus)middleRow1BuckleBelted {
-    if (middleRow1BuckleBelted != nil) {
-        [store setObject:middleRow1BuckleBelted forKey:SDLNameMiddleRow1BuckleBelted];
-    } else {
-        [store removeObjectForKey:SDLNameMiddleRow1BuckleBelted];
-    }
+    [store sdl_setObject:middleRow1BuckleBelted forName:SDLNameMiddleRow1BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)middleRow1BuckleBelted {
-    NSObject *obj = [store objectForKey:SDLNameMiddleRow1BuckleBelted];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNameMiddleRow1BuckleBelted];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLBodyInformation.m b/SmartDeviceLink/SDLBodyInformation.m
index 71f20254b..3ffbe97c0 100644
--- a/SmartDeviceLink/SDLBodyInformation.m
+++ b/SmartDeviceLink/SDLBodyInformation.m
@@ -4,96 +4,71 @@
 
 #import "SDLBodyInformation.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLIgnitionStableStatus.h"
 #import "SDLIgnitionStatus.h"
 #import "SDLNames.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @implementation SDLBodyInformation
 
 - (void)setParkBrakeActive:(NSNumber<SDLBool> *)parkBrakeActive {
-    if (parkBrakeActive != nil) {
-        [store setObject:parkBrakeActive forKey:SDLNameParkBrakeActive];
-    } else {
-        [store removeObjectForKey:SDLNameParkBrakeActive];
-    }
+    [store sdl_setObject:parkBrakeActive forName:SDLNameParkBrakeActive];
 }
 
 - (NSNumber<SDLBool> *)parkBrakeActive {
-    return [store objectForKey:SDLNameParkBrakeActive];
+    return [store sdl_objectForName:SDLNameParkBrakeActive];
 }
 
 - (void)setIgnitionStableStatus:(SDLIgnitionStableStatus)ignitionStableStatus {
-    if (ignitionStableStatus != nil) {
-        [store setObject:ignitionStableStatus forKey:SDLNameIgnitionStableStatus];
-    } else {
-        [store removeObjectForKey:SDLNameIgnitionStableStatus];
-    }
+    [store sdl_setObject:ignitionStableStatus forName:SDLNameIgnitionStableStatus];
 }
 
 - (SDLIgnitionStableStatus)ignitionStableStatus {
-    NSObject *obj = [store objectForKey:SDLNameIgnitionStableStatus];
-    return (SDLIgnitionStableStatus)obj;
+    return [store sdl_objectForName:SDLNameIgnitionStableStatus];
 }
 
 - (void)setIgnitionStatus:(SDLIgnitionStatus)ignitionStatus {
-    if (ignitionStatus != nil) {
-        [store setObject:ignitionStatus forKey:SDLNameIgnitionStatus];
-    } else {
-        [store removeObjectForKey:SDLNameIgnitionStatus];
-    }
+    [store sdl_setObject:ignitionStatus forName:SDLNameIgnitionStatus];
 }
 
 - (SDLIgnitionStatus)ignitionStatus {
-    NSObject *obj = [store objectForKey:SDLNameIgnitionStatus];
-    return (SDLIgnitionStatus)obj;
+    return [store sdl_objectForName:SDLNameIgnitionStatus];
 }
 
 - (void)setDriverDoorAjar:(nullable NSNumber<SDLBool> *)driverDoorAjar {
-    if (driverDoorAjar != nil) {
-        [store setObject:driverDoorAjar forKey:SDLNameDriverDoorAjar];
-    } else {
-        [store removeObjectForKey:SDLNameDriverDoorAjar];
-    }
+    [store sdl_setObject:driverDoorAjar forName:SDLNameDriverDoorAjar];
 }
 
 - (nullable NSNumber<SDLBool> *)driverDoorAjar {
-    return [store objectForKey:SDLNameDriverDoorAjar];
+    return [store sdl_objectForName:SDLNameDriverDoorAjar];
 }
 
 - (void)setPassengerDoorAjar:(nullable NSNumber<SDLBool> *)passengerDoorAjar {
-    if (passengerDoorAjar != nil) {
-        [store setObject:passengerDoorAjar forKey:SDLNamePassengerDoorAjar];
-    } else {
-        [store removeObjectForKey:SDLNamePassengerDoorAjar];
-    }
+    [store sdl_setObject:passengerDoorAjar forName:SDLNamePassengerDoorAjar];
 }
 
 - (nullable NSNumber<SDLBool> *)passengerDoorAjar {
-    return [store objectForKey:SDLNamePassengerDoorAjar];
+    return [store sdl_objectForName:SDLNamePassengerDoorAjar];
 }
 
 - (void)setRearLeftDoorAjar:(nullable NSNumber<SDLBool> *)rearLeftDoorAjar {
-    if (rearLeftDoorAjar != nil) {
-        [store setObject:rearLeftDoorAjar forKey:SDLNameRearLeftDoorAjar];
-    } else {
-        [store removeObjectForKey:SDLNameRearLeftDoorAjar];
-    }
+    [store sdl_setObject:rearLeftDoorAjar forName:SDLNameRearLeftDoorAjar];
 }
 
 - (nullable NSNumber<SDLBool> *)rearLeftDoorAjar {
-    return [store objectForKey:SDLNameRearLeftDoorAjar];
+    return [store sdl_objectForName:SDLNameRearLeftDoorAjar];
 }
 
 - (void)setRearRightDoorAjar:(nullable NSNumber<SDLBool> *)rearRightDoorAjar {
-    if (rearRightDoorAjar != nil) {
-        [store setObject:rearRightDoorAjar forKey:SDLNameRearRightDoorAjar];
-    } else {
-        [store removeObjectForKey:SDLNameRearRightDoorAjar];
-    }
+    [store sdl_setObject:rearRightDoorAjar forName:SDLNameRearRightDoorAjar];
 }
 
 - (nullable NSNumber<SDLBool> *)rearRightDoorAjar {
-    return [store objectForKey:SDLNameRearRightDoorAjar];
+    return [store sdl_objectForName:SDLNameRearRightDoorAjar];
 }
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLButtonCapabilities.m b/SmartDeviceLink/SDLButtonCapabilities.m
index 43ed46bb5..42aeb7ae5 100644
--- a/SmartDeviceLink/SDLButtonCapabilities.m
+++ b/SmartDeviceLink/SDLButtonCapabilities.m
@@ -3,6 +3,7 @@
 
 #import "SDLButtonCapabilities.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -10,52 +11,35 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLButtonCapabilities
 
 - (void)setName:(SDLButtonName)name {
-    if (name != nil) {
-        [store setObject:name forKey:SDLNameName];
-    } else {
-        [store removeObjectForKey:SDLNameName];
-    }
+    [store sdl_setObject:name forName:SDLNameName];
 }
 
 - (SDLButtonName)name {
-    NSObject *obj = [store objectForKey:SDLNameName];
-    return (SDLButtonName)obj;
+    return [store sdl_objectForName:SDLNameName];
 }
 
 - (void)setShortPressAvailable:(NSNumber<SDLBool> *)shortPressAvailable {
-    if (shortPressAvailable != nil) {
-        [store setObject:shortPressAvailable forKey:SDLNameShortPressAvailable];
-    } else {
-        [store removeObjectForKey:SDLNameShortPressAvailable];
-    }
+    [store sdl_setObject:shortPressAvailable forName:SDLNameShortPressAvailable];
 }
 
 - (NSNumber<SDLBool> *)shortPressAvailable {
-    return [store objectForKey:SDLNameShortPressAvailable];
+    return [store sdl_objectForName:SDLNameShortPressAvailable];
 }
 
 - (void)setLongPressAvailable:(NSNumber<SDLBool> *)longPressAvailable {
-    if (longPressAvailable != nil) {
-        [store setObject:longPressAvailable forKey:SDLNameLongPressAvailable];
-    } else {
-        [store removeObjectForKey:SDLNameLongPressAvailable];
-    }
+    [store sdl_setObject:longPressAvailable forName:SDLNameLongPressAvailable];
 }
 
 - (NSNumber<SDLBool> *)longPressAvailable {
-    return [store objectForKey:SDLNameLongPressAvailable];
+    return [store sdl_objectForName:SDLNameLongPressAvailable];
 }
 
 - (void)setUpDownAvailable:(NSNumber<SDLBool> *)upDownAvailable {
-    if (upDownAvailable != nil) {
-        [store setObject:upDownAvailable forKey:SDLNameUpDownAvailable];
-    } else {
-        [store removeObjectForKey:SDLNameUpDownAvailable];
-    }
+    [store sdl_setObject:upDownAvailable forName:SDLNameUpDownAvailable];
 }
 
 - (NSNumber<SDLBool> *)upDownAvailable {
-    return [store objectForKey:SDLNameUpDownAvailable];
+    return [store sdl_objectForName:SDLNameUpDownAvailable];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLChangeRegistration.m b/SmartDeviceLink/SDLChangeRegistration.m
index f62991014..befa2afae 100644
--- a/SmartDeviceLink/SDLChangeRegistration.m
+++ b/SmartDeviceLink/SDLChangeRegistration.m
@@ -4,8 +4,11 @@
 
 #import "SDLChangeRegistration.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @implementation SDLChangeRegistration
 
 - (instancetype)init {
@@ -40,77 +43,53 @@
 }
 
 - (void)setLanguage:(SDLLanguage)language {
-    if (language != nil) {
-        [parameters setObject:language forKey:SDLNameLanguage];
-    } else {
-        [parameters removeObjectForKey:SDLNameLanguage];
-    }
+    [parameters sdl_setObject:language forName:SDLNameLanguage];
 }
 
 - (SDLLanguage)language {
-    NSObject *obj = [parameters objectForKey:SDLNameLanguage];
-    return (SDLLanguage )obj;
+    return [parameters sdl_objectForName:SDLNameLanguage];
 }
 
 - (void)setHmiDisplayLanguage:(SDLLanguage )hmiDisplayLanguage {
-    if (hmiDisplayLanguage != nil) {
-        [parameters setObject:hmiDisplayLanguage forKey:SDLNameHMIDisplayLanguage];
-    } else {
-        [parameters removeObjectForKey:SDLNameHMIDisplayLanguage];
-    }
+    [parameters sdl_setObject:hmiDisplayLanguage forName:SDLNameHMIDisplayLanguage];
 }
 
 - (SDLLanguage )hmiDisplayLanguage {
-    NSObject *obj = [parameters objectForKey:SDLNameHMIDisplayLanguage];
-    return (SDLLanguage )obj;
+    return [parameters sdl_objectForName:SDLNameHMIDisplayLanguage];
 }
 
 - (void)setAppName:(nullable NSString *)appName {
-    if (appName != nil) {
-        parameters[SDLNameAppName] = [appName copy];
-    } else {
-        [parameters removeObjectForKey:SDLNameAppName];
-    }
+    [parameters sdl_setObject:appName forName:SDLNameAppName];
 }
 
 - (nullable NSString *)appName {
-    return [parameters[SDLNameAppName] copy];
+    return [[parameters sdl_objectForName:SDLNameAppName] copy];
 }
 
 - (void)setTtsName:(nullable NSArray<SDLTTSChunk *> *)ttsName {
-    if (ttsName != nil) {
-        [parameters setObject:[ttsName copy] forKey:SDLNameTTSName];
-    } else {
-        [parameters removeObjectForKey:SDLNameTTSName];
-    }
+    [parameters sdl_setObject:ttsName forName:SDLNameTTSName];
 }
 
 - (nullable NSArray<SDLTTSChunk *> *)ttsName {
-    return [parameters[SDLNameTTSName] copy];
+    return [[parameters sdl_objectForName:SDLNameTTSName] copy];
 }
 
 - (void)setNgnMediaScreenAppName:(nullable NSString *)ngnMediaScreenAppName {
-    if (ngnMediaScreenAppName != nil) {
-        parameters[SDLNameNGNMediaScreenAppName] = [ngnMediaScreenAppName copy];
-    } else {
-        [parameters removeObjectForKey:SDLNameNGNMediaScreenAppName];
-    }
+    [parameters sdl_setObject:ngnMediaScreenAppName forName:SDLNameNGNMediaScreenAppName];
 }
 
 - (nullable NSString *)ngnMediaScreenAppName {
-    return [parameters[SDLNameNGNMediaScreenAppName] copy];
+    return [[parameters sdl_objectForName:SDLNameNGNMediaScreenAppName] copy];
 }
 
 - (void)setVrSynonyms:(nullable NSArray<NSString *> *)vrSynonyms {
-    if (vrSynonyms != nil) {
-        [parameters setObject:[vrSynonyms copy] forKey:SDLNameVRSynonyms];
-    } else {
-        [parameters removeObjectForKey:SDLNameVRSynonyms];
-    }
+    [parameters sdl_setObject:vrSynonyms forName:SDLNameVRSynonyms];
 }
 
 - (nullable NSArray<NSString *> *)vrSynonyms {
-    return [parameters[SDLNameVRSynonyms] copy];
+    return [[parameters sdl_objectForName:SDLNameVRSynonyms] copy];
 }
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLChangeRegistrationResponse.m b/SmartDeviceLink/SDLChangeRegistrationResponse.m
index ab03f7e8b..1e5e6cbae 100644
--- a/SmartDeviceLink/SDLChangeRegistrationResponse.m
+++ b/SmartDeviceLink/SDLChangeRegistrationResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLChangeRegistrationResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLChoice.m b/SmartDeviceLink/SDLChoice.m
index 74e346a37..b5fd077f5 100644
--- a/SmartDeviceLink/SDLChoice.m
+++ b/SmartDeviceLink/SDLChoice.m
@@ -3,6 +3,7 @@
 
 #import "SDLChoice.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLImage.h"
 #import "SDLNames.h"
 
@@ -38,98 +39,59 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setChoiceID:(NSNumber<SDLInt> *)choiceID {
-    if (choiceID != nil) {
-        [store setObject:choiceID forKey:SDLNameChoiceId];
-    } else {
-        [store removeObjectForKey:SDLNameChoiceId];
-    }
+    [store sdl_setObject:choiceID forName:SDLNameChoiceId];
 }
 
 - (NSNumber<SDLInt> *)choiceID {
-    return [store objectForKey:SDLNameChoiceId];
+    return [store sdl_objectForName:SDLNameChoiceId];
 }
 
 - (void)setMenuName:(NSString *)menuName {
-    if (menuName != nil) {
-        [store setObject:menuName forKey:SDLNameMenuName];
-    } else {
-        [store removeObjectForKey:SDLNameMenuName];
-    }
+    [store sdl_setObject:menuName forName:SDLNameMenuName];
 }
 
 - (NSString *)menuName {
-    return [store objectForKey:SDLNameMenuName];
+    return [store sdl_objectForName:SDLNameMenuName];
 }
 
 - (void)setVrCommands:(NSMutableArray<NSString *> *)vrCommands {
-    if (vrCommands != nil) {
-        [store setObject:vrCommands forKey:SDLNameVRCommands];
-    } else {
-        [store removeObjectForKey:SDLNameVRCommands];
-    }
+    [store sdl_setObject:vrCommands forName:SDLNameVRCommands];
 }
 
 - (NSMutableArray<NSString *> *)vrCommands {
-    return [store objectForKey:SDLNameVRCommands];
+    return [store sdl_objectForName:SDLNameVRCommands];
 }
 
 - (void)setImage:(nullable SDLImage *)image {
-    if (image != nil) {
-        [store setObject:image forKey:SDLNameImage];
-    } else {
-        [store removeObjectForKey:SDLNameImage];
-    }
+    [store sdl_setObject:image forName:SDLNameImage];
 }
 
 - (nullable SDLImage *)image {
-    NSObject *obj = [store objectForKey:SDLNameImage];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLImage*)obj;
-    
+    return [store sdl_objectForName:SDLNameImage ofClass:SDLImage.class];
 }
 
 - (void)setSecondaryText:(nullable NSString *)secondaryText {
-    if (secondaryText != nil) {
-        [store setObject:secondaryText forKey:SDLNameSecondaryText];
-    } else {
-        [store removeObjectForKey:SDLNameSecondaryText];
-    }
+    [store sdl_setObject:secondaryText forName:SDLNameSecondaryText];
 }
 
 - (nullable NSString *)secondaryText {
-    return [store objectForKey:SDLNameSecondaryText];
+    return [store sdl_objectForName:SDLNameSecondaryText];
 }
 
 - (void)setTertiaryText:(nullable NSString *)tertiaryText {
-    if (tertiaryText != nil) {
-        [store setObject:tertiaryText forKey:SDLNameTertiaryText];
-    } else {
-        [store removeObjectForKey:SDLNameTertiaryText];
-    }
+    [store sdl_setObject:tertiaryText forName:SDLNameTertiaryText];
 }
 
 - (nullable NSString *)tertiaryText {
-    return [store objectForKey:SDLNameTertiaryText];
+    return [store sdl_objectForName:SDLNameTertiaryText];
 }
 
 - (void)setSecondaryImage:(nullable SDLImage *)secondaryImage {
-    if (secondaryImage != nil) {
-        [store setObject:secondaryImage forKey:SDLNameSecondaryImage];
-    } else {
-        [store removeObjectForKey:SDLNameSecondaryImage];
-    }
+    [store sdl_setObject:secondaryImage forName:SDLNameSecondaryImage];
 }
 
 - (nullable SDLImage *)secondaryImage {
-    NSObject *obj = [store objectForKey:SDLNameSecondaryImage];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLImage*)obj;
+    return [store sdl_objectForName:SDLNameSecondaryImage ofClass:SDLImage.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLClusterModeStatus.m b/SmartDeviceLink/SDLClusterModeStatus.m
index 131f1a752..e182fa17f 100644
--- a/SmartDeviceLink/SDLClusterModeStatus.m
+++ b/SmartDeviceLink/SDLClusterModeStatus.m
@@ -3,6 +3,7 @@
 
 #import "SDLClusterModeStatus.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -10,54 +11,35 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLClusterModeStatus
 
 - (void)setPowerModeActive:(NSNumber<SDLBool> *)powerModeActive {
-    if (powerModeActive != nil) {
-        [store setObject:powerModeActive forKey:SDLNamePowerModeActive];
-    } else {
-        [store removeObjectForKey:SDLNamePowerModeActive];
-    }
+    [store sdl_setObject:powerModeActive forName:SDLNamePowerModeActive];
 }
 
 - (NSNumber<SDLBool> *)powerModeActive {
-    return [store objectForKey:SDLNamePowerModeActive];
+    return [store sdl_objectForName:SDLNamePowerModeActive];
 }
 
 - (void)setPowerModeQualificationStatus:(SDLPowerModeQualificationStatus)powerModeQualificationStatus {
-    if (powerModeQualificationStatus != nil) {
-        [store setObject:powerModeQualificationStatus forKey:SDLNamePowerModeQualificationStatus];
-    } else {
-        [store removeObjectForKey:SDLNamePowerModeQualificationStatus];
-    }
+    [store sdl_setObject:powerModeQualificationStatus forName:SDLNamePowerModeQualificationStatus];
 }
 
 - (SDLPowerModeQualificationStatus)powerModeQualificationStatus {
-    NSObject *obj = [store objectForKey:SDLNamePowerModeQualificationStatus];
-    return (SDLPowerModeQualificationStatus)obj;
+    return [store sdl_objectForName:SDLNamePowerModeQualificationStatus];
 }
 
 - (void)setCarModeStatus:(SDLCarModeStatus)carModeStatus {
-    if (carModeStatus != nil) {
-        [store setObject:carModeStatus forKey:SDLNameCarModeStatus];
-    } else {
-        [store removeObjectForKey:SDLNameCarModeStatus];
-    }
+    [store sdl_setObject:carModeStatus forName:SDLNameCarModeStatus];
 }
 
 - (SDLCarModeStatus)carModeStatus {
-    NSObject *obj = [store objectForKey:SDLNameCarModeStatus];
-    return (SDLCarModeStatus)obj;
+    return [store sdl_objectForName:SDLNameCarModeStatus];
 }
 
 - (void)setPowerModeStatus:(SDLPowerModeStatus)powerModeStatus {
-    if (powerModeStatus != nil) {
-        [store setObject:powerModeStatus forKey:SDLNamePowerModeStatus];
-    } else {
-        [store removeObjectForKey:SDLNamePowerModeStatus];
-    }
+    [store sdl_setObject:powerModeStatus forName:SDLNamePowerModeStatus];
 }
 
 - (SDLPowerModeStatus)powerModeStatus {
-    NSObject *obj = [store objectForKey:SDLNamePowerModeStatus];
-    return (SDLPowerModeStatus)obj;
+    return [store sdl_objectForName:SDLNamePowerModeStatus];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
index b84952781..f9e5ca73e 100644
--- a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
+++ b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
@@ -4,6 +4,7 @@
 
 #import "SDLCreateInteractionChoiceSet.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLChoice.h"
 #import "SDLNames.h"
 
@@ -29,36 +30,19 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setInteractionChoiceSetID:(NSNumber<SDLInt> *)interactionChoiceSetID {
-    if (interactionChoiceSetID != nil) {
-        [parameters setObject:interactionChoiceSetID forKey:SDLNameInteractionChoiceSetId];
-    } else {
-        [parameters removeObjectForKey:SDLNameInteractionChoiceSetId];
-    }
+    [parameters sdl_setObject:interactionChoiceSetID forName:SDLNameInteractionChoiceSetId];
 }
 
 - (NSNumber<SDLInt> *)interactionChoiceSetID {
-    return [parameters objectForKey:SDLNameInteractionChoiceSetId];
+    return [parameters sdl_objectForName:SDLNameInteractionChoiceSetId];
 }
 
 - (void)setChoiceSet:(NSMutableArray<SDLChoice *> *)choiceSet {
-    if (choiceSet != nil) {
-        [parameters setObject:choiceSet forKey:SDLNameChoiceSet];
-    } else {
-        [parameters removeObjectForKey:SDLNameChoiceSet];
-    }
+    [parameters sdl_setObject:choiceSet forName:SDLNameChoiceSet];
 }
 
 - (NSMutableArray<SDLChoice *> *)choiceSet {
-    NSMutableArray<SDLChoice *> *array = [parameters objectForKey:SDLNameChoiceSet];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLChoice.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLChoice *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLChoice alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameChoiceSet ofClass:SDLChoice.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m
index 80f623f08..b9de5f3b1 100644
--- a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m
+++ b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLCreateInteractionChoiceSetResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLDIDResult.m b/SmartDeviceLink/SDLDIDResult.m
index b016da96b..0d0e5d39f 100644
--- a/SmartDeviceLink/SDLDIDResult.m
+++ b/SmartDeviceLink/SDLDIDResult.m
@@ -3,6 +3,7 @@
 
 #import "SDLDIDResult.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -10,40 +11,27 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLDIDResult
 
 - (void)setResultCode:(SDLVehicleDataResultCode)resultCode {
-    if (resultCode != nil) {
-        [store setObject:resultCode forKey:SDLNameResultCode];
-    } else {
-        [store removeObjectForKey:SDLNameResultCode];
-    }
+    [store sdl_setObject:resultCode forName:SDLNameResultCode];
 }
 
 - (SDLVehicleDataResultCode)resultCode {
-    NSObject *obj = [store objectForKey:SDLNameResultCode];
-    return (SDLVehicleDataResultCode)obj;
+    return [store sdl_objectForName:SDLNameResultCode];
 }
 
 - (void)setDidLocation:(NSNumber<SDLInt> *)didLocation {
-    if (didLocation != nil) {
-        [store setObject:didLocation forKey:SDLNameDIDLocation];
-    } else {
-        [store removeObjectForKey:SDLNameDIDLocation];
-    }
+    [store sdl_setObject:didLocation forName:SDLNameDIDLocation];
 }
 
 - (NSNumber<SDLInt> *)didLocation {
-    return [store objectForKey:SDLNameDIDLocation];
+    return [store sdl_objectForName:SDLNameDIDLocation];
 }
 
 - (void)setData:(nullable NSString *)data {
-    if (data != nil) {
-        [store setObject:data forKey:SDLNameData];
-    } else {
-        [store removeObjectForKey:SDLNameData];
-    }
+    [store sdl_setObject:data forName:SDLNameData];
 }
 
 - (nullable NSString *)data {
-    return [store objectForKey:SDLNameData];
+    return [store sdl_objectForName:SDLNameData];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDateTime.m b/SmartDeviceLink/SDLDateTime.m
index f10cf1020..88c691c89 100644
--- a/SmartDeviceLink/SDLDateTime.m
+++ b/SmartDeviceLink/SDLDateTime.m
@@ -2,6 +2,8 @@
 //
 
 #import "SDLDateTime.h"
+
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 @implementation SDLDateTime
@@ -57,111 +59,75 @@
 }
 
 - (void)setMillisecond:(NSNumber<SDLInt> *)millisecond {
-    if (millisecond != nil) {
-        store[SDLNameMillisecond] = millisecond;
-    } else {
-        [store removeObjectForKey:SDLNameMillisecond];
-    }
+    [store sdl_setObject:millisecond forName:SDLNameMillisecond];
 }
 
 - (NSNumber<SDLInt> *)millisecond {
-    return store[SDLNameMillisecond];
+    return [store sdl_objectForName:SDLNameMillisecond];
 }
 
 - (void)setSecond:(NSNumber<SDLInt> *)second {
-    if (second != nil) {
-        store[SDLNameSecond] = second;
-    } else {
-        [store removeObjectForKey:SDLNameSecond];
-    }
+    [store sdl_setObject:second forName:SDLNameSecond];
 }
 
 - (NSNumber<SDLInt> *)second {
-    return store[SDLNameSecond];
+    return [store sdl_objectForName:SDLNameSecond];
 }
 
 - (void)setMinute:(NSNumber<SDLInt> *)minute {
-    if (minute != nil) {
-        store[SDLNameMinute] = minute;
-    } else {
-        [store removeObjectForKey:SDLNameMinute];
-    }
+    [store sdl_setObject:minute forName:SDLNameMinute];
 }
 
 - (NSNumber<SDLInt> *)minute {
-    return store[SDLNameMinute];
+    return [store sdl_objectForName:SDLNameMinute];
 }
 
 - (void)setHour:(NSNumber<SDLInt> *)hour {
-    if (hour != nil) {
-        store[SDLNameHour] = hour;
-    } else {
-        [store removeObjectForKey:SDLNameHour];
-    }
+    [store sdl_setObject:hour forName:SDLNameHour];
 }
 
 - (NSNumber<SDLInt> *)hour {
-    return store[SDLNameHour];
+    return [store sdl_objectForName:SDLNameHour];
 }
 
 - (void)setDay:(NSNumber<SDLInt> *)day {
-    if (day != nil) {
-        store[SDLNameDay] = day;
-    } else {
-        [store removeObjectForKey:SDLNameDay];
-    }
+    [store sdl_setObject:day forName:SDLNameDay];
 }
 
 - (NSNumber<SDLInt> *)day {
-    return store[SDLNameDay];
+    return [store sdl_objectForName:SDLNameDay];
 }
 
 - (void)setMonth:(NSNumber<SDLInt> *)month {
-    if (month != nil) {
-        store[SDLNameMonth] = month;
-    } else {
-        [store removeObjectForKey:SDLNameMonth];
-    }
+    [store sdl_setObject:month forName:SDLNameMonth];
 }
 
 - (NSNumber<SDLInt> *)month {
-    return store[SDLNameMonth];
+    return [store sdl_objectForName:SDLNameMonth];
 }
 
 - (void)setYear:(NSNumber<SDLInt> *)year {
-    if (year != nil) {
-        store[SDLNameYear] = year;
-    } else {
-        [store removeObjectForKey:SDLNameYear];
-    }
+    [store sdl_setObject:year forName:SDLNameYear];
 }
 
 - (NSNumber<SDLInt> *)year {
-    return store[SDLNameYear];
+    return [store sdl_objectForName:SDLNameYear];
 }
 
 - (void)setTimezoneMinuteOffset:(NSNumber<SDLInt> *)timezoneMinuteOffset {
-    if (timezoneMinuteOffset != nil) {
-        store[SDLNameTimezoneMinuteOffset] = timezoneMinuteOffset;
-    } else {
-        [store removeObjectForKey:SDLNameTimezoneMinuteOffset];
-    }
+    [store sdl_setObject:timezoneMinuteOffset forName:SDLNameTimezoneMinuteOffset];
 }
 
 - (NSNumber<SDLInt> *)timezoneMinuteOffset {
-    return store[SDLNameTimezoneMinuteOffset];
+    return [store sdl_objectForName:SDLNameTimezoneMinuteOffset];
 }
 
 - (void)setTimezoneHourOffset:(NSNumber<SDLInt> *)timezoneHourOffset {
-    if (timezoneHourOffset != nil) {
-        store[SDLNameTimezoneHourOffset] = timezoneHourOffset;
-    } else {
-        [store removeObjectForKey:SDLNameTimezoneHourOffset];
-    }
+    [store sdl_setObject:timezoneHourOffset forName:SDLNameTimezoneHourOffset];
 }
 
 - (NSNumber<SDLInt> *)timezoneHourOffset {
-    return store[SDLNameTimezoneHourOffset];
+    return [store sdl_objectForName:SDLNameTimezoneHourOffset];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDeleteCommand.m b/SmartDeviceLink/SDLDeleteCommand.m
index 8f8528ee4..d96276d56 100644
--- a/SmartDeviceLink/SDLDeleteCommand.m
+++ b/SmartDeviceLink/SDLDeleteCommand.m
@@ -4,6 +4,7 @@
 
 #import "SDLDeleteCommand.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -28,15 +29,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setCmdID:(NSNumber<SDLInt> *)cmdID {
-    if (cmdID != nil) {
-        [parameters setObject:cmdID forKey:SDLNameCommandId];
-    } else {
-        [parameters removeObjectForKey:SDLNameCommandId];
-    }
+    [parameters sdl_setObject:cmdID forName:SDLNameCommandId];
 }
 
 - (NSNumber<SDLInt> *)cmdID {
-    return [parameters objectForKey:SDLNameCommandId];
+    return [parameters sdl_objectForName:SDLNameCommandId];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDeleteCommandResponse.m b/SmartDeviceLink/SDLDeleteCommandResponse.m
index b4ee8167d..f956c02ab 100644
--- a/SmartDeviceLink/SDLDeleteCommandResponse.m
+++ b/SmartDeviceLink/SDLDeleteCommandResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLDeleteCommandResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLDeleteFile.m b/SmartDeviceLink/SDLDeleteFile.m
index 3458b3313..b7a8929a2 100644
--- a/SmartDeviceLink/SDLDeleteFile.m
+++ b/SmartDeviceLink/SDLDeleteFile.m
@@ -4,6 +4,7 @@
 
 #import "SDLDeleteFile.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -28,15 +29,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setSyncFileName:(NSString *)syncFileName {
-    if (syncFileName != nil) {
-        [parameters setObject:syncFileName forKey:SDLNameSyncFileName];
-    } else {
-        [parameters removeObjectForKey:SDLNameSyncFileName];
-    }
+    [parameters sdl_setObject:syncFileName forName:SDLNameSyncFileName];
 }
 
 - (NSString *)syncFileName {
-    return [parameters objectForKey:SDLNameSyncFileName];
+    return [parameters sdl_objectForName:SDLNameSyncFileName];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDeleteFileResponse.m b/SmartDeviceLink/SDLDeleteFileResponse.m
index 1ae2c41f3..7065af0cf 100644
--- a/SmartDeviceLink/SDLDeleteFileResponse.m
+++ b/SmartDeviceLink/SDLDeleteFileResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLDeleteFileResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -17,11 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setSpaceAvailable:(NSNumber<SDLInt> *)spaceAvailable {
-    if (spaceAvailable != nil) {
-        [parameters setObject:spaceAvailable forKey:SDLNameSpaceAvailable];
-    } else {
-        [parameters removeObjectForKey:SDLNameSpaceAvailable];
-    }
+    [parameters sdl_setObject:spaceAvailable forName:SDLNameSpaceAvailable];
 }
 
 - (NSNumber<SDLInt> *)spaceAvailable {
diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
index 145d6b721..a1f2585e5 100644
--- a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
+++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
@@ -4,6 +4,7 @@
 
 #import "SDLDeleteInteractionChoiceSet.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -28,15 +29,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setInteractionChoiceSetID:(NSNumber<SDLInt> *)interactionChoiceSetID {
-    if (interactionChoiceSetID != nil) {
-        [parameters setObject:interactionChoiceSetID forKey:SDLNameInteractionChoiceSetId];
-    } else {
-        [parameters removeObjectForKey:SDLNameInteractionChoiceSetId];
-    }
+    [parameters sdl_setObject:interactionChoiceSetID forName:SDLNameInteractionChoiceSetId];
 }
 
 - (NSNumber<SDLInt> *)interactionChoiceSetID {
-    return [parameters objectForKey:SDLNameInteractionChoiceSetId];
+    return [parameters sdl_objectForName:SDLNameInteractionChoiceSetId];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m
index 37b7c7940..e6cc631fa 100644
--- a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m
+++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLDeleteInteractionChoiceSetResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLDeleteSubMenu.m b/SmartDeviceLink/SDLDeleteSubMenu.m
index 0e8a4427e..b03372c7d 100644
--- a/SmartDeviceLink/SDLDeleteSubMenu.m
+++ b/SmartDeviceLink/SDLDeleteSubMenu.m
@@ -4,6 +4,7 @@
 
 #import "SDLDeleteSubMenu.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -28,15 +29,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setMenuID:(NSNumber<SDLInt> *)menuID {
-    if (menuID != nil) {
-        [parameters setObject:menuID forKey:SDLNameMenuId];
-    } else {
-        [parameters removeObjectForKey:SDLNameMenuId];
-    }
+    [parameters sdl_setObject:menuID forName:SDLNameMenuId];
 }
 
 - (NSNumber<SDLInt> *)menuID {
-    return [parameters objectForKey:SDLNameMenuId];
+    return [parameters sdl_objectForName:SDLNameMenuId];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDeleteSubMenuResponse.m b/SmartDeviceLink/SDLDeleteSubMenuResponse.m
index ec77c8944..5594763e9 100644
--- a/SmartDeviceLink/SDLDeleteSubMenuResponse.m
+++ b/SmartDeviceLink/SDLDeleteSubMenuResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLDeleteSubMenuResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLDeviceInfo.m b/SmartDeviceLink/SDLDeviceInfo.m
index 0791bfe8a..8b321bf8d 100644
--- a/SmartDeviceLink/SDLDeviceInfo.m
+++ b/SmartDeviceLink/SDLDeviceInfo.m
@@ -7,6 +7,7 @@
 #import <CoreTelephony/CTTelephonyNetworkInfo.h>
 #import <UIKit/UIKit.h>
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -29,75 +30,51 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setHardware:(nullable NSString *)hardware {
-    if (hardware != nil) {
-        [store setObject:hardware forKey:SDLNameHardware];
-    } else {
-        [store removeObjectForKey:SDLNameHardware];
-    }
+    [store sdl_setObject:hardware forName:SDLNameHardware];
 }
 
 - (nullable NSString *)hardware {
-    return [store objectForKey:SDLNameHardware];
+    return [store sdl_objectForName:SDLNameHardware];
 }
 
 - (void)setFirmwareRev:(nullable NSString *)firmwareRev {
-    if (firmwareRev != nil) {
-        [store setObject:firmwareRev forKey:SDLNameFirmwareRevision];
-    } else {
-        [store removeObjectForKey:SDLNameFirmwareRevision];
-    }
+    [store sdl_setObject:firmwareRev forName:SDLNameFirmwareRevision];
 }
 
 - (nullable NSString *)firmwareRev {
-    return [store objectForKey:SDLNameFirmwareRevision];
+    return [store sdl_objectForName:SDLNameFirmwareRevision];
 }
 
 - (void)setOs:(nullable NSString *)os {
-    if (os != nil) {
-        [store setObject:os forKey:SDLNameOS];
-    } else {
-        [store removeObjectForKey:SDLNameOS];
-    }
+    [store sdl_setObject:os forName:SDLNameOS];
 }
 
 - (nullable NSString *)os {
-    return [store objectForKey:SDLNameOS];
+    return [store sdl_objectForName:SDLNameOS];
 }
 
 - (void)setOsVersion:(nullable NSString *)osVersion {
-    if (osVersion != nil) {
-        [store setObject:osVersion forKey:SDLNameOSVersion];
-    } else {
-        [store removeObjectForKey:SDLNameOSVersion];
-    }
+    [store sdl_setObject:osVersion forName:SDLNameOSVersion];
 }
 
 - (nullable NSString *)osVersion {
-    return [store objectForKey:SDLNameOSVersion];
+    return [store sdl_objectForName:SDLNameOSVersion];
 }
 
 - (void)setCarrier:(nullable NSString *)carrier {
-    if (carrier != nil) {
-        [store setObject:carrier forKey:SDLNameCarrier];
-    } else {
-        [store removeObjectForKey:SDLNameCarrier];
-    }
+    [store sdl_setObject:carrier forName:SDLNameCarrier];
 }
 
 - (nullable NSString *)carrier {
-    return [store objectForKey:SDLNameCarrier];
+    return [store sdl_objectForName:SDLNameCarrier];
 }
 
 - (void)setMaxNumberRFCOMMPorts:(nullable NSNumber<SDLInt> *)maxNumberRFCOMMPorts {
-    if (maxNumberRFCOMMPorts != nil) {
-        [store setObject:maxNumberRFCOMMPorts forKey:SDLNameMaxNumberRFCOMMPorts];
-    } else {
-        [store removeObjectForKey:SDLNameMaxNumberRFCOMMPorts];
-    }
+    [store sdl_setObject:maxNumberRFCOMMPorts forName:SDLNameMaxNumberRFCOMMPorts];
 }
 
 - (nullable NSNumber<SDLInt> *)maxNumberRFCOMMPorts {
-    return [store objectForKey:SDLNameMaxNumberRFCOMMPorts];
+    return [store sdl_objectForName:SDLNameMaxNumberRFCOMMPorts];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDeviceStatus.m b/SmartDeviceLink/SDLDeviceStatus.m
index 6a5b7c8e1..ca449c517 100644
--- a/SmartDeviceLink/SDLDeviceStatus.m
+++ b/SmartDeviceLink/SDLDeviceStatus.m
@@ -3,6 +3,7 @@
 
 #import "SDLDeviceStatus.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLDeviceLevelStatus.h"
 #import "SDLNames.h"
 #import "SDLPrimaryAudioSource.h"
@@ -12,138 +13,91 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLDeviceStatus
 
 - (void)setVoiceRecOn:(NSNumber<SDLBool> *)voiceRecOn {
-    if (voiceRecOn != nil) {
-        [store setObject:voiceRecOn forKey:SDLNameVoiceRecognitionOn];
-    } else {
-        [store removeObjectForKey:SDLNameVoiceRecognitionOn];
-    }
+    [store sdl_setObject:voiceRecOn forName:SDLNameVoiceRecognitionOn];
 }
 
 - (NSNumber<SDLBool> *)voiceRecOn {
-    return [store objectForKey:SDLNameVoiceRecognitionOn];
+    return [store sdl_objectForName:SDLNameVoiceRecognitionOn];
 }
 
 - (void)setBtIconOn:(NSNumber<SDLBool> *)btIconOn {
-    if (btIconOn != nil) {
-        [store setObject:btIconOn forKey:SDLNameBluetoothIconOn];
-    } else {
-        [store removeObjectForKey:SDLNameBluetoothIconOn];
-    }
+    [store sdl_setObject:btIconOn forName:SDLNameBluetoothIconOn];
 }
 
 - (NSNumber<SDLBool> *)btIconOn {
-    return [store objectForKey:SDLNameBluetoothIconOn];
+    return [store sdl_objectForName:SDLNameBluetoothIconOn];
 }
 
 - (void)setCallActive:(NSNumber<SDLBool> *)callActive {
-    if (callActive != nil) {
-        [store setObject:callActive forKey:SDLNameCallActive];
-    } else {
-        [store removeObjectForKey:SDLNameCallActive];
-    }
+    [store sdl_setObject:callActive forName:SDLNameCallActive];
 }
 
 - (NSNumber<SDLBool> *)callActive {
-    return [store objectForKey:SDLNameCallActive];
+    return [store sdl_objectForName:SDLNameCallActive];
 }
 
 - (void)setPhoneRoaming:(NSNumber<SDLBool> *)phoneRoaming {
-    if (phoneRoaming != nil) {
-        [store setObject:phoneRoaming forKey:SDLNamePhoneRoaming];
-    } else {
-        [store removeObjectForKey:SDLNamePhoneRoaming];
-    }
+    [store sdl_setObject:phoneRoaming forName:SDLNamePhoneRoaming];
 }
 
 - (NSNumber<SDLBool> *)phoneRoaming {
-    return [store objectForKey:SDLNamePhoneRoaming];
+    return [store sdl_objectForName:SDLNamePhoneRoaming];
 }
 
 - (void)setTextMsgAvailable:(NSNumber<SDLBool> *)textMsgAvailable {
-    if (textMsgAvailable != nil) {
-        [store setObject:textMsgAvailable forKey:SDLNameTextMessageAvailable];
-    } else {
-        [store removeObjectForKey:SDLNameTextMessageAvailable];
-    }
+    [store sdl_setObject:textMsgAvailable forName:SDLNameTextMessageAvailable];
 }
 
 - (NSNumber<SDLBool> *)textMsgAvailable {
-    return [store objectForKey:SDLNameTextMessageAvailable];
+    return [store sdl_objectForName:SDLNameTextMessageAvailable];
 }
 
 - (void)setBattLevelStatus:(SDLDeviceLevelStatus )battLevelStatus {
-    if (battLevelStatus != nil) {
-        [store setObject:battLevelStatus forKey:SDLNameBatteryLevelStatus];
-    } else {
-        [store removeObjectForKey:SDLNameBatteryLevelStatus];
-    }
+    [store sdl_setObject:battLevelStatus forName:SDLNameBatteryLevelStatus];
 }
 
 - (SDLDeviceLevelStatus)battLevelStatus {
-    NSObject *obj = [store objectForKey:SDLNameBatteryLevelStatus];
-    return (SDLDeviceLevelStatus)obj;
+    return [store sdl_objectForName:SDLNameBatteryLevelStatus];
 }
 
 - (void)setStereoAudioOutputMuted:(NSNumber<SDLBool> *)stereoAudioOutputMuted {
-    if (stereoAudioOutputMuted != nil) {
-        [store setObject:stereoAudioOutputMuted forKey:SDLNameStereoAudioOutputMuted];
-    } else {
-        [store removeObjectForKey:SDLNameStereoAudioOutputMuted];
-    }
+    [store sdl_setObject:stereoAudioOutputMuted forName:SDLNameStereoAudioOutputMuted];
 }
 
 - (NSNumber<SDLBool> *)stereoAudioOutputMuted {
-    return [store objectForKey:SDLNameStereoAudioOutputMuted];
+    return [store sdl_objectForName:SDLNameStereoAudioOutputMuted];
 }
 
 - (void)setMonoAudioOutputMuted:(NSNumber<SDLBool> *)monoAudioOutputMuted {
-    if (monoAudioOutputMuted != nil) {
-        [store setObject:monoAudioOutputMuted forKey:SDLNameMonoAudioOutputMuted];
-    } else {
-        [store removeObjectForKey:SDLNameMonoAudioOutputMuted];
-    }
+    [store sdl_setObject:monoAudioOutputMuted forName:SDLNameMonoAudioOutputMuted];
 }
 
 - (NSNumber<SDLBool> *)monoAudioOutputMuted {
-    return [store objectForKey:SDLNameMonoAudioOutputMuted];
+    return [store sdl_objectForName:SDLNameMonoAudioOutputMuted];
 }
 
 - (void)setSignalLevelStatus:(SDLDeviceLevelStatus)signalLevelStatus {
-    if (signalLevelStatus != nil) {
-        [store setObject:signalLevelStatus forKey:SDLNameSignalLevelStatus];
-    } else {
-        [store removeObjectForKey:SDLNameSignalLevelStatus];
-    }
+    [store sdl_setObject:signalLevelStatus forName:SDLNameSignalLevelStatus];
 }
 
 - (SDLDeviceLevelStatus)signalLevelStatus {
-    NSObject *obj = [store objectForKey:SDLNameSignalLevelStatus];
-    return (SDLDeviceLevelStatus)obj;
+    return [store sdl_objectForName:SDLNameSignalLevelStatus];
 }
 
 - (void)setPrimaryAudioSource:(SDLPrimaryAudioSource)primaryAudioSource {
-    if (primaryAudioSource != nil) {
-        [store setObject:primaryAudioSource forKey:SDLNamePrimaryAudioSource];
-    } else {
-        [store removeObjectForKey:SDLNamePrimaryAudioSource];
-    }
+    [store sdl_setObject:primaryAudioSource forName:SDLNamePrimaryAudioSource];
 }
 
 - (SDLPrimaryAudioSource)primaryAudioSource {
-    NSObject *obj = [store objectForKey:SDLNamePrimaryAudioSource];
-    return (SDLPrimaryAudioSource)obj;
+    return [store sdl_objectForName:SDLNamePrimaryAudioSource];
 }
 
 - (void)setECallEventActive:(NSNumber<SDLBool> *)eCallEventActive {
-    if (eCallEventActive != nil) {
-        [store setObject:eCallEventActive forKey:SDLNameECallEventActive];
-    } else {
-        [store removeObjectForKey:SDLNameECallEventActive];
-    }
+    [store sdl_setObject:eCallEventActive forName:SDLNameECallEventActive];
 }
 
 - (NSNumber<SDLBool> *)eCallEventActive {
-    return [store objectForKey:SDLNameECallEventActive];
+    return [store sdl_objectForName:SDLNameECallEventActive];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDiagnosticMessage.m b/SmartDeviceLink/SDLDiagnosticMessage.m
index 0cf8d0831..4b874a6e2 100644
--- a/SmartDeviceLink/SDLDiagnosticMessage.m
+++ b/SmartDeviceLink/SDLDiagnosticMessage.m
@@ -4,6 +4,7 @@
 
 #import "SDLDiagnosticMessage.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -30,39 +31,27 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setTargetID:(NSNumber<SDLInt> *)targetID {
-    if (targetID != nil) {
-        [parameters setObject:targetID forKey:SDLNameTargetId];
-    } else {
-        [parameters removeObjectForKey:SDLNameTargetId];
-    }
+    [parameters sdl_setObject:targetID forName:SDLNameTargetId];
 }
 
 - (NSNumber<SDLInt> *)targetID {
-    return [parameters objectForKey:SDLNameTargetId];
+    return [parameters sdl_objectForName:SDLNameTargetId];
 }
 
 - (void)setMessageLength:(NSNumber<SDLInt> *)messageLength {
-    if (messageLength != nil) {
-        [parameters setObject:messageLength forKey:SDLNameMessageLength];
-    } else {
-        [parameters removeObjectForKey:SDLNameMessageLength];
-    }
+    [parameters sdl_setObject:messageLength forName:SDLNameMessageLength];
 }
 
 - (NSNumber<SDLInt> *)messageLength {
-    return [parameters objectForKey:SDLNameMessageLength];
+    return [parameters sdl_objectForName:SDLNameMessageLength];
 }
 
 - (void)setMessageData:(NSMutableArray<NSNumber<SDLInt> *> *)messageData {
-    if (messageData != nil) {
-        [parameters setObject:messageData forKey:SDLNameMessageData];
-    } else {
-        [parameters removeObjectForKey:SDLNameMessageData];
-    }
+    [parameters sdl_setObject:messageData forName:SDLNameMessageData];
 }
 
 - (NSMutableArray<NSNumber<SDLInt> *> *)messageData {
-    return [parameters objectForKey:SDLNameMessageData];
+    return [parameters sdl_objectForName:SDLNameMessageData];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDiagnosticMessageResponse.m b/SmartDeviceLink/SDLDiagnosticMessageResponse.m
index 3c110128d..9353a755f 100644
--- a/SmartDeviceLink/SDLDiagnosticMessageResponse.m
+++ b/SmartDeviceLink/SDLDiagnosticMessageResponse.m
@@ -3,6 +3,7 @@
 
 #import "SDLDiagnosticMessageResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -16,11 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setMessageDataResult:(NSMutableArray<NSNumber<SDLInt> *> *)messageDataResult {
-    if (messageDataResult != nil) {
-        [parameters setObject:messageDataResult forKey:SDLNameMessageDataResult];
-    } else {
-        [parameters removeObjectForKey:SDLNameMessageDataResult];
-    }
+    [parameters sdl_setObject:messageDataResult forName:SDLNameMessageDataResult];
 }
 
 - (NSMutableArray<NSNumber<SDLInt> *> *)messageDataResult {
diff --git a/SmartDeviceLink/SDLDialNumber.m b/SmartDeviceLink/SDLDialNumber.m
index 1e57ab187..7930892d1 100644
--- a/SmartDeviceLink/SDLDialNumber.m
+++ b/SmartDeviceLink/SDLDialNumber.m
@@ -4,6 +4,7 @@
 
 #import "SDLDialNumber.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 @implementation SDLDialNumber
@@ -26,15 +27,11 @@
 }
 
 - (void)setNumber:(NSString *)number {
-    if (number != nil) {
-        parameters[SDLNameNumber] = number;
-    } else {
-        [parameters removeObjectForKey:SDLNameNumber];
-    }
+    [parameters sdl_setObject:number forName:SDLNameNumber];
 }
 
 - (NSString *)number {
-    return parameters[SDLNameNumber];
+    return [parameters sdl_objectForName:SDLNameNumber];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDialNumberResponse.m b/SmartDeviceLink/SDLDialNumberResponse.m
index 9a8a1c5f1..b791e2cd2 100644
--- a/SmartDeviceLink/SDLDialNumberResponse.m
+++ b/SmartDeviceLink/SDLDialNumberResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLDialNumberResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLDisplayCapabilities.m b/SmartDeviceLink/SDLDisplayCapabilities.m
index 0f08e326c..dc3e45c5f 100644
--- a/SmartDeviceLink/SDLDisplayCapabilities.m
+++ b/SmartDeviceLink/SDLDisplayCapabilities.m
@@ -3,6 +3,7 @@
 
 #import "SDLDisplayCapabilities.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "SDLImageField.h"
 #import "SDLScreenParams.h"
@@ -13,132 +14,67 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLDisplayCapabilities
 
 - (void)setDisplayType:(SDLDisplayType)displayType {
-    if (displayType != nil) {
-        [store setObject:displayType forKey:SDLNameDisplayType];
-    } else {
-        [store removeObjectForKey:SDLNameDisplayType];
-    }
+    [store sdl_setObject:displayType forName:SDLNameDisplayType];
 }
 
 - (SDLDisplayType)displayType {
-    NSObject *obj = [store objectForKey:SDLNameDisplayType];
-    return (SDLDisplayType)obj;
+    return [store sdl_objectForName:SDLNameDisplayType];
 }
 
 - (void)setTextFields:(NSMutableArray<SDLTextField *> *)textFields {
-    if (textFields != nil) {
-        [store setObject:textFields forKey:SDLNameTextFields];
-    } else {
-        [store removeObjectForKey:SDLNameTextFields];
-    }
+    [store sdl_setObject:textFields forName:SDLNameTextFields];
 }
 
 - (NSMutableArray<SDLTextField *> *)textFields {
-    NSMutableArray<SDLTextField *> *array = [store objectForKey:SDLNameTextFields];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTextField.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLTextField *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLTextField alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [store sdl_objectsForName:SDLNameTextFields ofClass:SDLTextField.class];
 }
 
 - (void)setImageFields:(nullable NSMutableArray<SDLImageField *> *)imageFields {
-    if (imageFields != nil) {
-        [store setObject:imageFields forKey:SDLNameImageFields];
-    } else {
-        [store removeObjectForKey:SDLNameImageFields];
-    }
+    [store sdl_setObject:imageFields forName:SDLNameImageFields];
 }
 
 - (nullable NSMutableArray<SDLImageField *> *)imageFields {
-    NSMutableArray<SDLImageField *> *array = [store objectForKey:SDLNameImageFields];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLImageField.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLImageField *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLImageField alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [store sdl_objectsForName:SDLNameImageFields ofClass:SDLImageField.class];
 }
 
 - (void)setMediaClockFormats:(NSMutableArray<SDLMediaClockFormat> *)mediaClockFormats {
-    if (mediaClockFormats != nil) {
-        [store setObject:mediaClockFormats forKey:SDLNameMediaClockFormats];
-    } else {
-        [store removeObjectForKey:SDLNameMediaClockFormats];
-    }
+    [store sdl_setObject:mediaClockFormats forName:SDLNameMediaClockFormats];
 }
 
 - (NSMutableArray<SDLMediaClockFormat> *)mediaClockFormats {
-    NSMutableArray<SDLMediaClockFormat> *array = [store objectForKey:SDLNameMediaClockFormats];
-    if ([array count] < 1) {
-        return array;
-    } else {
-        NSMutableArray<SDLMediaClockFormat> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSString *enumString in array) {
-            [newList addObject:(SDLMediaClockFormat)enumString];
-        }
-        return newList;
-    }
+    return [store sdl_enumsForName:SDLNameMediaClockFormats];
 }
 
 - (void)setGraphicSupported:(NSNumber<SDLBool> *)graphicSupported {
-    if (graphicSupported != nil) {
-        [store setObject:graphicSupported forKey:SDLNameGraphicSupported];
-    } else {
-        [store removeObjectForKey:SDLNameGraphicSupported];
-    }
+    [store sdl_setObject:graphicSupported forName:SDLNameGraphicSupported];
 }
 
 - (NSNumber<SDLBool> *)graphicSupported {
-    return [store objectForKey:SDLNameGraphicSupported];
+    return [store sdl_objectForName:SDLNameGraphicSupported];
 }
 
 - (void)setTemplatesAvailable:(nullable NSMutableArray<NSString *> *)templatesAvailable {
-    if (templatesAvailable != nil) {
-        [store setObject:templatesAvailable forKey:SDLNameTemplatesAvailable];
-    } else {
-        [store removeObjectForKey:SDLNameTemplatesAvailable];
-    }
+    [store sdl_setObject:templatesAvailable forName:SDLNameTemplatesAvailable];
 }
 
 - (nullable NSMutableArray<NSString *> *)templatesAvailable {
-    return [store objectForKey:SDLNameTemplatesAvailable];
+    return [store sdl_objectForName:SDLNameTemplatesAvailable];
 }
 
 - (void)setScreenParams:(nullable SDLScreenParams *)screenParams {
-    if (screenParams != nil) {
-        [store setObject:screenParams forKey:SDLNameScreenParams];
-    } else {
-        [store removeObjectForKey:SDLNameScreenParams];
-    }
+    [store sdl_setObject:screenParams forName:SDLNameScreenParams];
 }
 
 - (nullable SDLScreenParams *)screenParams {
-    NSObject *obj = [store objectForKey:SDLNameScreenParams];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLScreenParams alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLScreenParams*)obj;
+    return [store sdl_objectForName:SDLNameScreenParams ofClass:SDLScreenParams.class];
 }
 
 - (void)setNumCustomPresetsAvailable:(nullable NSNumber<SDLInt> *)numCustomPresetsAvailable {
-    if (numCustomPresetsAvailable != nil) {
-        [store setObject:numCustomPresetsAvailable forKey:SDLNameNumberCustomPresetsAvailable];
-    } else {
-        [store removeObjectForKey:SDLNameNumberCustomPresetsAvailable];
-    }
+    [store sdl_setObject:numCustomPresetsAvailable forName:SDLNameNumberCustomPresetsAvailable];
 }
 
 - (nullable NSNumber<SDLInt> *)numCustomPresetsAvailable {
-    return [store objectForKey:SDLNameNumberCustomPresetsAvailable];
+    return [store sdl_objectForName:SDLNameNumberCustomPresetsAvailable];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLECallInfo.m b/SmartDeviceLink/SDLECallInfo.m
index 81753457c..656ee3329 100644
--- a/SmartDeviceLink/SDLECallInfo.m
+++ b/SmartDeviceLink/SDLECallInfo.m
@@ -3,6 +3,7 @@
 
 #import "SDLECallInfo.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -10,42 +11,27 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLECallInfo
 
 - (void)setECallNotificationStatus:(SDLVehicleDataNotificationStatus)eCallNotificationStatus {
-    if (eCallNotificationStatus != nil) {
-        [store setObject:eCallNotificationStatus forKey:SDLNameECallNotificationStatus];
-    } else {
-        [store removeObjectForKey:SDLNameECallNotificationStatus];
-    }
+    [store sdl_setObject:eCallNotificationStatus forName:SDLNameECallNotificationStatus];
 }
 
 - (SDLVehicleDataNotificationStatus)eCallNotificationStatus {
-    NSObject *obj = [store objectForKey:SDLNameECallNotificationStatus];
-    return (SDLVehicleDataNotificationStatus)obj;
+    return [store sdl_objectForName:SDLNameECallNotificationStatus];
 }
 
 - (void)setAuxECallNotificationStatus:(SDLVehicleDataNotificationStatus)auxECallNotificationStatus {
-    if (auxECallNotificationStatus != nil) {
-        [store setObject:auxECallNotificationStatus forKey:SDLNameAuxECallNotificationStatus];
-    } else {
-        [store removeObjectForKey:SDLNameAuxECallNotificationStatus];
-    }
+    [store sdl_setObject:auxECallNotificationStatus forName:SDLNameAuxECallNotificationStatus];
 }
 
 - (SDLVehicleDataNotificationStatus)auxECallNotificationStatus {
-    NSObject *obj = [store objectForKey:SDLNameAuxECallNotificationStatus];
-    return (SDLVehicleDataNotificationStatus)obj;
+    return [store sdl_objectForName:SDLNameAuxECallNotificationStatus];
 }
 
 - (void)setECallConfirmationStatus:(SDLECallConfirmationStatus)eCallConfirmationStatus {
-    if (eCallConfirmationStatus != nil) {
-        [store setObject:eCallConfirmationStatus forKey:SDLNameECallConfirmationStatus];
-    } else {
-        [store removeObjectForKey:SDLNameECallConfirmationStatus];
-    }
+    [store sdl_setObject:eCallConfirmationStatus forName:SDLNameECallConfirmationStatus];
 }
 
 - (SDLECallConfirmationStatus)eCallConfirmationStatus {
-    NSObject *obj = [store objectForKey:SDLNameECallConfirmationStatus];
-    return (SDLECallConfirmationStatus)obj;
+    return [store sdl_objectForName:SDLNameECallConfirmationStatus];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLEmergencyEvent.m b/SmartDeviceLink/SDLEmergencyEvent.m
index e226265d8..1aa18743e 100644
--- a/SmartDeviceLink/SDLEmergencyEvent.m
+++ b/SmartDeviceLink/SDLEmergencyEvent.m
@@ -3,6 +3,7 @@
 
 #import "SDLEmergencyEvent.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -10,67 +11,43 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLEmergencyEvent
 
 - (void)setEmergencyEventType:(SDLEmergencyEventType)emergencyEventType {
-    if (emergencyEventType != nil) {
-        [store setObject:emergencyEventType forKey:SDLNameEmergencyEventType];
-    } else {
-        [store removeObjectForKey:SDLNameEmergencyEventType];
-    }
+    [store sdl_setObject:emergencyEventType forName:SDLNameEmergencyEventType];
 }
 
 - (SDLEmergencyEventType)emergencyEventType {
-    NSObject *obj = [store objectForKey:SDLNameEmergencyEventType];
-    return (SDLEmergencyEventType)obj;
+    return [store sdl_objectForName:SDLNameEmergencyEventType];
 }
 
 - (void)setFuelCutoffStatus:(SDLFuelCutoffStatus)fuelCutoffStatus {
-    if (fuelCutoffStatus != nil) {
-        [store setObject:fuelCutoffStatus forKey:SDLNameFuelCutoffStatus];
-    } else {
-        [store removeObjectForKey:SDLNameFuelCutoffStatus];
-    }
+    [store sdl_setObject:fuelCutoffStatus forName:SDLNameFuelCutoffStatus];
 }
 
 - (SDLFuelCutoffStatus)fuelCutoffStatus {
-    NSObject *obj = [store objectForKey:SDLNameFuelCutoffStatus];
-    return (SDLFuelCutoffStatus)obj;
+    return [store sdl_objectForName:SDLNameFuelCutoffStatus];
 }
 
 - (void)setRolloverEvent:(SDLVehicleDataEventStatus)rolloverEvent {
-    if (rolloverEvent != nil) {
-        [store setObject:rolloverEvent forKey:SDLNameRolloverEvent];
-    } else {
-        [store removeObjectForKey:SDLNameRolloverEvent];
-    }
+    [store sdl_setObject:rolloverEvent forName:SDLNameRolloverEvent];
 }
 
 - (SDLVehicleDataEventStatus)rolloverEvent {
-    NSObject *obj = [store objectForKey:SDLNameRolloverEvent];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNameRolloverEvent];
 }
 
 - (void)setMaximumChangeVelocity:(NSNumber<SDLInt> *)maximumChangeVelocity {
-    if (maximumChangeVelocity != nil) {
-        [store setObject:maximumChangeVelocity forKey:SDLNameMaximumChangeVelocity];
-    } else {
-        [store removeObjectForKey:SDLNameMaximumChangeVelocity];
-    }
+    [store sdl_setObject:maximumChangeVelocity forName:SDLNameMaximumChangeVelocity];
 }
 
 - (NSNumber<SDLInt> *)maximumChangeVelocity {
-    return [store objectForKey:SDLNameMaximumChangeVelocity];
+    return [store sdl_objectForName:SDLNameMaximumChangeVelocity];
 }
 
 - (void)setMultipleEvents:(SDLVehicleDataEventStatus)multipleEvents {
-    if (multipleEvents != nil) {
-        [store setObject:multipleEvents forKey:SDLNameMultipleEvents];
-    } else {
-        [store removeObjectForKey:SDLNameMultipleEvents];
-    }
+    [store sdl_setObject:multipleEvents forName:SDLNameMultipleEvents];
 }
 
 - (SDLVehicleDataEventStatus)multipleEvents {
-    NSObject *obj = [store objectForKey:SDLNameMultipleEvents];
-    return (SDLVehicleDataEventStatus)obj;
+    return [store sdl_objectForName:SDLNameMultipleEvents];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLEncodedSyncPData.m b/SmartDeviceLink/SDLEncodedSyncPData.m
index 801a69372..39873052f 100644
--- a/SmartDeviceLink/SDLEncodedSyncPData.m
+++ b/SmartDeviceLink/SDLEncodedSyncPData.m
@@ -4,6 +4,7 @@
 
 #import "SDLEncodedSyncPData.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -17,15 +18,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setData:(NSMutableArray<NSString *> *)data {
-    if (data != nil) {
-        [parameters setObject:data forKey:SDLNameData];
-    } else {
-        [parameters removeObjectForKey:SDLNameData];
-    }
+    [parameters sdl_setObject:data forName:SDLNameData];
 }
 
 - (NSMutableArray<NSString *> *)data {
-    return [parameters objectForKey:SDLNameData];
+    return [parameters sdl_objectForName:SDLNameData];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLEncodedSyncPDataResponse.m b/SmartDeviceLink/SDLEncodedSyncPDataResponse.m
index ecde6b6e4..c8d4c673e 100644
--- a/SmartDeviceLink/SDLEncodedSyncPDataResponse.m
+++ b/SmartDeviceLink/SDLEncodedSyncPDataResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLEncodedSyncPDataResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLEndAudioPassThru.m b/SmartDeviceLink/SDLEndAudioPassThru.m
index 56886e8ff..127702a06 100644
--- a/SmartDeviceLink/SDLEndAudioPassThru.m
+++ b/SmartDeviceLink/SDLEndAudioPassThru.m
@@ -4,6 +4,7 @@
 
 #import "SDLEndAudioPassThru.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLEndAudioPassThruResponse.m b/SmartDeviceLink/SDLEndAudioPassThruResponse.m
index e9218d3d6..3efaa3915 100644
--- a/SmartDeviceLink/SDLEndAudioPassThruResponse.m
+++ b/SmartDeviceLink/SDLEndAudioPassThruResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLEndAudioPassThruResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLFunctionID.h b/SmartDeviceLink/SDLFunctionID.h
index 2d96c7882..7cb9d6cb1 100644
--- a/SmartDeviceLink/SDLFunctionID.h
+++ b/SmartDeviceLink/SDLFunctionID.h
@@ -4,6 +4,7 @@
 
 #import <Foundation/Foundation.h>
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "NSNumber+NumberType.h"
 
diff --git a/SmartDeviceLink/SDLGPSData.m b/SmartDeviceLink/SDLGPSData.m
index dc7be5e1c..8bd17706f 100644
--- a/SmartDeviceLink/SDLGPSData.m
+++ b/SmartDeviceLink/SDLGPSData.m
@@ -3,6 +3,7 @@
 
 #import "SDLGPSData.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -10,221 +11,147 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLGPSData
 
 - (void)setLongitudeDegrees:(NSNumber<SDLFloat> *)longitudeDegrees {
-    if (longitudeDegrees != nil) {
-        [store setObject:longitudeDegrees forKey:SDLNameLongitudeDegrees];
-    } else {
-        [store removeObjectForKey:SDLNameLongitudeDegrees];
-    }
+    [store sdl_setObject:longitudeDegrees forName:SDLNameLongitudeDegrees];
 }
 
 - (NSNumber<SDLFloat> *)longitudeDegrees {
-    return [store objectForKey:SDLNameLongitudeDegrees];
+    return [store sdl_objectForName:SDLNameLongitudeDegrees];
 }
 
 - (void)setLatitudeDegrees:(NSNumber<SDLFloat> *)latitudeDegrees {
-    if (latitudeDegrees != nil) {
-        [store setObject:latitudeDegrees forKey:SDLNameLatitudeDegrees];
-    } else {
-        [store removeObjectForKey:SDLNameLatitudeDegrees];
-    }
+    [store sdl_setObject:latitudeDegrees forName:SDLNameLatitudeDegrees];
 }
 
 - (NSNumber<SDLFloat> *)latitudeDegrees {
-    return [store objectForKey:SDLNameLatitudeDegrees];
+    return [store sdl_objectForName:SDLNameLatitudeDegrees];
 }
 
 - (void)setUtcYear:(NSNumber<SDLInt> *)utcYear {
-    if (utcYear != nil) {
-        [store setObject:utcYear forKey:SDLNameUTCYear];
-    } else {
-        [store removeObjectForKey:SDLNameUTCYear];
-    }
+    [store sdl_setObject:utcYear forName:SDLNameUTCYear];
 }
 
 - (NSNumber<SDLInt> *)utcYear {
-    return [store objectForKey:SDLNameUTCYear];
+    return [store sdl_objectForName:SDLNameUTCYear];
 }
 
 - (void)setUtcMonth:(NSNumber<SDLInt> *)utcMonth {
-    if (utcMonth != nil) {
-        [store setObject:utcMonth forKey:SDLNameUTCMonth];
-    } else {
-        [store removeObjectForKey:SDLNameUTCMonth];
-    }
+    [store sdl_setObject:utcMonth forName:SDLNameUTCMonth];
 }
 
 - (NSNumber<SDLInt> *)utcMonth {
-    return [store objectForKey:SDLNameUTCMonth];
+    return [store sdl_objectForName:SDLNameUTCMonth];
 }
 
 - (void)setUtcDay:(NSNumber<SDLInt> *)utcDay {
-    if (utcDay != nil) {
-        [store setObject:utcDay forKey:SDLNameUTCDay];
-    } else {
-        [store removeObjectForKey:SDLNameUTCDay];
-    }
+    [store sdl_setObject:utcDay forName:SDLNameUTCDay];
 }
 
 - (NSNumber<SDLInt> *)utcDay {
-    return [store objectForKey:SDLNameUTCDay];
+    return [store sdl_objectForName:SDLNameUTCDay];
 }
 
 - (void)setUtcHours:(NSNumber<SDLInt> *)utcHours {
-    if (utcHours != nil) {
-        [store setObject:utcHours forKey:SDLNameUTCHours];
-    } else {
-        [store removeObjectForKey:SDLNameUTCHours];
-    }
+    [store sdl_setObject:utcHours forName:SDLNameUTCHours];
 }
 
 - (NSNumber<SDLInt> *)utcHours {
-    return [store objectForKey:SDLNameUTCHours];
+    return [store sdl_objectForName:SDLNameUTCHours];
 }
 
 - (void)setUtcMinutes:(NSNumber<SDLInt> *)utcMinutes {
-    if (utcMinutes != nil) {
-        [store setObject:utcMinutes forKey:SDLNameUTCMinutes];
-    } else {
-        [store removeObjectForKey:SDLNameUTCMinutes];
-    }
+    [store sdl_setObject:utcMinutes forName:SDLNameUTCMinutes];
 }
 
 - (NSNumber<SDLInt> *)utcMinutes {
-    return [store objectForKey:SDLNameUTCMinutes];
+    return [store sdl_objectForName:SDLNameUTCMinutes];
 }
 
 - (void)setUtcSeconds:(NSNumber<SDLInt> *)utcSeconds {
-    if (utcSeconds != nil) {
-        [store setObject:utcSeconds forKey:SDLNameUTCSeconds];
-    } else {
-        [store removeObjectForKey:SDLNameUTCSeconds];
-    }
+    [store sdl_setObject:utcSeconds forName:SDLNameUTCSeconds];
 }
 
 - (NSNumber<SDLInt> *)utcSeconds {
-    return [store objectForKey:SDLNameUTCSeconds];
+    return [store sdl_objectForName:SDLNameUTCSeconds];
 }
 
 - (void)setCompassDirection:(SDLCompassDirection)compassDirection {
-    if (compassDirection != nil) {
-        [store setObject:compassDirection forKey:SDLNameCompassDirection];
-    } else {
-        [store removeObjectForKey:SDLNameCompassDirection];
-    }
+    [store sdl_setObject:compassDirection forName:SDLNameCompassDirection];
 }
 
 - (SDLCompassDirection)compassDirection {
-    NSObject *obj = [store objectForKey:SDLNameCompassDirection];
-    return (SDLCompassDirection)obj;
+    return [store sdl_objectForName:SDLNameCompassDirection];
 }
 
 - (void)setPdop:(NSNumber<SDLFloat> *)pdop {
-    if (pdop != nil) {
-        [store setObject:pdop forKey:SDLNamePDOP];
-    } else {
-        [store removeObjectForKey:SDLNamePDOP];
-    }
+    [store sdl_setObject:pdop forName:SDLNamePDOP];
 }
 
 - (NSNumber<SDLFloat> *)pdop {
-    return [store objectForKey:SDLNamePDOP];
+    return [store sdl_objectForName:SDLNamePDOP];
 }
 
 - (void)setHdop:(NSNumber<SDLFloat> *)hdop {
-    if (hdop != nil) {
-        [store setObject:hdop forKey:SDLNameHDOP];
-    } else {
-        [store removeObjectForKey:SDLNameHDOP];
-    }
+    [store sdl_setObject:hdop forName:SDLNameHDOP];
 }
 
 - (NSNumber<SDLFloat> *)hdop {
-    return [store objectForKey:SDLNameHDOP];
+    return [store sdl_objectForName:SDLNameHDOP];
 }
 
 - (void)setVdop:(NSNumber<SDLFloat> *)vdop {
-    if (vdop != nil) {
-        [store setObject:vdop forKey:SDLNameVDOP];
-    } else {
-        [store removeObjectForKey:SDLNameVDOP];
-    }
+    [store sdl_setObject:vdop forName:SDLNameVDOP];
 }
 
 - (NSNumber<SDLFloat> *)vdop {
-    return [store objectForKey:SDLNameVDOP];
+    return [store sdl_objectForName:SDLNameVDOP];
 }
 
 - (void)setActual:(NSNumber<SDLBool> *)actual {
-    if (actual != nil) {
-        [store setObject:actual forKey:SDLNameActual];
-    } else {
-        [store removeObjectForKey:SDLNameActual];
-    }
+    [store sdl_setObject:actual forName:SDLNameActual];
 }
 
 - (NSNumber<SDLBool> *)actual {
-    return [store objectForKey:SDLNameActual];
+    return [store sdl_objectForName:SDLNameActual];
 }
 
 - (void)setSatellites:(NSNumber<SDLInt> *)satellites {
-    if (satellites != nil) {
-        [store setObject:satellites forKey:SDLNameSatellites];
-    } else {
-        [store removeObjectForKey:SDLNameSatellites];
-    }
+    [store sdl_setObject:satellites forName:SDLNameSatellites];
 }
 
 - (NSNumber<SDLInt> *)satellites {
-    return [store objectForKey:SDLNameSatellites];
+    return [store sdl_objectForName:SDLNameSatellites];
 }
 
 - (void)setDimension:(SDLDimension)dimension {
-    if (dimension != nil) {
-        [store setObject:dimension forKey:SDLNameDimension];
-    } else {
-        [store removeObjectForKey:SDLNameDimension];
-    }
+    [store sdl_setObject:dimension forName:SDLNameDimension];
 }
 
 - (SDLDimension)dimension {
-    NSObject *obj = [store objectForKey:SDLNameDimension];
-    return (SDLDimension)obj;
+    return [store sdl_objectForName:SDLNameDimension];
 }
 
 - (void)setAltitude:(NSNumber<SDLFloat> *)altitude {
-    if (altitude != nil) {
-        [store setObject:altitude forKey:SDLNameAltitude];
-    } else {
-        [store removeObjectForKey:SDLNameAltitude];
-    }
+    [store sdl_setObject:altitude forName:SDLNameAltitude];
 }
 
 - (NSNumber<SDLFloat> *)altitude {
-    return [store objectForKey:SDLNameAltitude];
+    return [store sdl_objectForName:SDLNameAltitude];
 }
 
 - (void)setHeading:(NSNumber<SDLFloat> *)heading {
-    if (heading != nil) {
-        [store setObject:heading forKey:SDLNameHeading];
-    } else {
-        [store removeObjectForKey:SDLNameHeading];
-    }
+    [store sdl_setObject:heading forName:SDLNameHeading];
 }
 
 - (NSNumber<SDLFloat> *)heading {
-    return [store objectForKey:SDLNameHeading];
+    return [store sdl_objectForName:SDLNameHeading];
 }
 
 - (void)setSpeed:(NSNumber<SDLFloat> *)speed {
-    if (speed != nil) {
-        [store setObject:speed forKey:SDLNameSpeed];
-    } else {
-        [store removeObjectForKey:SDLNameSpeed];
-    }
+    [store sdl_setObject:speed forName:SDLNameSpeed];
 }
 
 - (NSNumber<SDLFloat> *)speed {
-    return [store objectForKey:SDLNameSpeed];
+    return [store sdl_objectForName:SDLNameSpeed];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLGenericResponse.m b/SmartDeviceLink/SDLGenericResponse.m
index 34368d397..6c3849018 100644
--- a/SmartDeviceLink/SDLGenericResponse.m
+++ b/SmartDeviceLink/SDLGenericResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLGenericResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLGetDTCs.m b/SmartDeviceLink/SDLGetDTCs.m
index 36a518252..3bbd551ff 100644
--- a/SmartDeviceLink/SDLGetDTCs.m
+++ b/SmartDeviceLink/SDLGetDTCs.m
@@ -4,6 +4,7 @@
 
 #import "SDLGetDTCs.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -39,27 +40,19 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setEcuName:(NSNumber<SDLInt> *)ecuName {
-    if (ecuName != nil) {
-        [parameters setObject:ecuName forKey:SDLNameECUName];
-    } else {
-        [parameters removeObjectForKey:SDLNameECUName];
-    }
+    [parameters sdl_setObject:ecuName forName:SDLNameECUName];
 }
 
 - (NSNumber<SDLInt> *)ecuName {
-    return [parameters objectForKey:SDLNameECUName];
+    return [parameters sdl_objectForName:SDLNameECUName];
 }
 
 - (void)setDtcMask:(nullable NSNumber<SDLInt> *)dtcMask {
-    if (dtcMask != nil) {
-        [parameters setObject:dtcMask forKey:SDLNameDTCMask];
-    } else {
-        [parameters removeObjectForKey:SDLNameDTCMask];
-    }
+    [parameters sdl_setObject:dtcMask forName:SDLNameDTCMask];
 }
 
 - (nullable NSNumber<SDLInt> *)dtcMask {
-    return [parameters objectForKey:SDLNameDTCMask];
+    return [parameters sdl_objectForName:SDLNameDTCMask];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLGetDTCsResponse.m b/SmartDeviceLink/SDLGetDTCsResponse.m
index 6a9edd79c..f1ead9716 100644
--- a/SmartDeviceLink/SDLGetDTCsResponse.m
+++ b/SmartDeviceLink/SDLGetDTCsResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLGetDTCsResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -17,11 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setEcuHeader:(NSNumber<SDLInt> *)ecuHeader {
-    if (ecuHeader != nil) {
-        [parameters setObject:ecuHeader forKey:SDLNameECUHeader];
-    } else {
-        [parameters removeObjectForKey:SDLNameECUHeader];
-    }
+    [parameters sdl_setObject:ecuHeader forName:SDLNameECUHeader];
 }
 
 - (NSNumber<SDLInt> *)ecuHeader {
@@ -29,11 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setDtc:(NSMutableArray<NSString *> *)dtc {
-    if (dtc != nil) {
-        [parameters setObject:dtc forKey:SDLNameDTC];
-    } else {
-        [parameters removeObjectForKey:SDLNameDTC];
-    }
+    [parameters sdl_setObject:dtc forName:SDLNameDTC];
 }
 
 - (NSMutableArray<NSString *> *)dtc {
diff --git a/SmartDeviceLink/SDLGetVehicleData.m b/SmartDeviceLink/SDLGetVehicleData.m
index da405b64c..53a897b7d 100644
--- a/SmartDeviceLink/SDLGetVehicleData.m
+++ b/SmartDeviceLink/SDLGetVehicleData.m
@@ -4,6 +4,7 @@
 
 #import "SDLGetVehicleData.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -52,303 +53,203 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setGps:(nullable NSNumber<SDLBool> *)gps {
-    if (gps != nil) {
-        [parameters setObject:gps forKey:SDLNameGPS];
-    } else {
-        [parameters removeObjectForKey:SDLNameGPS];
-    }
+    [parameters sdl_setObject:gps forName:SDLNameGPS];
 }
 
 - (nullable NSNumber<SDLBool> *)gps {
-    return [parameters objectForKey:SDLNameGPS];
+    return [parameters sdl_objectForName:SDLNameGPS];
 }
 
 - (void)setSpeed:(nullable NSNumber<SDLBool> *)speed {
-    if (speed != nil) {
-        [parameters setObject:speed forKey:SDLNameSpeed];
-    } else {
-        [parameters removeObjectForKey:SDLNameSpeed];
-    }
+    [parameters sdl_setObject:speed forName:SDLNameSpeed];
 }
 
 - (nullable NSNumber<SDLBool> *)speed {
-    return [parameters objectForKey:SDLNameSpeed];
+    return [parameters sdl_objectForName:SDLNameSpeed];
 }
 
 - (void)setRpm:(nullable NSNumber<SDLBool> *)rpm {
-    if (rpm != nil) {
-        [parameters setObject:rpm forKey:SDLNameRPM];
-    } else {
-        [parameters removeObjectForKey:SDLNameRPM];
-    }
+    [parameters sdl_setObject:rpm forName:SDLNameRPM];
 }
 
 - (nullable NSNumber<SDLBool> *)rpm {
-    return [parameters objectForKey:SDLNameRPM];
+    return [parameters sdl_objectForName:SDLNameRPM];
 }
 
 - (void)setFuelLevel:(nullable NSNumber<SDLBool> *)fuelLevel {
-    if (fuelLevel != nil) {
-        [parameters setObject:fuelLevel forKey:SDLNameFuelLevel];
-    } else {
-        [parameters removeObjectForKey:SDLNameFuelLevel];
-    }
+    [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel];
 }
 
 - (nullable NSNumber<SDLBool> *)fuelLevel {
-    return [parameters objectForKey:SDLNameFuelLevel];
+    return [parameters sdl_objectForName:SDLNameFuelLevel];
 }
 
 - (void)setFuelLevel_State:(nullable NSNumber<SDLBool> *)fuelLevel_State {
-    if (fuelLevel_State != nil) {
-        [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState];
-    } else {
-        [parameters removeObjectForKey:SDLNameFuelLevelState];
-    }
+    [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState];
 }
 
 - (nullable NSNumber<SDLBool> *)fuelLevel_State {
-    return [parameters objectForKey:SDLNameFuelLevelState];
+    return [parameters sdl_objectForName:SDLNameFuelLevelState];
 }
 
 - (void)setInstantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption {
-    if (instantFuelConsumption != nil) {
-        [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption];
-    } else {
-        [parameters removeObjectForKey:SDLNameInstantFuelConsumption];
-    }
+    [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
 }
 
 - (nullable NSNumber<SDLBool> *)instantFuelConsumption {
-    return [parameters objectForKey:SDLNameInstantFuelConsumption];
+    return [parameters sdl_objectForName:SDLNameInstantFuelConsumption];
 }
 
 - (void)setExternalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature {
-    if (externalTemperature != nil) {
-        [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature];
-    } else {
-        [parameters removeObjectForKey:SDLNameExternalTemperature];
-    }
+    [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature];
 }
 
 - (nullable NSNumber<SDLBool> *)externalTemperature {
-    return [parameters objectForKey:SDLNameExternalTemperature];
+    return [parameters sdl_objectForName:SDLNameExternalTemperature];
 }
 
 - (void)setVin:(nullable NSNumber<SDLBool> *)vin {
-    if (vin != nil) {
-        [parameters setObject:vin forKey:SDLNameVIN];
-    } else {
-        [parameters removeObjectForKey:SDLNameVIN];
-    }
+    [parameters sdl_setObject:vin forName:SDLNameVIN];
 }
 
 - (nullable NSNumber<SDLBool> *)vin {
-    return [parameters objectForKey:SDLNameVIN];
+    return [parameters sdl_objectForName:SDLNameVIN];
 }
 
 - (void)setPrndl:(nullable NSNumber<SDLBool> *)prndl {
-    if (prndl != nil) {
-        [parameters setObject:prndl forKey:SDLNamePRNDL];
-    } else {
-        [parameters removeObjectForKey:SDLNamePRNDL];
-    }
+    [parameters sdl_setObject:prndl forName:SDLNamePRNDL];
 }
 
 - (nullable NSNumber<SDLBool> *)prndl {
-    return [parameters objectForKey:SDLNamePRNDL];
+    return [parameters sdl_objectForName:SDLNamePRNDL];
 }
 
 - (void)setTirePressure:(nullable NSNumber<SDLBool> *)tirePressure {
-    if (tirePressure != nil) {
-        [parameters setObject:tirePressure forKey:SDLNameTirePressure];
-    } else {
-        [parameters removeObjectForKey:SDLNameTirePressure];
-    }
+    [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure];
 }
 
 - (nullable NSNumber<SDLBool> *)tirePressure {
-    return [parameters objectForKey:SDLNameTirePressure];
+    return [parameters sdl_objectForName:SDLNameTirePressure];
 }
 
 - (void)setOdometer:(nullable NSNumber<SDLBool> *)odometer {
-    if (odometer != nil) {
-        [parameters setObject:odometer forKey:SDLNameOdometer];
-    } else {
-        [parameters removeObjectForKey:SDLNameOdometer];
-    }
+    [parameters sdl_setObject:odometer forName:SDLNameOdometer];
 }
 
 - (nullable NSNumber<SDLBool> *)odometer {
-    return [parameters objectForKey:SDLNameOdometer];
+    return [parameters sdl_objectForName:SDLNameOdometer];
 }
 
 - (void)setBeltStatus:(nullable NSNumber<SDLBool> *)beltStatus {
-    if (beltStatus != nil) {
-        [parameters setObject:beltStatus forKey:SDLNameBeltStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameBeltStatus];
-    }
+    [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus];
 }
 
 - (nullable NSNumber<SDLBool> *)beltStatus {
-    return [parameters objectForKey:SDLNameBeltStatus];
+    return [parameters sdl_objectForName:SDLNameBeltStatus];
 }
 
 - (void)setBodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation {
-    if (bodyInformation != nil) {
-        [parameters setObject:bodyInformation forKey:SDLNameBodyInformation];
-    } else {
-        [parameters removeObjectForKey:SDLNameBodyInformation];
-    }
+    [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation];
 }
 
 - (nullable NSNumber<SDLBool> *)bodyInformation {
-    return [parameters objectForKey:SDLNameBodyInformation];
+    return [parameters sdl_objectForName:SDLNameBodyInformation];
 }
 
 - (void)setDeviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus {
-    if (deviceStatus != nil) {
-        [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameDeviceStatus];
-    }
+    [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus];
 }
 
 - (nullable NSNumber<SDLBool> *)deviceStatus {
-    return [parameters objectForKey:SDLNameDeviceStatus];
+    return [parameters sdl_objectForName:SDLNameDeviceStatus];
 }
 
 - (void)setDriverBraking:(nullable NSNumber<SDLBool> *)driverBraking {
-    if (driverBraking != nil) {
-        [parameters setObject:driverBraking forKey:SDLNameDriverBraking];
-    } else {
-        [parameters removeObjectForKey:SDLNameDriverBraking];
-    }
+    [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking];
 }
 
 - (nullable NSNumber<SDLBool> *)driverBraking {
-    return [parameters objectForKey:SDLNameDriverBraking];
+    return [parameters sdl_objectForName:SDLNameDriverBraking];
 }
 
 - (void)setWiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus {
-    if (wiperStatus != nil) {
-        [parameters setObject:wiperStatus forKey:SDLNameWiperStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameWiperStatus];
-    }
+    [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus];
 }
 
 - (nullable NSNumber<SDLBool> *)wiperStatus {
-    return [parameters objectForKey:SDLNameWiperStatus];
+    return [parameters sdl_objectForName:SDLNameWiperStatus];
 }
 
 - (void)setHeadLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus {
-    if (headLampStatus != nil) {
-        [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameHeadLampStatus];
-    }
+    [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus];
 }
 
 - (nullable NSNumber<SDLBool> *)headLampStatus {
-    return [parameters objectForKey:SDLNameHeadLampStatus];
+    return [parameters sdl_objectForName:SDLNameHeadLampStatus];
 }
 
 - (void)setEngineTorque:(nullable NSNumber<SDLBool> *)engineTorque {
-    if (engineTorque != nil) {
-        [parameters setObject:engineTorque forKey:SDLNameEngineTorque];
-    } else {
-        [parameters removeObjectForKey:SDLNameEngineTorque];
-    }
+    [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque];
 }
 
 - (nullable NSNumber<SDLBool> *)engineTorque {
-    return [parameters objectForKey:SDLNameEngineTorque];
+    return [parameters sdl_objectForName:SDLNameEngineTorque];
 }
 
 - (void)setAccPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition {
-    if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
-    } else {
-        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
-    }
+    [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
 }
 
 - (nullable NSNumber<SDLBool> *)accPedalPosition {
-    return [parameters objectForKey:SDLNameAccelerationPedalPosition];
+    return [parameters sdl_objectForName:SDLNameAccelerationPedalPosition];
 }
 
 - (void)setSteeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle {
-    if (steeringWheelAngle != nil) {
-        [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle];
-    } else {
-        [parameters removeObjectForKey:SDLNameSteeringWheelAngle];
-    }
+    [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
 }
 
 - (nullable NSNumber<SDLBool> *)steeringWheelAngle {
-    return [parameters objectForKey:SDLNameSteeringWheelAngle];
+    return [parameters sdl_objectForName:SDLNameSteeringWheelAngle];
 }
 
 - (void)setECallInfo:(nullable NSNumber<SDLBool> *)eCallInfo {
-    if (eCallInfo != nil) {
-        [parameters setObject:eCallInfo forKey:SDLNameECallInfo];
-    } else {
-        [parameters removeObjectForKey:SDLNameECallInfo];
-    }
+    [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo];
 }
 
 - (nullable NSNumber<SDLBool> *)eCallInfo {
-    return [parameters objectForKey:SDLNameECallInfo];
+    return [parameters sdl_objectForName:SDLNameECallInfo];
 }
 
 - (void)setAirbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus {
-    if (airbagStatus != nil) {
-        [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameAirbagStatus];
-    }
+    [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus];
 }
 
 - (nullable NSNumber<SDLBool> *)airbagStatus {
-    return [parameters objectForKey:SDLNameAirbagStatus];
+    return [parameters sdl_objectForName:SDLNameAirbagStatus];
 }
 
 - (void)setEmergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent {
-    if (emergencyEvent != nil) {
-        [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent];
-    } else {
-        [parameters removeObjectForKey:SDLNameEmergencyEvent];
-    }
+    [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent];
 }
 
 - (nullable NSNumber<SDLBool> *)emergencyEvent {
-    return [parameters objectForKey:SDLNameEmergencyEvent];
+    return [parameters sdl_objectForName:SDLNameEmergencyEvent];
 }
 
 - (void)setClusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus {
-    if (clusterModeStatus != nil) {
-        [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameClusterModeStatus];
-    }
+    [parameters sdl_setObject:clusterModeStatus forName:SDLNameClusterModeStatus];
 }
 
 - (nullable NSNumber<SDLBool> *)clusterModeStatus {
-    return [parameters objectForKey:SDLNameClusterModeStatus];
+    return [parameters sdl_objectForName:SDLNameClusterModeStatus];
 }
 
 - (void)setMyKey:(nullable NSNumber<SDLBool> *)myKey {
-    if (myKey != nil) {
-        [parameters setObject:myKey forKey:SDLNameMyKey];
-    } else {
-        [parameters removeObjectForKey:SDLNameMyKey];
-    }
+    [parameters sdl_setObject:myKey forName:SDLNameMyKey];
 }
 
 - (nullable NSNumber<SDLBool> *)myKey {
-    return [parameters objectForKey:SDLNameMyKey];
+    return [parameters sdl_objectForName:SDLNameMyKey];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink/SDLGetVehicleDataResponse.m
index 225d1b355..81b379b49 100644
--- a/SmartDeviceLink/SDLGetVehicleDataResponse.m
+++ b/SmartDeviceLink/SDLGetVehicleDataResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLGetVehicleDataResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLAirbagStatus.h"
 #import "SDLBeltStatus.h"
 #import "SDLBodyInformation.h"
@@ -17,6 +18,7 @@
 #import "SDLNames.h"
 #import "SDLTireStatus.h"
 
+NS_ASSUME_NONNULL_BEGIN
 
 @implementation SDLGetVehicleDataResponse
 
@@ -27,362 +29,205 @@
 }
 
 - (void)setGps:(nullable SDLGPSData *)gps {
-    if (gps != nil) {
-        [parameters setObject:gps forKey:SDLNameGPS];
-    } else {
-        [parameters removeObjectForKey:SDLNameGPS];
-    }
+    [parameters sdl_setObject:gps forName:SDLNameGPS];
 }
 
 - (nullable SDLGPSData *)gps {
-    NSObject *obj = [parameters objectForKey:SDLNameGPS];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLGPSData alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLGPSData*)obj;
+    return [parameters sdl_objectForName:SDLNameGPS ofClass:SDLGPSData.class];
 }
 
 - (void)setSpeed:(nullable NSNumber<SDLFloat> *)speed {
-    if (speed != nil) {
-        [parameters setObject:speed forKey:SDLNameSpeed];
-    } else {
-        [parameters removeObjectForKey:SDLNameSpeed];
-    }
+    [parameters sdl_setObject:speed forName:SDLNameSpeed];
 }
 
 - (nullable NSNumber<SDLFloat> *)speed {
-    return [parameters objectForKey:SDLNameSpeed];
+    return [parameters sdl_objectForName:SDLNameSpeed];
 }
 
 - (void)setRpm:(nullable NSNumber<SDLInt> *)rpm {
-    if (rpm != nil) {
-        [parameters setObject:rpm forKey:SDLNameRPM];
-    } else {
-        [parameters removeObjectForKey:SDLNameRPM];
-    }
+    [parameters sdl_setObject:rpm forName:SDLNameRPM];
 }
 
 - (nullable NSNumber<SDLInt> *)rpm {
-    return [parameters objectForKey:SDLNameRPM];
+    return [parameters sdl_objectForName:SDLNameRPM];
 }
 
 - (void)setFuelLevel:(nullable NSNumber<SDLFloat> *)fuelLevel {
-    if (fuelLevel != nil) {
-        [parameters setObject:fuelLevel forKey:SDLNameFuelLevel];
-    } else {
-        [parameters removeObjectForKey:SDLNameFuelLevel];
-    }
+    [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel];
 }
 
 - (nullable NSNumber<SDLFloat> *)fuelLevel {
-    return [parameters objectForKey:SDLNameFuelLevel];
+    return [parameters sdl_objectForName:SDLNameFuelLevel];
 }
 
 - (void)setFuelLevel_State:(nullable SDLComponentVolumeStatus)fuelLevel_State {
-    if (fuelLevel_State != nil) {
-        [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState];
-    } else {
-        [parameters removeObjectForKey:SDLNameFuelLevelState];
-    }
+    [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState];
 }
 
 - (nullable SDLComponentVolumeStatus)fuelLevel_State {
-    NSObject *obj = [parameters objectForKey:SDLNameFuelLevelState];
-    return (SDLComponentVolumeStatus)obj;
+    return [parameters sdl_objectForName:SDLNameFuelLevelState];
 }
 
 - (void)setInstantFuelConsumption:(nullable NSNumber<SDLFloat> *)instantFuelConsumption {
-    if (instantFuelConsumption != nil) {
-        [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption];
-    } else {
-        [parameters removeObjectForKey:SDLNameInstantFuelConsumption];
-    }
+    [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
 }
 
 - (nullable NSNumber<SDLFloat> *)instantFuelConsumption {
-    return [parameters objectForKey:SDLNameInstantFuelConsumption];
+    return [parameters sdl_objectForName:SDLNameInstantFuelConsumption];
 }
 
 - (void)setExternalTemperature:(nullable NSNumber<SDLFloat> *)externalTemperature {
-    if (externalTemperature != nil) {
-        [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature];
-    } else {
-        [parameters removeObjectForKey:SDLNameExternalTemperature];
-    }
+    [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature];
 }
 
 - (nullable NSNumber<SDLFloat> *)externalTemperature {
-    return [parameters objectForKey:SDLNameExternalTemperature];
+    return [parameters sdl_objectForName:SDLNameExternalTemperature];
 }
 
 - (void)setVin:(nullable NSString *)vin {
-    if (vin != nil) {
-        [parameters setObject:vin forKey:SDLNameVIN];
-    } else {
-        [parameters removeObjectForKey:SDLNameVIN];
-    }
+    [parameters sdl_setObject:vin forName:SDLNameVIN];
 }
 
 - (nullable NSString *)vin {
-    return [parameters objectForKey:SDLNameVIN];
+    return [parameters sdl_objectForName:SDLNameVIN];
 }
 
 - (void)setPrndl:(nullable SDLPRNDL)prndl {
-    if (prndl != nil) {
-        [parameters setObject:prndl forKey:SDLNamePRNDL];
-    } else {
-        [parameters removeObjectForKey:SDLNamePRNDL];
-    }
+    [parameters sdl_setObject:prndl forName:SDLNamePRNDL];
 }
 
 - (nullable SDLPRNDL)prndl {
-    NSObject *obj = [parameters objectForKey:SDLNamePRNDL];
-    return (SDLPRNDL)obj;
+    return [parameters sdl_objectForName:SDLNamePRNDL];
 }
 
 - (void)setTirePressure:(nullable SDLTireStatus *)tirePressure {
-    if (tirePressure != nil) {
-        [parameters setObject:tirePressure forKey:SDLNameTirePressure];
-    } else {
-        [parameters removeObjectForKey:SDLNameTirePressure];
-    }
+    [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure];
 }
 
 - (nullable SDLTireStatus *)tirePressure {
-    NSObject *obj = [parameters objectForKey:SDLNameTirePressure];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLTireStatus alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLTireStatus*)obj;
+    return [parameters sdl_objectForName:SDLNameTirePressure ofClass:SDLTireStatus.class];
 }
 
 - (void)setOdometer:(nullable NSNumber<SDLInt> *)odometer {
-    if (odometer != nil) {
-        [parameters setObject:odometer forKey:SDLNameOdometer];
-    } else {
-        [parameters removeObjectForKey:SDLNameOdometer];
-    }
+    [parameters sdl_setObject:odometer forName:SDLNameOdometer];
 }
 
 - (nullable NSNumber<SDLInt> *)odometer {
-    return [parameters objectForKey:SDLNameOdometer];
+    return [parameters sdl_objectForName:SDLNameOdometer];
 }
 
 - (void)setBeltStatus:(nullable SDLBeltStatus *)beltStatus {
-    if (beltStatus != nil) {
-        [parameters setObject:beltStatus forKey:SDLNameBeltStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameBeltStatus];
-    }
+    [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus];
 }
 
 - (nullable SDLBeltStatus *)beltStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameBeltStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLBeltStatus alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLBeltStatus*)obj;
+    return [parameters sdl_objectForName:SDLNameBeltStatus ofClass:SDLBeltStatus.class];
 }
 
 - (void)setBodyInformation:(nullable SDLBodyInformation *)bodyInformation {
-    if (bodyInformation != nil) {
-        [parameters setObject:bodyInformation forKey:SDLNameBodyInformation];
-    } else {
-        [parameters removeObjectForKey:SDLNameBodyInformation];
-    }
+    [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation];
 }
 
 - (nullable SDLBodyInformation *)bodyInformation {
-    NSObject *obj = [parameters objectForKey:SDLNameBodyInformation];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLBodyInformation alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLBodyInformation*)obj;
+    return [parameters sdl_objectForName:SDLNameBodyInformation ofClass:SDLBodyInformation.class];
 }
 
 - (void)setDeviceStatus:(nullable SDLDeviceStatus *)deviceStatus {
-    if (deviceStatus != nil) {
-        [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameDeviceStatus];
-    }
+    [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus];
 }
 
 - (nullable SDLDeviceStatus *)deviceStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameDeviceStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLDeviceStatus alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLDeviceStatus*)obj;
+    return [parameters sdl_objectForName:SDLNameDeviceStatus ofClass:SDLDeviceStatus.class];
 }
 
 - (void)setDriverBraking:(nullable SDLVehicleDataEventStatus)driverBraking {
-    if (driverBraking != nil) {
-        [parameters setObject:driverBraking forKey:SDLNameDriverBraking];
-    } else {
-        [parameters removeObjectForKey:SDLNameDriverBraking];
-    }
+    [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking];
 }
 
 - (nullable SDLVehicleDataEventStatus)driverBraking {
-    NSObject *obj = [parameters objectForKey:SDLNameDriverBraking];
-    return (SDLVehicleDataEventStatus)obj;
+    return [parameters sdl_objectForName:SDLNameDriverBraking];
 }
 
 - (void)setWiperStatus:(nullable SDLWiperStatus)wiperStatus {
-    if (wiperStatus != nil) {
-        [parameters setObject:wiperStatus forKey:SDLNameWiperStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameWiperStatus];
-    }
+    [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus];
 }
 
 - (nullable SDLWiperStatus)wiperStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameWiperStatus];
-    return (SDLWiperStatus)obj;
+    return [parameters sdl_objectForName:SDLNameWiperStatus];
 }
 
 - (void)setHeadLampStatus:(nullable SDLHeadLampStatus *)headLampStatus {
-    if (headLampStatus != nil) {
-        [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameHeadLampStatus];
-    }
+    [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus];
 }
 
 - (nullable SDLHeadLampStatus *)headLampStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameHeadLampStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLHeadLampStatus alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLHeadLampStatus*)obj;
+    return [parameters sdl_objectForName:SDLNameHeadLampStatus ofClass:SDLHeadLampStatus.class];
 }
 
 - (void)setEngineTorque:(nullable NSNumber<SDLFloat> *)engineTorque {
-    if (engineTorque != nil) {
-        [parameters setObject:engineTorque forKey:SDLNameEngineTorque];
-    } else {
-        [parameters removeObjectForKey:SDLNameEngineTorque];
-    }
+    [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque];
 }
 
 - (nullable NSNumber<SDLFloat> *)engineTorque {
-    return [parameters objectForKey:SDLNameEngineTorque];
+    return [parameters sdl_objectForName:SDLNameEngineTorque];
 }
 
 - (void)setAccPedalPosition:(nullable NSNumber<SDLFloat> *)accPedalPosition {
-    if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
-    } else {
-        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
-    }
+    [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
 }
 
 - (nullable NSNumber<SDLFloat> *)accPedalPosition {
-    return [parameters objectForKey:SDLNameAccelerationPedalPosition];
+    return [parameters sdl_objectForName:SDLNameAccelerationPedalPosition];
 }
 
 - (void)setSteeringWheelAngle:(nullable NSNumber<SDLFloat> *)steeringWheelAngle {
-    if (steeringWheelAngle != nil) {
-        [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle];
-    } else {
-        [parameters removeObjectForKey:SDLNameSteeringWheelAngle];
-    }
+    [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
 }
 
 - (nullable NSNumber<SDLFloat> *)steeringWheelAngle {
-    return [parameters objectForKey:SDLNameSteeringWheelAngle];
+    return [parameters sdl_objectForName:SDLNameSteeringWheelAngle];
 }
 
 - (void)setECallInfo:(nullable SDLECallInfo *)eCallInfo {
-    if (eCallInfo != nil) {
-        [parameters setObject:eCallInfo forKey:SDLNameECallInfo];
-    } else {
-        [parameters removeObjectForKey:SDLNameECallInfo];
-    }
+    [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo];
 }
 
 - (nullable SDLECallInfo *)eCallInfo {
-    NSObject *obj = [parameters objectForKey:SDLNameECallInfo];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLECallInfo alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLECallInfo*)obj;
+    return [parameters sdl_objectForName:SDLNameECallInfo ofClass:SDLECallInfo.class];
 }
 
 - (void)setAirbagStatus:(nullable SDLAirbagStatus *)airbagStatus {
-    if (airbagStatus != nil) {
-        [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameAirbagStatus];
-    }
+    [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus];
 }
 
 - (nullable SDLAirbagStatus *)airbagStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameAirbagStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLAirbagStatus alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLAirbagStatus*)obj;
+    return [parameters sdl_objectForName:SDLNameAirbagStatus ofClass:SDLAirbagStatus.class];
 }
 
 - (void)setEmergencyEvent:(nullable SDLEmergencyEvent *)emergencyEvent {
-    if (emergencyEvent != nil) {
-        [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent];
-    } else {
-        [parameters removeObjectForKey:SDLNameEmergencyEvent];
-    }
+    [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent];
 }
 
 - (nullable SDLEmergencyEvent *)emergencyEvent {
-    NSObject *obj = [parameters objectForKey:SDLNameEmergencyEvent];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLEmergencyEvent alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLEmergencyEvent*)obj;
+    return [parameters sdl_objectForName:SDLNameEmergencyEvent ofClass:SDLEmergencyEvent.class];
 }
 
 - (void)setClusterModeStatus:(nullable SDLClusterModeStatus *)clusterModeStatus {
-    if (clusterModeStatus != nil) {
-        [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameClusterModeStatus];
-    }
+    [parameters sdl_setObject:clusterModeStatus forName:SDLNameClusterModeStatus];
 }
 
 - (nullable SDLClusterModeStatus *)clusterModeStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameClusterModeStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLClusterModeStatus alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLClusterModeStatus*)obj;
+    return [parameters sdl_objectForName:SDLNameClusterModeStatus ofClass:SDLClusterModeStatus.class];
 }
 
 - (void)setMyKey:(nullable SDLMyKey *)myKey {
-    if (myKey != nil) {
-        [parameters setObject:myKey forKey:SDLNameMyKey];
-    } else {
-        [parameters removeObjectForKey:SDLNameMyKey];
-    }
+    [parameters sdl_setObject:myKey forName:SDLNameMyKey];
 }
 
 - (nullable SDLMyKey *)myKey {
-    NSObject *obj = [parameters objectForKey:SDLNameMyKey];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLMyKey alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLMyKey*)obj;
+    return [parameters sdl_objectForName:SDLNameMyKey ofClass:SDLMyKey.class];
 }
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLGetWaypoints.m b/SmartDeviceLink/SDLGetWaypoints.m
index 79b485f51..5f974ff42 100644
--- a/SmartDeviceLink/SDLGetWaypoints.m
+++ b/SmartDeviceLink/SDLGetWaypoints.m
@@ -3,6 +3,7 @@
 
 #import "SDLGetWaypoints.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -28,15 +29,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setWaypointType:(nullable SDLWaypointType)waypointType {
-    if (waypointType != nil) {
-        parameters[SDLNameWaypointType] = waypointType;
-    } else {
-        [parameters removeObjectForKey:SDLNameWaypointType];
-    }
+    [parameters sdl_setObject:waypointType forName:SDLNameWaypointType];
 }
 
 - (nullable SDLWaypointType)waypointType {
-    return parameters[SDLNameWaypointType];
+    return [parameters sdl_objectForName:SDLNameWaypointType];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLGetWaypointsResponse.m b/SmartDeviceLink/SDLGetWaypointsResponse.m
index 7affe27b1..c2269f2d9 100644
--- a/SmartDeviceLink/SDLGetWaypointsResponse.m
+++ b/SmartDeviceLink/SDLGetWaypointsResponse.m
@@ -3,6 +3,7 @@
 
 #import "SDLGetWaypointsResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLLocationDetails.h"
 #import "SDLNames.h"
 
@@ -17,24 +18,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setWaypoints:(nullable NSArray<SDLLocationDetails *> *)waypoints {
-    if (waypoints != nil) {
-        parameters[SDLNameWaypoints] = waypoints;
-    } else {
-        [parameters removeObjectForKey:SDLNameWaypoints];
-    }
+    [parameters sdl_setObject:waypoints forName:SDLNameWaypoints];
 }
 
 - (nullable NSArray<SDLLocationDetails *> *)waypoints {
-    NSMutableArray *array = [parameters objectForKey:SDLNameWaypoints];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLLocationDetails.class]) {
-        return [array copy];
-    } else {
-        NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary *dict in array) {
-            [newList addObject:[[SDLLocationDetails alloc] initWithDictionary:(NSMutableDictionary *)dict]];
-        }
-        return [newList copy];
-    }
+    return [parameters sdl_objectsForName:SDLNameWaypoints ofClass:SDLLocationDetails.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLHMICapabilities.m b/SmartDeviceLink/SDLHMICapabilities.m
index 52fe4d8cb..0d2b39dfa 100644
--- a/SmartDeviceLink/SDLHMICapabilities.m
+++ b/SmartDeviceLink/SDLHMICapabilities.m
@@ -4,6 +4,7 @@
 
 #import "SDLHMICapabilities.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -11,27 +12,19 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLHMICapabilities
 
 - (void)setNavigation:(nullable NSNumber<SDLBool> *)navigation {
-    if (navigation != nil) {
-        store[SDLNameNavigation] = navigation;
-    } else {
-        [store removeObjectForKey:SDLNameNavigation];
-    }
+    [store sdl_setObject:navigation forName:SDLNameNavigation];
 }
 
 - (nullable NSNumber<SDLBool> *)navigation {
-    return store[SDLNameNavigation];
+    return [store sdl_objectForName:SDLNameNavigation];
 }
 
 - (void)setPhoneCall:(nullable NSNumber<SDLBool> *)phoneCall {
-    if (phoneCall != nil) {
-        store[SDLNamePhoneCall] = phoneCall;
-    } else {
-        [store removeObjectForKey:SDLNamePhoneCall];
-    }
+    [store sdl_setObject:phoneCall forName:SDLNamePhoneCall];
 }
 
 - (nullable NSNumber<SDLBool> *)phoneCall {
-    return store[SDLNamePhoneCall];
+    return [store sdl_objectForName:SDLNamePhoneCall];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLHMIPermissions.m b/SmartDeviceLink/SDLHMIPermissions.m
index cd301151e..620c9ca6f 100644
--- a/SmartDeviceLink/SDLHMIPermissions.m
+++ b/SmartDeviceLink/SDLHMIPermissions.m
@@ -4,6 +4,7 @@
 
 #import "SDLHMIPermissions.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -11,46 +12,19 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLHMIPermissions
 
 - (void)setAllowed:(NSMutableArray<SDLHMILevel> *)allowed {
-    if (allowed != nil) {
-        [store setObject:allowed forKey:SDLNameAllowed];
-    } else {
-        [store removeObjectForKey:SDLNameAllowed];
-    }
+    [store sdl_setObject:allowed forName:SDLNameAllowed];
 }
 
 - (NSMutableArray<SDLHMILevel> *)allowed {
-    NSMutableArray<SDLHMILevel> *array = [store objectForKey:SDLNameAllowed];
-    if ([array count] < 1) {
-        return array;
-    } else {
-        NSMutableArray<SDLHMILevel> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSString *enumString in array) {
-            [newList addObject:(SDLHMILevel)enumString];
-        }
-        return newList;
-    }
+    return [store sdl_enumsForName:SDLNameAllowed];
 }
 
 - (void)setUserDisallowed:(NSMutableArray<SDLHMILevel> *)userDisallowed {
-    if (userDisallowed != nil) {
-        [store setObject:userDisallowed forKey:SDLNameUserDisallowed];
-    } else {
-        [store removeObjectForKey:SDLNameUserDisallowed];
-    }
+    [store sdl_setObject:userDisallowed forName:SDLNameUserDisallowed];
 }
 
 - (NSMutableArray<SDLHMILevel> *)userDisallowed {
-    NSMutableArray<SDLHMILevel> *array = [store objectForKey:SDLNameUserDisallowed];
-    if ([array count] < 1) {
-        return array;
-    } else {
-        NSMutableArray<SDLHMILevel> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSString *enumString in array) {
-            [newList addObject:(SDLHMILevel)enumString];
-        }
-        return newList;
-    }
-
+    return [store sdl_enumsForName:SDLNameUserDisallowed];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLHeadLampStatus.m b/SmartDeviceLink/SDLHeadLampStatus.m
index fb79c8175..e26d3ab5d 100644
--- a/SmartDeviceLink/SDLHeadLampStatus.m
+++ b/SmartDeviceLink/SDLHeadLampStatus.m
@@ -3,6 +3,7 @@
 
 #import "SDLHeadLampStatus.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLAmbientLightStatus.h"
 #import "SDLNames.h"
 
@@ -11,40 +12,27 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLHeadLampStatus
 
 - (void)setLowBeamsOn:(NSNumber<SDLBool> *)lowBeamsOn {
-    if (lowBeamsOn != nil) {
-        [store setObject:lowBeamsOn forKey:SDLNameLowBeamsOn];
-    } else {
-        [store removeObjectForKey:SDLNameLowBeamsOn];
-    }
+    [store sdl_setObject:lowBeamsOn forName:SDLNameLowBeamsOn];
 }
 
 - (NSNumber<SDLBool> *)lowBeamsOn {
-    return [store objectForKey:SDLNameLowBeamsOn];
+    return [store sdl_objectForName:SDLNameLowBeamsOn];
 }
 
 - (void)setHighBeamsOn:(NSNumber<SDLBool> *)highBeamsOn {
-    if (highBeamsOn != nil) {
-        [store setObject:highBeamsOn forKey:SDLNameHighBeamsOn];
-    } else {
-        [store removeObjectForKey:SDLNameHighBeamsOn];
-    }
+    [store sdl_setObject:highBeamsOn forName:SDLNameHighBeamsOn];
 }
 
 - (NSNumber<SDLBool> *)highBeamsOn {
-    return [store objectForKey:SDLNameHighBeamsOn];
+    return [store sdl_objectForName:SDLNameHighBeamsOn];
 }
 
 - (void)setAmbientLightSensorStatus:(nullable SDLAmbientLightStatus)ambientLightSensorStatus {
-    if (ambientLightSensorStatus != nil) {
-        [store setObject:ambientLightSensorStatus forKey:SDLNameAmbientLightSensorStatus];
-    } else {
-        [store removeObjectForKey:SDLNameAmbientLightSensorStatus];
-    }
+    [store sdl_setObject:ambientLightSensorStatus forName:SDLNameAmbientLightSensorStatus];
 }
 
 - (nullable SDLAmbientLightStatus)ambientLightSensorStatus {
-    NSObject *obj = [store objectForKey:SDLNameAmbientLightSensorStatus];
-    return (SDLAmbientLightStatus)obj;
+    return [store sdl_objectForName:SDLNameAmbientLightSensorStatus];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLImage.m b/SmartDeviceLink/SDLImage.m
index f80f9cd94..ebd7e09d4 100644
--- a/SmartDeviceLink/SDLImage.m
+++ b/SmartDeviceLink/SDLImage.m
@@ -3,6 +3,7 @@
 
 #import "SDLImage.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -22,28 +23,19 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setValue:(NSString *)value {
-    if (value != nil) {
-        [store setObject:value forKey:SDLNameValue];
-    } else {
-        [store removeObjectForKey:SDLNameValue];
-    }
+    [store sdl_setObject:value forName:SDLNameValue];
 }
 
 - (NSString *)value {
-    return [store objectForKey:SDLNameValue];
+    return [store sdl_objectForName:SDLNameValue];
 }
 
 - (void)setImageType:(SDLImageType)imageType {
-    if (imageType != nil) {
-        [store setObject:imageType forKey:SDLNameImageType];
-    } else {
-        [store removeObjectForKey:SDLNameImageType];
-    }
+    [store sdl_setObject:imageType forName:SDLNameImageType];
 }
 
 - (SDLImageType)imageType {
-    NSObject *obj = [store objectForKey:SDLNameImageType];
-    return (SDLImageType)obj;
+    return [store sdl_objectForName:SDLNameImageType];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLImageField.m b/SmartDeviceLink/SDLImageField.m
index d7f2974fe..dfa223b3c 100644
--- a/SmartDeviceLink/SDLImageField.m
+++ b/SmartDeviceLink/SDLImageField.m
@@ -3,6 +3,7 @@
 
 #import "SDLImageField.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLImageFieldName.h"
 #import "SDLImageResolution.h"
 #import "SDLNames.h"
@@ -12,54 +13,27 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLImageField
 
 - (void)setName:(SDLImageFieldName)name {
-    if (name != nil) {
-        [store setObject:name forKey:SDLNameName];
-    } else {
-        [store removeObjectForKey:SDLNameName];
-    }
+    [store sdl_setObject:name forName:SDLNameName];
 }
 
 - (SDLImageFieldName)name {
-    NSObject *obj = [store objectForKey:SDLNameName];
-    return (SDLImageFieldName)obj;
+    return [store sdl_objectForName:SDLNameName];
 }
 
 - (void)setImageTypeSupported:(NSMutableArray<SDLFileType> *)imageTypeSupported {
-    if (imageTypeSupported != nil) {
-        [store setObject:imageTypeSupported forKey:SDLNameImageTypeSupported];
-    } else {
-        [store removeObjectForKey:SDLNameImageTypeSupported];
-    }
+    [store sdl_setObject:imageTypeSupported forName:SDLNameImageTypeSupported];
 }
 
 - (NSMutableArray<SDLFileType> *)imageTypeSupported {
-    NSMutableArray<SDLFileType> *array = [store objectForKey:SDLNameImageTypeSupported];
-    if ([array count] < 1) {
-        return array;
-    } else {
-        NSMutableArray<SDLFileType> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSString *enumString in array) {
-            [newList addObject:(SDLFileType)enumString];
-        }
-        return newList;
-    }
+    return [store sdl_enumsForName:SDLNameImageTypeSupported];
 }
 
 - (void)setImageResolution:(nullable SDLImageResolution *)imageResolution {
-    if (imageResolution != nil) {
-        [store setObject:imageResolution forKey:SDLNameImageResolution];
-    } else {
-        [store removeObjectForKey:SDLNameImageResolution];
-    }
+    [store sdl_setObject:imageResolution forName:SDLNameImageResolution];
 }
 
 - (nullable SDLImageResolution *)imageResolution {
-    NSObject *obj = [store objectForKey:SDLNameImageResolution];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLImageResolution alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLImageResolution*)obj;
+    return [store sdl_objectForName:SDLNameImageResolution ofClass:SDLImageResolution.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLImageResolution.m b/SmartDeviceLink/SDLImageResolution.m
index ad62502ee..18b69fe6e 100644
--- a/SmartDeviceLink/SDLImageResolution.m
+++ b/SmartDeviceLink/SDLImageResolution.m
@@ -4,6 +4,7 @@
 
 #import "SDLImageResolution.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -11,27 +12,19 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLImageResolution
 
 - (void)setResolutionWidth:(NSNumber<SDLInt> *)resolutionWidth {
-    if (resolutionWidth != nil) {
-        [store setObject:resolutionWidth forKey:SDLNameResolutionWidth];
-    } else {
-        [store removeObjectForKey:SDLNameResolutionWidth];
-    }
+    [store sdl_setObject:resolutionWidth forName:SDLNameResolutionWidth];
 }
 
 - (NSNumber<SDLInt> *)resolutionWidth {
-    return [store objectForKey:SDLNameResolutionWidth];
+    return [store sdl_objectForName:SDLNameResolutionWidth];
 }
 
 - (void)setResolutionHeight:(NSNumber<SDLInt> *)resolutionHeight {
-    if (resolutionHeight != nil) {
-        [store setObject:resolutionHeight forKey:SDLNameResolutionHeight];
-    } else {
-        [store removeObjectForKey:SDLNameResolutionHeight];
-    }
+    [store sdl_setObject:resolutionHeight forName:SDLNameResolutionHeight];
 }
 
 - (NSNumber<SDLInt> *)resolutionHeight {
-    return [store objectForKey:SDLNameResolutionHeight];
+    return [store sdl_objectForName:SDLNameResolutionHeight];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLKeyboardProperties.m b/SmartDeviceLink/SDLKeyboardProperties.m
index 20f6c2e8b..90899cf17 100644
--- a/SmartDeviceLink/SDLKeyboardProperties.m
+++ b/SmartDeviceLink/SDLKeyboardProperties.m
@@ -3,6 +3,7 @@
 
 #import "SDLKeyboardProperties.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -25,66 +26,43 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setLanguage:(nullable SDLLanguage)language {
-    if (language != nil) {
-        [store setObject:language forKey:SDLNameLanguage];
-    } else {
-        [store removeObjectForKey:SDLNameLanguage];
-    }
+    [store sdl_setObject:language forName:SDLNameLanguage];
 }
 
 - (nullable SDLLanguage)language {
-    NSObject *obj = [store objectForKey:SDLNameLanguage];
-    return (SDLLanguage )obj;
+    return [store sdl_objectForName:SDLNameLanguage];
 }
 
 - (void)setKeyboardLayout:(nullable SDLKeyboardLayout)keyboardLayout {
-    if (keyboardLayout != nil) {
-        [store setObject:keyboardLayout forKey:SDLNameKeyboardLayout];
-    } else {
-        [store removeObjectForKey:SDLNameKeyboardLayout];
-    }
+    [store sdl_setObject:keyboardLayout forName:SDLNameKeyboardLayout];
 }
 
 - (nullable SDLKeyboardLayout)keyboardLayout {
-    NSObject *obj = [store objectForKey:SDLNameKeyboardLayout];
-    return (SDLKeyboardLayout)obj;
+    return [store sdl_objectForName:SDLNameKeyboardLayout];
 }
 
 - (void)setKeypressMode:(nullable SDLKeypressMode)keypressMode {
-    if (keypressMode != nil) {
-        [store setObject:keypressMode forKey:SDLNameKeypressMode];
-    } else {
-        [store removeObjectForKey:SDLNameKeypressMode];
-    }
+    [store sdl_setObject:keypressMode forName:SDLNameKeypressMode];
 }
 
 - (nullable SDLKeypressMode)keypressMode {
-    NSObject *obj = [store objectForKey:SDLNameKeypressMode];
-    return (SDLKeypressMode)obj;
+    return [store sdl_objectForName:SDLNameKeypressMode];
 }
 
 - (void)setLimitedCharacterList:(nullable NSMutableArray<NSString *> *)limitedCharacterList {
-    if (limitedCharacterList != nil) {
-        [store setObject:limitedCharacterList forKey:SDLNameLimitedCharacterList];
-    } else {
-        [store removeObjectForKey:SDLNameLimitedCharacterList];
-    }
+    [store sdl_setObject:limitedCharacterList forName:SDLNameLimitedCharacterList];
 }
 
 - (nullable NSMutableArray<NSString *> *)limitedCharacterList {
-    return [store objectForKey:SDLNameLimitedCharacterList];
+    return [store sdl_objectForName:SDLNameLimitedCharacterList];
 }
 
 - (void)setAutoCompleteText:(nullable NSString *)autoCompleteText {
-    if (autoCompleteText != nil) {
-        [store setObject:autoCompleteText forKey:SDLNameAutoCompleteText];
-    } else {
-        [store removeObjectForKey:SDLNameAutoCompleteText];
-    }
+    [store sdl_setObject:autoCompleteText forName:SDLNameAutoCompleteText];
 }
 
 - (nullable NSString *)autoCompleteText {
-    return [store objectForKey:SDLNameAutoCompleteText];
+    return [store sdl_objectForName:SDLNameAutoCompleteText];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLListFiles.m b/SmartDeviceLink/SDLListFiles.m
index 3b8c1d57c..9efc8f6cb 100644
--- a/SmartDeviceLink/SDLListFiles.m
+++ b/SmartDeviceLink/SDLListFiles.m
@@ -4,6 +4,7 @@
 
 #import "SDLListFiles.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLListFilesResponse.m b/SmartDeviceLink/SDLListFilesResponse.m
index 6a86eab1b..e803a83b5 100644
--- a/SmartDeviceLink/SDLListFilesResponse.m
+++ b/SmartDeviceLink/SDLListFilesResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLListFilesResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -17,11 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setFilenames:(nullable NSMutableArray<NSString *> *)filenames {
-    if (filenames != nil) {
-        [parameters setObject:filenames forKey:SDLNameFilenames];
-    } else {
-        [parameters removeObjectForKey:SDLNameFilenames];
-    }
+    [parameters sdl_setObject:filenames forName:SDLNameFilenames];
 }
 
 - (nullable NSMutableArray<NSString *> *)filenames {
@@ -29,11 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setSpaceAvailable:(NSNumber<SDLInt> *)spaceAvailable {
-    if (spaceAvailable != nil) {
-        [parameters setObject:spaceAvailable forKey:SDLNameSpaceAvailable];
-    } else {
-        [parameters removeObjectForKey:SDLNameSpaceAvailable];
-    }
+    [parameters sdl_setObject:spaceAvailable forName:SDLNameSpaceAvailable];
 }
 
 - (NSNumber<SDLInt> *)spaceAvailable {
diff --git a/SmartDeviceLink/SDLLocationCoordinate.m b/SmartDeviceLink/SDLLocationCoordinate.m
index d7aec2d41..79b3d4d56 100644
--- a/SmartDeviceLink/SDLLocationCoordinate.m
+++ b/SmartDeviceLink/SDLLocationCoordinate.m
@@ -2,6 +2,8 @@
 //
 
 #import "SDLLocationCoordinate.h"
+
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -9,27 +11,19 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLLocationCoordinate
 
 - (void)setLongitudeDegrees:(NSNumber<SDLFloat> *)longitudeDegrees {
-    if (longitudeDegrees != nil) {
-        store[SDLNameLongitudeDegrees] = longitudeDegrees;
-    } else {
-        [store removeObjectForKey:SDLNameLongitudeDegrees];
-    }
+    [store sdl_setObject:longitudeDegrees forName:SDLNameLongitudeDegrees];
 }
 
 - (NSNumber<SDLFloat> *)longitudeDegrees {
-    return store[SDLNameLongitudeDegrees];
+    return [store sdl_objectForName:SDLNameLongitudeDegrees];
 }
 
 - (void)setLatitudeDegrees:(NSNumber<SDLFloat> *)latitudeDegrees {
-    if (latitudeDegrees != nil) {
-        store[SDLNameLatitudeDegrees] = latitudeDegrees;
-    } else {
-        [store removeObjectForKey:SDLNameLatitudeDegrees];
-    }
+    [store sdl_setObject:latitudeDegrees forName:SDLNameLatitudeDegrees];
 }
 
 - (NSNumber<SDLFloat> *)latitudeDegrees {
-    return store[SDLNameLatitudeDegrees];
+    return [store sdl_objectForName:SDLNameLatitudeDegrees];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLLocationDetails.m b/SmartDeviceLink/SDLLocationDetails.m
index e10f97ff8..ccf73cda4 100644
--- a/SmartDeviceLink/SDLLocationDetails.m
+++ b/SmartDeviceLink/SDLLocationDetails.m
@@ -3,6 +3,7 @@
 
 #import "SDLLocationDetails.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLImage.h"
 #import "SDLLocationCoordinate.h"
 #import "SDLNames.h"
@@ -13,104 +14,61 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLLocationDetails
 
 - (void)setCoordinate:(nullable SDLLocationCoordinate *)coordinate {
-    if (coordinate != nil) {
-        store[SDLNameLocationCoordinate] = coordinate;
-    } else {
-        [store removeObjectForKey:SDLNameLocationCoordinate];
-    }
+    [store sdl_setObject:coordinate forName:SDLNameLocationCoordinate];
 }
 
 - (nullable SDLLocationCoordinate *)coordinate {
-    NSObject *obj = [store objectForKey: SDLNameLocationCoordinate];
-    if (obj == nil || [obj isKindOfClass:SDLLocationCoordinate.class]) {
-        return (SDLLocationCoordinate *)obj;
-    } else {
-        return [[SDLLocationCoordinate alloc] initWithDictionary:(NSMutableDictionary *)obj];
-    }
+    return [store sdl_objectForName:SDLNameLocationCoordinate ofClass:SDLLocationCoordinate.class];
 }
 
 - (void)setLocationName:(nullable NSString *)locationName {
-    if (locationName != nil) {
-        store[SDLNameLocationName] = locationName;
-    } else {
-        [store removeObjectForKey:SDLNameLocationName];
-    }
+    [store sdl_setObject:locationName forName:SDLNameLocationName];
 }
 
 - (nullable NSString *)locationName {
-    return store[SDLNameLocationName];
+    return [store sdl_objectForName:SDLNameLocationName];
 }
 
 - (void)setAddressLines:(nullable NSArray<NSString *> *)addressLines {
-    if (addressLines != nil) {
-        store[SDLNameAddressLines] = addressLines;
-    } else {
-        [store removeObjectForKey:SDLNameAddressLines];
-    }
+    [store sdl_setObject:addressLines forName:SDLNameAddressLines];
 }
 
 - (nullable NSArray<NSString *> *)addressLines {
-    return store[SDLNameAddressLines];
+    return [store sdl_objectForName:SDLNameAddressLines];
 }
 
 - (void)setLocationDescription:(nullable NSString *)locationDescription {
-    if (locationDescription != nil) {
-        store[SDLNameLocationDescription] = locationDescription;
-    } else {
-        [store removeObjectForKey:SDLNameLocationDescription];
-    }
+    [store sdl_setObject:locationDescription forName:SDLNameLocationDescription];
 }
 
 - (nullable NSString *)locationDescription {
-    return store[SDLNameLocationDescription];
+    return [store sdl_objectForName:SDLNameLocationDescription];
 }
 
 - (void)setPhoneNumber:(nullable NSString *)phoneNumber {
-    if (phoneNumber != nil) {
-        store[SDLNamePhoneNumber] = phoneNumber;
-    } else {
-        [store removeObjectForKey:SDLNamePhoneNumber];
-    }
+    [store sdl_setObject:phoneNumber forName:SDLNamePhoneNumber];
 }
 
 - (nullable NSString *)phoneNumber {
-    return store[SDLNamePhoneNumber];
+    return [store sdl_objectForName:SDLNamePhoneNumber];
 }
 
 - (void)setLocationImage:(nullable SDLImage *)locationImage {
-    if (locationImage != nil) {
-        store[SDLNameLocationImage] = locationImage;
-    } else {
-        [store removeObjectForKey:SDLNameLocationImage];
-    }
+    [store sdl_setObject:locationImage forName:SDLNameLocationImage];
 }
 
 - (nullable SDLImage *)locationImage {
-    NSObject *obj = [store objectForKey: SDLNameLocationImage];
-    if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
-        return (SDLImage *)obj;
-    } else {
-        return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj];
-    }
+    return [store sdl_objectForName:SDLNameLocationImage ofClass:SDLImage.class];
 }
 
 - (void)setSearchAddress:(nullable SDLOasisAddress *)searchAddress {
-    if (searchAddress != nil) {
-        store[SDLNameSearchAddress] = searchAddress;
-    } else {
-        [store removeObjectForKey:SDLNameSearchAddress];
-    }
+    [store sdl_setObject:searchAddress forName:SDLNameSearchAddress];
 }
 
 - (nullable SDLOasisAddress *)searchAddress {
-    NSObject *obj = [store objectForKey:SDLNameSearchAddress];
-    if (obj == nil || [obj isKindOfClass:SDLOasisAddress.class]) {
-        return (SDLOasisAddress *)obj;
-    } else {
-        return [[SDLOasisAddress alloc] initWithDictionary:(NSMutableDictionary *)obj];
-    }
+    return [store sdl_objectForName:SDLNameSearchAddress ofClass:SDLOasisAddress.class];
 }
 
 @end
 
-NS_ASSUME_NONNULL_END
-\ No newline at end of file
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLMenuParams.m b/SmartDeviceLink/SDLMenuParams.m
index d20c2ca44..89531b02f 100644
--- a/SmartDeviceLink/SDLMenuParams.m
+++ b/SmartDeviceLink/SDLMenuParams.m
@@ -4,6 +4,7 @@
 
 #import "SDLMenuParams.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -34,39 +35,27 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setParentID:(nullable NSNumber<SDLInt> *)parentID {
-    if (parentID != nil) {
-        [store setObject:parentID forKey:SDLNameParentId];
-    } else {
-        [store removeObjectForKey:SDLNameParentId];
-    }
+    [store sdl_setObject:parentID forName:SDLNameParentId];
 }
 
 - (nullable NSNumber<SDLInt> *)parentID {
-    return [store objectForKey:SDLNameParentId];
+    return [store sdl_objectForName:SDLNameParentId];
 }
 
 - (void)setPosition:(nullable NSNumber<SDLInt> *)position {
-    if (position != nil) {
-        [store setObject:position forKey:SDLNamePosition];
-    } else {
-        [store removeObjectForKey:SDLNamePosition];
-    }
+    [store sdl_setObject:position forName:SDLNamePosition];
 }
 
 - (nullable NSNumber<SDLInt> *)position {
-    return [store objectForKey:SDLNamePosition];
+    return [store sdl_objectForName:SDLNamePosition];
 }
 
 - (void)setMenuName:(NSString *)menuName {
-    if (menuName != nil) {
-        [store setObject:menuName forKey:SDLNameMenuName];
-    } else {
-        [store removeObjectForKey:SDLNameMenuName];
-    }
+    [store sdl_setObject:menuName forName:SDLNameMenuName];
 }
 
 - (NSString *)menuName {
-    return [store objectForKey:SDLNameMenuName];
+    return [store sdl_objectForName:SDLNameMenuName];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLMyKey.m b/SmartDeviceLink/SDLMyKey.m
index 158ddc4c4..fc7f730f7 100644
--- a/SmartDeviceLink/SDLMyKey.m
+++ b/SmartDeviceLink/SDLMyKey.m
@@ -3,6 +3,7 @@
 
 #import "SDLMyKey.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "SDLVehicleDataStatus.h"
 
@@ -11,16 +12,11 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLMyKey
 
 - (void)setE911Override:(SDLVehicleDataStatus)e911Override {
-    if (e911Override != nil) {
-        [store setObject:e911Override forKey:SDLNameE911Override];
-    } else {
-        [store removeObjectForKey:SDLNameE911Override];
-    }
+    [store sdl_setObject:e911Override forName:SDLNameE911Override];
 }
 
 - (SDLVehicleDataStatus)e911Override {
-    NSObject *obj = [store objectForKey:SDLNameE911Override];
-    return (SDLVehicleDataStatus)obj;
+    return [store sdl_objectForName:SDLNameE911Override];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLNames.m b/SmartDeviceLink/SDLNames.m
index a4957bf2f..c33df5b44 100644
--- a/SmartDeviceLink/SDLNames.m
+++ b/SmartDeviceLink/SDLNames.m
@@ -1,6 +1,7 @@
 //  SDLNames.h
 //
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLOasisAddress.m b/SmartDeviceLink/SDLOasisAddress.m
index 079863394..97bfbe8cf 100644
--- a/SmartDeviceLink/SDLOasisAddress.m
+++ b/SmartDeviceLink/SDLOasisAddress.m
@@ -2,6 +2,8 @@
 //
 
 #import "SDLOasisAddress.h"
+
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -31,113 +33,76 @@ NS_ASSUME_NONNULL_BEGIN
     return self;
 }
 
-
 - (void)setCountryName:(nullable NSString *)countryName {
-    if (countryName != nil) {
-        store[SDLNameCountryName] = countryName;
-    } else {
-        [store removeObjectForKey:SDLNameCountryName];
-    }
+    [store sdl_setObject:countryName forName:SDLNameCountryName];
 }
 
 - (nullable NSString *)countryName {
-    return store[SDLNameCountryName];
+    return [store sdl_objectForName:SDLNameCountryName];
 }
 
 - (void)setCountryCode:(nullable NSString *)countryCode {
-    if (countryCode != nil) {
-        store[SDLNameCountryCode] = countryCode;
-    } else {
-        [store removeObjectForKey:SDLNameCountryCode];
-    }
+    [store sdl_setObject:countryCode forName:SDLNameCountryCode];
 }
 
 - (nullable NSString *)countryCode {
-    return store[SDLNameCountryCode];
+    return [store sdl_objectForName:SDLNameCountryCode];
 }
 
 - (void)setPostalCode:(nullable NSString *)postalCode {
-    if (postalCode != nil) {
-        store[SDLNamePostalCode] = postalCode;
-    } else {
-        [store removeObjectForKey:SDLNamePostalCode];
-    }
+    [store sdl_setObject:postalCode forName:SDLNamePostalCode];
 }
 
 - (nullable NSString *)postalCode {
-    return store[SDLNamePostalCode];
+    return [store sdl_objectForName:SDLNamePostalCode];
 }
 
 - (void)setAdministrativeArea:(nullable NSString *)administrativeArea {
-    if (administrativeArea != nil) {
-        store[SDLNameAdministrativeArea] = administrativeArea;
-    } else {
-        [store removeObjectForKey:SDLNameAdministrativeArea];
-    }
+    [store sdl_setObject:administrativeArea forName:SDLNameAdministrativeArea];
 }
 
 - (nullable NSString *)administrativeArea {
-    return store[SDLNameAdministrativeArea];
+    return [store sdl_objectForName:SDLNameAdministrativeArea];
 }
 
 - (void)setSubAdministrativeArea:(nullable NSString *)subAdministrativeArea {
-    if (subAdministrativeArea != nil) {
-        store[SDLNameSubAdministrativeArea] = subAdministrativeArea;
-    } else {
-        [store removeObjectForKey:SDLNameSubAdministrativeArea];
-    }
+    [store sdl_setObject:subAdministrativeArea forName:SDLNameSubAdministrativeArea];
 }
 
 - (nullable NSString *)subAdministrativeArea {
-    return store[SDLNameSubAdministrativeArea];
+    return [store sdl_objectForName:SDLNameSubAdministrativeArea];
 }
 
 - (void)setLocality:(nullable NSString *)locality {
-    if (locality != nil) {
-        store[SDLNameLocality] = locality;
-    } else {
-        [store removeObjectForKey:SDLNameLocality];
-    }
+    [store sdl_setObject:locality forName:SDLNameLocality];
 }
 
 - (nullable NSString *)locality {
-    return store[SDLNameLocality];
+    return [store sdl_objectForName:SDLNameLocality];
 }
 
 - (void)setSubLocality:(nullable NSString *)subLocality {
-    if (subLocality != nil) {
-        store[SDLNameSubLocality] = subLocality;
-    } else {
-        [store removeObjectForKey:SDLNameSubLocality];
-    }
+    [store sdl_setObject:subLocality forName:SDLNameSubLocality];
 }
 
 - (nullable NSString *)subLocality {
-    return store[SDLNameSubLocality];
+    return [store sdl_objectForName:SDLNameSubLocality];
 }
 
 - (void)setThoroughfare:(nullable NSString *)thoroughfare {
-    if (thoroughfare != nil) {
-        store[SDLNameThoroughfare] = thoroughfare;
-    } else {
-        [store removeObjectForKey:SDLNameThoroughfare];
-    }
+    [store sdl_setObject:thoroughfare forName:SDLNameThoroughfare];
 }
 
 - (nullable NSString *)thoroughfare {
-    return store[SDLNameThoroughfare];
+    return [store sdl_objectForName:SDLNameThoroughfare];
 }
 
 - (void)setSubThoroughfare:(nullable NSString *)subThoroughfare {
-    if (subThoroughfare != nil) {
-        store[SDLNameSubThoroughfare] = subThoroughfare;
-    } else {
-        [store removeObjectForKey:SDLNameSubThoroughfare];
-    }
+    [store sdl_setObject:subThoroughfare forName:SDLNameSubThoroughfare];
 }
 
 - (nullable NSString *)subThoroughfare {
-    return store[SDLNameSubThoroughfare];
+    return [store sdl_objectForName:SDLNameSubThoroughfare];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
index 0f7d28871..a38ac0738 100644
--- a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
+++ b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
@@ -3,6 +3,7 @@
 
 #import "SDLOnAppInterfaceUnregistered.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -16,16 +17,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setReason:(SDLAppInterfaceUnregisteredReason)reason {
-    if (reason != nil) {
-        [parameters setObject:reason forKey:SDLNameReason];
-    } else {
-        [parameters removeObjectForKey:SDLNameReason];
-    }
+    [parameters sdl_setObject:reason forName:SDLNameReason];
 }
 
 - (SDLAppInterfaceUnregisteredReason)reason {
-    NSObject *obj = [parameters objectForKey:SDLNameReason];
-    return (SDLAppInterfaceUnregisteredReason)obj;
+    return [parameters sdl_objectForName:SDLNameReason];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnAudioPassThru.m b/SmartDeviceLink/SDLOnAudioPassThru.m
index 72f5711b2..2ab8fefc4 100644
--- a/SmartDeviceLink/SDLOnAudioPassThru.m
+++ b/SmartDeviceLink/SDLOnAudioPassThru.m
@@ -4,6 +4,7 @@
 
 #import "SDLOnAudioPassThru.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLOnButtonEvent.m b/SmartDeviceLink/SDLOnButtonEvent.m
index f088857e4..4d65422a8 100644
--- a/SmartDeviceLink/SDLOnButtonEvent.m
+++ b/SmartDeviceLink/SDLOnButtonEvent.m
@@ -3,6 +3,7 @@
 
 #import "SDLOnButtonEvent.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -16,41 +17,29 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setButtonName:(SDLButtonName)buttonName {
-    if (buttonName != nil) {
-        [parameters setObject:buttonName forKey:SDLNameButtonName];
-    } else {
-        [parameters removeObjectForKey:SDLNameButtonName];
-    }
+    [parameters sdl_setObject:buttonName forName:SDLNameButtonName];
 }
 
 - (SDLButtonName)buttonName {
-    NSObject *obj = [parameters objectForKey:SDLNameButtonName];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameButtonName];
     return (SDLButtonName)obj;
 }
 
 - (void)setButtonEventMode:(SDLButtonEventMode)buttonEventMode {
-    if (buttonEventMode != nil) {
-        [parameters setObject:buttonEventMode forKey:SDLNameButtonEventMode];
-    } else {
-        [parameters removeObjectForKey:SDLNameButtonEventMode];
-    }
+    [parameters sdl_setObject:buttonEventMode forName:SDLNameButtonEventMode];
 }
 
 - (SDLButtonEventMode)buttonEventMode {
-    NSObject *obj = [parameters objectForKey:SDLNameButtonEventMode];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameButtonEventMode];
     return (SDLButtonEventMode)obj;
 }
 
 - (void)setCustomButtonID:(nullable NSNumber<SDLInt> *)customButtonID {
-    if (customButtonID != nil) {
-        [parameters setObject:customButtonID forKey:SDLNameCustomButtonId];
-    } else {
-        [parameters removeObjectForKey:SDLNameCustomButtonId];
-    }
+    [parameters sdl_setObject:customButtonID forName:SDLNameCustomButtonId];
 }
 
 - (nullable NSNumber<SDLInt> *)customButtonID {
-    return [parameters objectForKey:SDLNameCustomButtonId];
+    return [parameters sdl_objectForName:SDLNameCustomButtonId];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnButtonPress.m b/SmartDeviceLink/SDLOnButtonPress.m
index 8635ee7d3..addeccfd8 100644
--- a/SmartDeviceLink/SDLOnButtonPress.m
+++ b/SmartDeviceLink/SDLOnButtonPress.m
@@ -3,6 +3,7 @@
 
 #import "SDLOnButtonPress.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -16,41 +17,29 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setButtonName:(SDLButtonName)buttonName {
-    if (buttonName != nil) {
-        [parameters setObject:buttonName forKey:SDLNameButtonName];
-    } else {
-        [parameters removeObjectForKey:SDLNameButtonName];
-    }
+    [parameters sdl_setObject:buttonName forName:SDLNameButtonName];
 }
 
 - (SDLButtonName)buttonName {
-    NSObject *obj = [parameters objectForKey:SDLNameButtonName];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameButtonName];
     return (SDLButtonName)obj;
 }
 
 - (void)setButtonPressMode:(SDLButtonPressMode)buttonPressMode {
-    if (buttonPressMode != nil) {
-        [parameters setObject:buttonPressMode forKey:SDLNameButtonPressMode];
-    } else {
-        [parameters removeObjectForKey:SDLNameButtonPressMode];
-    }
+    [parameters sdl_setObject:buttonPressMode forName:SDLNameButtonPressMode];
 }
 
 - (SDLButtonPressMode)buttonPressMode {
-    NSObject *obj = [parameters objectForKey:SDLNameButtonPressMode];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameButtonPressMode];
     return (SDLButtonPressMode)obj;
 }
 
 - (void)setCustomButtonID:(nullable NSNumber<SDLInt> *)customButtonID {
-    if (customButtonID != nil) {
-        [parameters setObject:customButtonID forKey:SDLNameCustomButtonId];
-    } else {
-        [parameters removeObjectForKey:SDLNameCustomButtonId];
-    }
+    [parameters sdl_setObject:customButtonID forName:SDLNameCustomButtonId];
 }
 
 - (nullable NSNumber<SDLInt> *)customButtonID {
-    return [parameters objectForKey:SDLNameCustomButtonId];
+    return [parameters sdl_objectForName:SDLNameCustomButtonId];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnCommand.m b/SmartDeviceLink/SDLOnCommand.m
index 180294bfc..f1d547852 100644
--- a/SmartDeviceLink/SDLOnCommand.m
+++ b/SmartDeviceLink/SDLOnCommand.m
@@ -3,6 +3,7 @@
 
 #import "SDLOnCommand.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -16,27 +17,19 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setCmdID:(NSNumber<SDLInt> *)cmdID {
-    if (cmdID != nil) {
-        [parameters setObject:cmdID forKey:SDLNameCommandId];
-    } else {
-        [parameters removeObjectForKey:SDLNameCommandId];
-    }
+    [parameters sdl_setObject:cmdID forName:SDLNameCommandId];
 }
 
 - (NSNumber<SDLInt> *)cmdID {
-    return [parameters objectForKey:SDLNameCommandId];
+    return [parameters sdl_objectForName:SDLNameCommandId];
 }
 
 - (void)setTriggerSource:(SDLTriggerSource)triggerSource {
-    if (triggerSource != nil) {
-        [parameters setObject:triggerSource forKey:SDLNameTriggerSource];
-    } else {
-        [parameters removeObjectForKey:SDLNameTriggerSource];
-    }
+    [parameters sdl_setObject:triggerSource forName:SDLNameTriggerSource];
 }
 
 - (SDLTriggerSource)triggerSource {
-    NSObject *obj = [parameters objectForKey:SDLNameTriggerSource];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameTriggerSource];
     return (SDLTriggerSource)obj;
 }
 
diff --git a/SmartDeviceLink/SDLOnDriverDistraction.m b/SmartDeviceLink/SDLOnDriverDistraction.m
index 31f86fd96..cba06de2e 100644
--- a/SmartDeviceLink/SDLOnDriverDistraction.m
+++ b/SmartDeviceLink/SDLOnDriverDistraction.m
@@ -3,6 +3,7 @@
 
 #import "SDLOnDriverDistraction.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "SDLDriverDistractionState.h"
 
@@ -17,15 +18,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setState:(SDLDriverDistractionState)state {
-    if (state != nil) {
-        [parameters setObject:state forKey:SDLNameState];
-    } else {
-        [parameters removeObjectForKey:SDLNameState];
-    }
+    [parameters sdl_setObject:state forName:SDLNameState];
 }
 
 - (SDLDriverDistractionState)state {
-    NSObject *obj = [parameters objectForKey:SDLNameState];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameState];
     return (SDLDriverDistractionState)obj;
 }
 
diff --git a/SmartDeviceLink/SDLOnEncodedSyncPData.m b/SmartDeviceLink/SDLOnEncodedSyncPData.m
index b83f8408a..3a8eefe78 100644
--- a/SmartDeviceLink/SDLOnEncodedSyncPData.m
+++ b/SmartDeviceLink/SDLOnEncodedSyncPData.m
@@ -3,6 +3,7 @@
 
 #import "SDLOnEncodedSyncPData.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -16,39 +17,27 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setData:(NSMutableArray<NSString *> *)data {
-    if (data != nil) {
-        [parameters setObject:data forKey:SDLNameData];
-    } else {
-        [parameters removeObjectForKey:SDLNameData];
-    }
+    [parameters sdl_setObject:data forName:SDLNameData];
 }
 
 - (NSMutableArray<NSString *> *)data {
-    return [parameters objectForKey:SDLNameData];
+    return [parameters sdl_objectForName:SDLNameData];
 }
 
 - (void)setURL:(nullable NSString *)URL {
-    if (URL != nil) {
-        [parameters setObject:URL forKey:SDLNameURLUppercase];
-    } else {
-        [parameters removeObjectForKey:SDLNameURLUppercase];
-    }
+    [parameters sdl_setObject:URL forName:SDLNameURLUppercase];
 }
 
 - (nullable NSString *)URL {
-    return [parameters objectForKey:SDLNameURLUppercase];
+    return [parameters sdl_objectForName:SDLNameURLUppercase];
 }
 
 - (void)setTimeout:(nullable NSNumber<SDLInt> *)Timeout {
-    if (Timeout != nil) {
-        [parameters setObject:Timeout forKey:SDLNameTimeoutCapitalized];
-    } else {
-        [parameters removeObjectForKey:SDLNameTimeoutCapitalized];
-    }
+    [parameters sdl_setObject:Timeout forName:SDLNameTimeoutCapitalized];
 }
 
 - (nullable NSNumber<SDLInt> *)Timeout {
-    return [parameters objectForKey:SDLNameTimeoutCapitalized];
+    return [parameters sdl_objectForName:SDLNameTimeoutCapitalized];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnHMIStatus.m b/SmartDeviceLink/SDLOnHMIStatus.m
index bccd5a937..6240ec9c2 100644
--- a/SmartDeviceLink/SDLOnHMIStatus.m
+++ b/SmartDeviceLink/SDLOnHMIStatus.m
@@ -3,6 +3,7 @@
 
 #import "SDLOnHMIStatus.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLAudioStreamingState.h"
 #import "SDLHMILevel.h"
 #import "SDLNames.h"
@@ -19,41 +20,29 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setHmiLevel:(SDLHMILevel)hmiLevel {
-    if (hmiLevel != nil) {
-        [parameters setObject:hmiLevel forKey:SDLNameHMILevel];
-    } else {
-        [parameters removeObjectForKey:SDLNameHMILevel];
-    }
+    [parameters sdl_setObject:hmiLevel forName:SDLNameHMILevel];
 }
 
 - (SDLHMILevel)hmiLevel {
-    NSObject *obj = [parameters objectForKey:SDLNameHMILevel];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameHMILevel];
     return (SDLHMILevel)obj;
 }
 
 - (void)setAudioStreamingState:(SDLAudioStreamingState)audioStreamingState {
-    if (audioStreamingState != nil) {
-        [parameters setObject:audioStreamingState forKey:SDLNameAudioStreamingState];
-    } else {
-        [parameters removeObjectForKey:SDLNameAudioStreamingState];
-    }
+    [parameters sdl_setObject:audioStreamingState forName:SDLNameAudioStreamingState];
 }
 
 - (SDLAudioStreamingState)audioStreamingState {
-    NSObject *obj = [parameters objectForKey:SDLNameAudioStreamingState];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameAudioStreamingState];
     return (SDLAudioStreamingState)obj;
 }
 
 - (void)setSystemContext:(SDLSystemContext)systemContext {
-    if (systemContext != nil) {
-        [parameters setObject:systemContext forKey:SDLNameSystemContext];
-    } else {
-        [parameters removeObjectForKey:SDLNameSystemContext];
-    }
+    [parameters sdl_setObject:systemContext forName:SDLNameSystemContext];
 }
 
 - (SDLSystemContext)systemContext {
-    NSObject *obj = [parameters objectForKey:SDLNameSystemContext];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameSystemContext];
     return (SDLSystemContext)obj;
 }
 
diff --git a/SmartDeviceLink/SDLOnHashChange.m b/SmartDeviceLink/SDLOnHashChange.m
index 6159e58e5..f3fb70731 100644
--- a/SmartDeviceLink/SDLOnHashChange.m
+++ b/SmartDeviceLink/SDLOnHashChange.m
@@ -4,6 +4,7 @@
 
 #import "SDLOnHashChange.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -17,15 +18,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setHashID:(NSString *)hashID {
-    if (hashID != nil) {
-        [parameters setObject:hashID forKey:SDLNameHashId];
-    } else {
-        [parameters removeObjectForKey:SDLNameHashId];
-    }
+    [parameters sdl_setObject:hashID forName:SDLNameHashId];
 }
 
 - (NSString *)hashID {
-    return [parameters objectForKey:SDLNameHashId];
+    return [parameters sdl_objectForName:SDLNameHashId];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnKeyboardInput.m b/SmartDeviceLink/SDLOnKeyboardInput.m
index 7fa95770b..a6bd02295 100644
--- a/SmartDeviceLink/SDLOnKeyboardInput.m
+++ b/SmartDeviceLink/SDLOnKeyboardInput.m
@@ -3,6 +3,7 @@
 
 #import "SDLOnKeyboardInput.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -16,28 +17,20 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setEvent:(SDLKeyboardEvent)event {
-    if (event != nil) {
-        [parameters setObject:event forKey:SDLNameEvent];
-    } else {
-        [parameters removeObjectForKey:SDLNameEvent];
-    }
+    [parameters sdl_setObject:event forName:SDLNameEvent];
 }
 
 - (SDLKeyboardEvent)event {
-    NSObject *obj = [parameters objectForKey:SDLNameEvent];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameEvent];
     return (SDLKeyboardEvent)obj;
 }
 
 - (void)setData:(nullable NSString *)data {
-    if (data != nil) {
-        [parameters setObject:data forKey:SDLNameData];
-    } else {
-        [parameters removeObjectForKey:SDLNameData];
-    }
+    [parameters sdl_setObject:data forName:SDLNameData];
 }
 
 - (nullable NSString *)data {
-    return [parameters objectForKey:SDLNameData];
+    return [parameters sdl_objectForName:SDLNameData];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnLanguageChange.m b/SmartDeviceLink/SDLOnLanguageChange.m
index 324e4f424..419875f73 100644
--- a/SmartDeviceLink/SDLOnLanguageChange.m
+++ b/SmartDeviceLink/SDLOnLanguageChange.m
@@ -3,6 +3,7 @@
 
 #import "SDLOnLanguageChange.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLLanguage.h"
 #import "SDLNames.h"
 
@@ -17,28 +18,20 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setLanguage:(SDLLanguage)language {
-    if (language != nil) {
-        [parameters setObject:language forKey:SDLNameLanguage];
-    } else {
-        [parameters removeObjectForKey:SDLNameLanguage];
-    }
+    [parameters sdl_setObject:language forName:SDLNameLanguage];
 }
 
 - (SDLLanguage)language {
-    NSObject *obj = [parameters objectForKey:SDLNameLanguage];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameLanguage];
     return (SDLLanguage)obj;
 }
 
 - (void)setHmiDisplayLanguage:(SDLLanguage)hmiDisplayLanguage {
-    if (hmiDisplayLanguage != nil) {
-        [parameters setObject:hmiDisplayLanguage forKey:SDLNameHMIDisplayLanguage];
-    } else {
-        [parameters removeObjectForKey:SDLNameHMIDisplayLanguage];
-    }
+    [parameters sdl_setObject:hmiDisplayLanguage forName:SDLNameHMIDisplayLanguage];
 }
 
 - (SDLLanguage)hmiDisplayLanguage {
-    NSObject *obj = [parameters objectForKey:SDLNameHMIDisplayLanguage];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameHMIDisplayLanguage];
     return (SDLLanguage)obj;
 }
 
diff --git a/SmartDeviceLink/SDLOnLockScreenStatus.m b/SmartDeviceLink/SDLOnLockScreenStatus.m
index fdd36d7d2..77b8c5848 100644
--- a/SmartDeviceLink/SDLOnLockScreenStatus.m
+++ b/SmartDeviceLink/SDLOnLockScreenStatus.m
@@ -5,6 +5,7 @@
 
 #import "SDLOnLockScreenStatus.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLHMILevel.h"
 #import "SDLLockScreenStatus.h"
 
@@ -19,53 +20,35 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setLockScreenStatus:(SDLLockScreenStatus)lockScreenStatus {
-    if (lockScreenStatus != nil) {
-        [parameters setObject:lockScreenStatus forKey:@"OnLockScreenStatus"];
-    } else {
-        [parameters removeObjectForKey:@"OnLockScreenStatus"];
-    }
+    [parameters sdl_setObject:lockScreenStatus forName:@"OnLockScreenStatus"];
 }
 
 - (SDLLockScreenStatus)lockScreenStatus {
-    NSObject *obj = [parameters objectForKey:@"OnLockScreenStatus"];
-    return (SDLLockScreenStatus)obj;
+    return [parameters sdl_objectForName:@"OnLockScreenStatus"];
 }
 
 - (void)setHmiLevel:(SDLHMILevel)hmiLevel {
-    if (hmiLevel != nil) {
-        [parameters setObject:hmiLevel forKey:@"hmilevel"];
-    } else {
-        [parameters removeObjectForKey:@"hmilevel"];
-    }
+    [parameters sdl_setObject:hmiLevel forName:@"hmilevel"];
 }
 
 - (SDLHMILevel)hmiLevel {
-    NSObject *obj = [parameters objectForKey:@"hmilevel"];
-    return (SDLHMILevel)obj;
+    return [parameters sdl_objectForName:@"hmilevel"];
 }
 
 - (void)setUserSelected:(NSNumber<SDLBool> *)userSelected {
-    if (userSelected != nil) {
-        [parameters setObject:userSelected forKey:@"userselected"];
-    } else {
-        [parameters removeObjectForKey:@"userselected"];
-    }
+    [parameters sdl_setObject:userSelected forName:@"userselected"];
 }
 
 - (NSNumber<SDLBool> *)userSelected {
-    return [parameters objectForKey:@"userselected"];
+    return [parameters sdl_objectForName:@"userselected"];
 }
 
 - (void)setDriverDistractionStatus:(NSNumber<SDLBool> *)driverDistractionStatus {
-    if (driverDistractionStatus != nil) {
-        [parameters setObject:driverDistractionStatus forKey:@"driverdistractionstatus"];
-    } else {
-        [parameters removeObjectForKey:@"driverdistractionstatus"];
-    }
+    [parameters sdl_setObject:driverDistractionStatus forName:@"driverdistractionstatus"];
 }
 
 - (NSNumber<SDLBool> *)driverDistractionStatus {
-    return [parameters objectForKey:@"driverdistractionstatus"];
+    return [parameters sdl_objectForName:@"driverdistractionstatus"];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnPermissionsChange.m b/SmartDeviceLink/SDLOnPermissionsChange.m
index 0dc7eac20..d6350f2b2 100644
--- a/SmartDeviceLink/SDLOnPermissionsChange.m
+++ b/SmartDeviceLink/SDLOnPermissionsChange.m
@@ -3,6 +3,7 @@
 
 #import "SDLOnPermissionsChange.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "SDLPermissionItem.h"
 
@@ -17,15 +18,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setPermissionItem:(NSMutableArray<SDLPermissionItem *> *)permissionItem {
-    if (permissionItem != nil) {
-        [parameters setObject:permissionItem forKey:SDLNamePermissionItem];
-    } else {
-        [parameters removeObjectForKey:SDLNamePermissionItem];
-    }
+    [parameters sdl_setObject:permissionItem forName:SDLNamePermissionItem];
 }
 
 - (NSMutableArray<SDLPermissionItem *> *)permissionItem {
-    NSMutableArray<SDLPermissionItem *> *array = [parameters objectForKey:SDLNamePermissionItem];
+    NSMutableArray<SDLPermissionItem *> *array = [parameters sdl_objectForName:SDLNamePermissionItem];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLPermissionItem.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLOnSyncPData.m b/SmartDeviceLink/SDLOnSyncPData.m
index 0719ad955..13446ab88 100644
--- a/SmartDeviceLink/SDLOnSyncPData.m
+++ b/SmartDeviceLink/SDLOnSyncPData.m
@@ -4,6 +4,7 @@
 
 #import "SDLOnSyncPData.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -17,27 +18,19 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setURL:(nullable NSString *)URL {
-    if (URL != nil) {
-        [parameters setObject:URL forKey:SDLNameURLUppercase];
-    } else {
-        [parameters removeObjectForKey:SDLNameURLUppercase];
-    }
+    [parameters sdl_setObject:URL forName:SDLNameURLUppercase];
 }
 
 - (nullable NSString *)URL {
-    return [parameters objectForKey:SDLNameURLUppercase];
+    return [parameters sdl_objectForName:SDLNameURLUppercase];
 }
 
 - (void)setTimeout:(nullable NSNumber<SDLInt> *)Timeout {
-    if (Timeout != nil) {
-        [parameters setObject:Timeout forKey:SDLNameTimeoutCapitalized];
-    } else {
-        [parameters removeObjectForKey:SDLNameTimeoutCapitalized];
-    }
+    [parameters sdl_setObject:Timeout forName:SDLNameTimeoutCapitalized];
 }
 
 - (nullable NSNumber<SDLInt> *)Timeout {
-    return [parameters objectForKey:SDLNameTimeoutCapitalized];
+    return [parameters sdl_objectForName:SDLNameTimeoutCapitalized];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnSystemRequest.m b/SmartDeviceLink/SDLOnSystemRequest.m
index 298b531c5..30e58a1a9 100644
--- a/SmartDeviceLink/SDLOnSystemRequest.m
+++ b/SmartDeviceLink/SDLOnSystemRequest.m
@@ -3,6 +3,7 @@
 
 #import "SDLOnSystemRequest.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -16,77 +17,51 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setRequestType:(SDLRequestType)requestType {
-    if (requestType != nil) {
-        [parameters setObject:requestType forKey:SDLNameRequestType];
-    } else {
-        [parameters removeObjectForKey:SDLNameRequestType];
-    }
+    [parameters sdl_setObject:requestType forName:SDLNameRequestType];
 }
 
 - (SDLRequestType)requestType {
-    NSObject *obj = [parameters objectForKey:SDLNameRequestType];
-    return (SDLRequestType)obj;
+    return [parameters sdl_objectForName:SDLNameRequestType];
 }
 
 - (void)setUrl:(nullable NSString *)url {
-    if (url != nil) {
-        [parameters setObject:url forKey:SDLNameURL];
-    } else {
-        [parameters removeObjectForKey:SDLNameURL];
-    }
+    [parameters sdl_setObject:url forName:SDLNameURL];
 }
 
 - (nullable NSString *)url {
-    return [parameters objectForKey:SDLNameURL];
+    return [parameters sdl_objectForName:SDLNameURL];
 }
 
 - (void)setTimeout:(nullable NSNumber<SDLInt> *)timeout {
-    if (timeout != nil) {
-        [parameters setObject:timeout forKey:SDLNameTimeout];
-    } else {
-        [parameters removeObjectForKey:SDLNameTimeout];
-    }
+    [parameters sdl_setObject:timeout forName:SDLNameTimeout];
 }
 
 - (nullable NSNumber<SDLInt> *)timeout {
-    return [parameters objectForKey:SDLNameTimeout];
+    return [parameters sdl_objectForName:SDLNameTimeout];
 }
 
 - (void)setFileType:(nullable SDLFileType)fileType {
-    if (fileType != nil) {
-        [parameters setObject:fileType forKey:SDLNameFileType];
-    } else {
-        [parameters removeObjectForKey:SDLNameFileType];
-    }
+    [parameters sdl_setObject:fileType forName:SDLNameFileType];
 }
 
 - (nullable SDLFileType)fileType {
-    NSObject *obj = [parameters objectForKey:SDLNameFileType];
-    return (SDLFileType)obj;
+    return [parameters sdl_objectForName:SDLNameFileType];
 }
 
 - (void)setOffset:(nullable NSNumber<SDLInt> *)offset {
-    if (offset != nil) {
-        [parameters setObject:offset forKey:SDLNameOffset];
-    } else {
-        [parameters removeObjectForKey:SDLNameOffset];
-    }
+    [parameters sdl_setObject:offset forName:SDLNameOffset];
 }
 
 - (nullable NSNumber<SDLInt> *)offset {
-    return [parameters objectForKey:SDLNameOffset];
+    return [parameters sdl_objectForName:SDLNameOffset];
 }
 
 - (void)setLength:(nullable NSNumber<SDLInt> *)length {
-    if (length != nil) {
-        [parameters setObject:length forKey:SDLNameLength];
-    } else {
-        [parameters removeObjectForKey:SDLNameLength];
-    }
+    [parameters sdl_setObject:length forName:SDLNameLength];
 }
 
 - (nullable NSNumber<SDLInt> *)length {
-    return [parameters objectForKey:SDLNameLength];
+    return [parameters sdl_objectForName:SDLNameLength];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnTBTClientState.m b/SmartDeviceLink/SDLOnTBTClientState.m
index 5a6408fdd..41bc28f0d 100644
--- a/SmartDeviceLink/SDLOnTBTClientState.m
+++ b/SmartDeviceLink/SDLOnTBTClientState.m
@@ -3,6 +3,7 @@
 
 #import "SDLOnTBTClientState.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -16,15 +17,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setState:(SDLTBTState)state {
-    if (state != nil) {
-        [parameters setObject:state forKey:SDLNameState];
-    } else {
-        [parameters removeObjectForKey:SDLNameState];
-    }
+    [parameters sdl_setObject:state forName:SDLNameState];
 }
 
 - (SDLTBTState)state {
-    NSObject *obj = [parameters objectForKey:SDLNameState];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameState];
     return (SDLTBTState)obj;
 }
 
diff --git a/SmartDeviceLink/SDLOnTouchEvent.m b/SmartDeviceLink/SDLOnTouchEvent.m
index cf69803e4..e0fc56bb5 100644
--- a/SmartDeviceLink/SDLOnTouchEvent.m
+++ b/SmartDeviceLink/SDLOnTouchEvent.m
@@ -3,6 +3,7 @@
 
 #import "SDLOnTouchEvent.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "SDLTouchEvent.h"
 
@@ -17,28 +18,20 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setType:(SDLTouchType)type {
-    if (type != nil) {
-        [parameters setObject:type forKey:SDLNameType];
-    } else {
-        [parameters removeObjectForKey:SDLNameType];
-    }
+    [parameters sdl_setObject:type forName:SDLNameType];
 }
 
 - (SDLTouchType)type {
-    NSObject *obj = [parameters objectForKey:SDLNameType];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameType];
     return (SDLTouchType)obj;
 }
 
 - (void)setEvent:(NSMutableArray<SDLTouchEvent *> *)event {
-    if (event != nil) {
-        [parameters setObject:event forKey:SDLNameEvent];
-    } else {
-        [parameters removeObjectForKey:SDLNameEvent];
-    }
+    [parameters sdl_setObject:event forName:SDLNameEvent];
 }
 
 - (NSMutableArray<SDLTouchEvent *> *)event {
-    NSMutableArray<SDLTouchEvent *> *array = [parameters objectForKey:SDLNameEvent];
+    NSMutableArray<SDLTouchEvent *> *array = [parameters sdl_objectForName:SDLNameEvent];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTouchEvent.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink/SDLOnVehicleData.m
index 4d7b0ef82..6f4e99521 100644
--- a/SmartDeviceLink/SDLOnVehicleData.m
+++ b/SmartDeviceLink/SDLOnVehicleData.m
@@ -3,6 +3,7 @@
 
 #import "SDLOnVehicleData.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLAirbagStatus.h"
 #import "SDLBeltStatus.h"
 #import "SDLBodyInformation.h"
@@ -27,362 +28,204 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setGps:(nullable SDLGPSData *)gps {
-    if (gps != nil) {
-        [parameters setObject:gps forKey:SDLNameGPS];
-    } else {
-        [parameters removeObjectForKey:SDLNameGPS];
-    }
+    [parameters sdl_setObject:gps forName:SDLNameGPS];
 }
 
 - (nullable SDLGPSData *)gps {
-    NSObject *obj = [parameters objectForKey:SDLNameGPS];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLGPSData alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLGPSData*)obj;
+    return [parameters sdl_objectForName:SDLNameGPS ofClass:SDLGPSData.class];
 }
 
 - (void)setSpeed:(nullable NSNumber<SDLFloat> *)speed {
-    if (speed != nil) {
-        [parameters setObject:speed forKey:SDLNameSpeed];
-    } else {
-        [parameters removeObjectForKey:SDLNameSpeed];
-    }
+    [parameters sdl_setObject:speed forName:SDLNameSpeed];
 }
 
 - (nullable NSNumber<SDLFloat> *)speed {
-    return [parameters objectForKey:SDLNameSpeed];
+    return [parameters sdl_objectForName:SDLNameSpeed];
 }
 
 - (void)setRpm:(nullable NSNumber<SDLInt> *)rpm {
-    if (rpm != nil) {
-        [parameters setObject:rpm forKey:SDLNameRPM];
-    } else {
-        [parameters removeObjectForKey:SDLNameRPM];
-    }
+    [parameters sdl_setObject:rpm forName:SDLNameRPM];
 }
 
 - (nullable NSNumber<SDLInt> *)rpm {
-    return [parameters objectForKey:SDLNameRPM];
+    return [parameters sdl_objectForName:SDLNameRPM];
 }
 
 - (void)setFuelLevel:(nullable NSNumber<SDLFloat> *)fuelLevel {
-    if (fuelLevel != nil) {
-        [parameters setObject:fuelLevel forKey:SDLNameFuelLevel];
-    } else {
-        [parameters removeObjectForKey:SDLNameFuelLevel];
-    }
+    [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel];
 }
 
 - (nullable NSNumber<SDLFloat> *)fuelLevel {
-    return [parameters objectForKey:SDLNameFuelLevel];
+    return [parameters sdl_objectForName:SDLNameFuelLevel];
 }
 
 - (void)setFuelLevel_State:(nullable SDLComponentVolumeStatus)fuelLevel_State {
-    if (fuelLevel_State != nil) {
-        [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState];
-    } else {
-        [parameters removeObjectForKey:SDLNameFuelLevelState];
-    }
+    [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState];
 }
 
 - (nullable SDLComponentVolumeStatus)fuelLevel_State {
-    NSObject *obj = [parameters objectForKey:SDLNameFuelLevelState];
-    return (SDLComponentVolumeStatus)obj;
+    return [parameters sdl_objectForName:SDLNameFuelLevelState];
 }
 
 - (void)setInstantFuelConsumption:(nullable NSNumber<SDLFloat> *)instantFuelConsumption {
-    if (instantFuelConsumption != nil) {
-        [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption];
-    } else {
-        [parameters removeObjectForKey:SDLNameInstantFuelConsumption];
-    }
+    [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
 }
 
 - (nullable NSNumber<SDLFloat> *)instantFuelConsumption {
-    return [parameters objectForKey:SDLNameInstantFuelConsumption];
+    return [parameters sdl_objectForName:SDLNameInstantFuelConsumption];
 }
 
 - (void)setExternalTemperature:(nullable NSNumber<SDLFloat> *)externalTemperature {
-    if (externalTemperature != nil) {
-        [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature];
-    } else {
-        [parameters removeObjectForKey:SDLNameExternalTemperature];
-    }
+    [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature];
 }
 
 - (nullable NSNumber<SDLFloat> *)externalTemperature {
-    return [parameters objectForKey:SDLNameExternalTemperature];
+    return [parameters sdl_objectForName:SDLNameExternalTemperature];
 }
 
 - (void)setVin:(nullable NSString *)vin {
-    if (vin != nil) {
-        [parameters setObject:vin forKey:SDLNameVIN];
-    } else {
-        [parameters removeObjectForKey:SDLNameVIN];
-    }
+    [parameters sdl_setObject:vin forName:SDLNameVIN];
 }
 
 - (nullable NSString *)vin {
-    return [parameters objectForKey:SDLNameVIN];
+    return [parameters sdl_objectForName:SDLNameVIN];
 }
 
 - (void)setPrndl:(nullable SDLPRNDL)prndl {
-    if (prndl != nil) {
-        [parameters setObject:prndl forKey:SDLNamePRNDL];
-    } else {
-        [parameters removeObjectForKey:SDLNamePRNDL];
-    }
+    [parameters sdl_setObject:prndl forName:SDLNamePRNDL];
 }
 
 - (nullable SDLPRNDL)prndl {
-    NSObject *obj = [parameters objectForKey:SDLNamePRNDL];
+    NSObject *obj = [parameters sdl_objectForName:SDLNamePRNDL];
     return (SDLPRNDL)obj;
 }
 
 - (void)setTirePressure:(nullable SDLTireStatus *)tirePressure {
-    if (tirePressure != nil) {
-        [parameters setObject:tirePressure forKey:SDLNameTirePressure];
-    } else {
-        [parameters removeObjectForKey:SDLNameTirePressure];
-    }
+    [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure];
 }
 
 - (nullable SDLTireStatus *)tirePressure {
-    NSObject *obj = [parameters objectForKey:SDLNameTirePressure];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLTireStatus alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLTireStatus*)obj;
+    return [parameters sdl_objectForName:SDLNameTirePressure ofClass:SDLTireStatus.class];
 }
 
 - (void)setOdometer:(nullable NSNumber<SDLInt> *)odometer {
-    if (odometer != nil) {
-        [parameters setObject:odometer forKey:SDLNameOdometer];
-    } else {
-        [parameters removeObjectForKey:SDLNameOdometer];
-    }
+    [parameters sdl_setObject:odometer forName:SDLNameOdometer];
 }
 
 - (nullable NSNumber<SDLInt> *)odometer {
-    return [parameters objectForKey:SDLNameOdometer];
+    return [parameters sdl_objectForName:SDLNameOdometer];
 }
 
 - (void)setBeltStatus:(nullable SDLBeltStatus *)beltStatus {
-    if (beltStatus != nil) {
-        [parameters setObject:beltStatus forKey:SDLNameBeltStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameBeltStatus];
-    }
+    [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus];
 }
 
 - (nullable SDLBeltStatus *)beltStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameBeltStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLBeltStatus alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLBeltStatus*)obj;
+    return [parameters sdl_objectForName:SDLNameBeltStatus ofClass:SDLBeltStatus.class];
 }
 
 - (void)setBodyInformation:(nullable SDLBodyInformation *)bodyInformation {
-    if (bodyInformation != nil) {
-        [parameters setObject:bodyInformation forKey:SDLNameBodyInformation];
-    } else {
-        [parameters removeObjectForKey:SDLNameBodyInformation];
-    }
+    [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation];
 }
 
 - (nullable SDLBodyInformation *)bodyInformation {
-    NSObject *obj = [parameters objectForKey:SDLNameBodyInformation];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLBodyInformation alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLBodyInformation*)obj;
+    return [parameters sdl_objectForName:SDLNameBodyInformation ofClass:SDLBodyInformation.class];
 }
 
 - (void)setDeviceStatus:(nullable SDLDeviceStatus *)deviceStatus {
-    if (deviceStatus != nil) {
-        [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameDeviceStatus];
-    }
+    [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus];
 }
 
 - (nullable SDLDeviceStatus *)deviceStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameDeviceStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLDeviceStatus alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLDeviceStatus*)obj;
+    return [parameters sdl_objectForName:SDLNameDeviceStatus ofClass:SDLDeviceStatus.class];
 }
 
 - (void)setDriverBraking:(nullable SDLVehicleDataEventStatus)driverBraking {
-    if (driverBraking != nil) {
-        [parameters setObject:driverBraking forKey:SDLNameDriverBraking];
-    } else {
-        [parameters removeObjectForKey:SDLNameDriverBraking];
-    }
+    [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking];
 }
 
 - (nullable SDLVehicleDataEventStatus)driverBraking {
-    NSObject *obj = [parameters objectForKey:SDLNameDriverBraking];
-    return (SDLVehicleDataEventStatus)obj;
+    return [parameters sdl_objectForName:SDLNameDriverBraking];
 }
 
 - (void)setWiperStatus:(nullable SDLWiperStatus)wiperStatus {
-    if (wiperStatus != nil) {
-        [parameters setObject:wiperStatus forKey:SDLNameWiperStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameWiperStatus];
-    }
+    [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus];
 }
 
 - (nullable SDLWiperStatus)wiperStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameWiperStatus];
-    return (SDLWiperStatus)obj;
+    return [parameters sdl_objectForName:SDLNameWiperStatus];
 }
 
 - (void)setHeadLampStatus:(nullable SDLHeadLampStatus *)headLampStatus {
-    if (headLampStatus != nil) {
-        [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameHeadLampStatus];
-    }
+    [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus];
 }
 
 - (nullable SDLHeadLampStatus *)headLampStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameHeadLampStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLHeadLampStatus alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLHeadLampStatus*)obj;
+    return [parameters sdl_objectForName:SDLNameHeadLampStatus ofClass:SDLHeadLampStatus.class];
 }
 
 - (void)setEngineTorque:(nullable NSNumber<SDLFloat> *)engineTorque {
-    if (engineTorque != nil) {
-        [parameters setObject:engineTorque forKey:SDLNameEngineTorque];
-    } else {
-        [parameters removeObjectForKey:SDLNameEngineTorque];
-    }
+    [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque];
 }
 
 - (nullable NSNumber<SDLFloat> *)engineTorque {
-    return [parameters objectForKey:SDLNameEngineTorque];
+    return [parameters sdl_objectForName:SDLNameEngineTorque];
 }
 
 - (void)setAccPedalPosition:(nullable NSNumber<SDLFloat> *)accPedalPosition {
-    if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
-    } else {
-        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
-    }
+    [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
 }
 
 - (nullable NSNumber<SDLFloat> *)accPedalPosition {
-    return [parameters objectForKey:SDLNameAccelerationPedalPosition];
+    return [parameters sdl_objectForName:SDLNameAccelerationPedalPosition];
 }
 
 - (void)setSteeringWheelAngle:(nullable NSNumber<SDLFloat> *)steeringWheelAngle {
-    if (steeringWheelAngle != nil) {
-        [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle];
-    } else {
-        [parameters removeObjectForKey:SDLNameSteeringWheelAngle];
-    }
+    [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
 }
 
 - (nullable NSNumber<SDLFloat> *)steeringWheelAngle {
-    return [parameters objectForKey:SDLNameSteeringWheelAngle];
+    return [parameters sdl_objectForName:SDLNameSteeringWheelAngle];
 }
 
 - (void)setECallInfo:(nullable SDLECallInfo *)eCallInfo {
-    if (eCallInfo != nil) {
-        [parameters setObject:eCallInfo forKey:SDLNameECallInfo];
-    } else {
-        [parameters removeObjectForKey:SDLNameECallInfo];
-    }
+    [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo];
 }
 
 - (nullable SDLECallInfo *)eCallInfo {
-    NSObject *obj = [parameters objectForKey:SDLNameECallInfo];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLECallInfo alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLECallInfo*)obj;
+    return [parameters sdl_objectForName:SDLNameECallInfo ofClass:SDLECallInfo.class];
 }
 
 - (void)setAirbagStatus:(nullable SDLAirbagStatus *)airbagStatus {
-    if (airbagStatus != nil) {
-        [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameAirbagStatus];
-    }
+    [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus];
 }
 
 - (nullable SDLAirbagStatus *)airbagStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameAirbagStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLAirbagStatus alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLAirbagStatus*)obj;
+    return [parameters sdl_objectForName:SDLNameAirbagStatus ofClass:SDLAirbagStatus.class];
 }
 
 - (void)setEmergencyEvent:(nullable SDLEmergencyEvent *)emergencyEvent {
-    if (emergencyEvent != nil) {
-        [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent];
-    } else {
-        [parameters removeObjectForKey:SDLNameEmergencyEvent];
-    }
+    [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent];
 }
 
 - (nullable SDLEmergencyEvent *)emergencyEvent {
-    NSObject *obj = [parameters objectForKey:SDLNameEmergencyEvent];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLEmergencyEvent alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLEmergencyEvent*)obj;
+    return [parameters sdl_objectForName:SDLNameEmergencyEvent ofClass:SDLEmergencyEvent.class];
 }
 
 - (void)setClusterModeStatus:(nullable SDLClusterModeStatus *)clusterModeStatus {
-    if (clusterModeStatus != nil) {
-        [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameClusterModeStatus];
-    }
+    [parameters sdl_setObject:clusterModeStatus forName:SDLNameClusterModeStatus];
 }
 
 - (nullable SDLClusterModeStatus *)clusterModeStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameClusterModeStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLClusterModeStatus alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLClusterModeStatus*)obj;
+    return [parameters sdl_objectForName:SDLNameClusterModeStatus ofClass:SDLClusterModeStatus.class];
 }
 
 - (void)setMyKey:(nullable SDLMyKey *)myKey {
-    if (myKey != nil) {
-        [parameters setObject:myKey forKey:SDLNameMyKey];
-    } else {
-        [parameters removeObjectForKey:SDLNameMyKey];
-    }
+    [parameters sdl_setObject:myKey forName:SDLNameMyKey];
 }
 
 - (nullable SDLMyKey *)myKey {
-    NSObject *obj = [parameters objectForKey:SDLNameMyKey];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLMyKey alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLMyKey*)obj;
+    return [parameters sdl_objectForName:SDLNameMyKey ofClass:SDLMyKey.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnWaypointChange.m b/SmartDeviceLink/SDLOnWaypointChange.m
index 6cca2df2a..3bdeb5b86 100644
--- a/SmartDeviceLink/SDLOnWaypointChange.m
+++ b/SmartDeviceLink/SDLOnWaypointChange.m
@@ -3,6 +3,7 @@
 
 #import "SDLOnWaypointChange.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLLocationDetails.h"
 #import "SDLNames.h"
 
@@ -17,24 +18,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setWaypoints:(NSArray<SDLLocationDetails *> *)waypoints {
-    if (waypoints != nil) {
-        parameters[SDLNameWaypoints] = waypoints;
-    } else {
-        [parameters removeObjectForKey:SDLNameWaypoints];
-    }
+    [parameters sdl_setObject:waypoints forName:SDLNameWaypoints];
 }
 
 - (NSArray<SDLLocationDetails *> *)waypoints {
-    NSMutableArray *array = [parameters objectForKey: SDLNameWaypoints];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLLocationDetails.class]) {
-        return [array copy];
-    } else {
-        NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary *dict in array) {
-            [newList addObject:[[SDLLocationDetails alloc] initWithDictionary:(NSMutableDictionary *)dict]];
-        }
-        return [newList copy];
-    }
+    return [parameters sdl_objectsForName:SDLNameWaypoints ofClass:SDLLocationDetails.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLParameterPermissions.m b/SmartDeviceLink/SDLParameterPermissions.m
index fc4655d67..9f1db88e0 100644
--- a/SmartDeviceLink/SDLParameterPermissions.m
+++ b/SmartDeviceLink/SDLParameterPermissions.m
@@ -4,6 +4,7 @@
 
 #import "SDLParameterPermissions.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -11,27 +12,19 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLParameterPermissions
 
 - (void)setAllowed:(NSMutableArray<NSString *> *)allowed {
-    if (allowed != nil) {
-        [store setObject:allowed forKey:SDLNameAllowed];
-    } else {
-        [store removeObjectForKey:SDLNameAllowed];
-    }
+    [store sdl_setObject:allowed forName:SDLNameAllowed];
 }
 
 - (NSMutableArray<NSString *> *)allowed {
-    return [store objectForKey:SDLNameAllowed];
+    return [store sdl_objectForName:SDLNameAllowed];
 }
 
 - (void)setUserDisallowed:(NSMutableArray<NSString *> *)userDisallowed {
-    if (userDisallowed != nil) {
-        [store setObject:userDisallowed forKey:SDLNameUserDisallowed];
-    } else {
-        [store removeObjectForKey:SDLNameUserDisallowed];
-    }
+    [store sdl_setObject:userDisallowed forName:SDLNameUserDisallowed];
 }
 
 - (NSMutableArray<NSString *> *)userDisallowed {
-    return [store objectForKey:SDLNameUserDisallowed];
+    return [store sdl_objectForName:SDLNameUserDisallowed];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLPerformAudioPassThru.m b/SmartDeviceLink/SDLPerformAudioPassThru.m
index 82d43a1ce..d137400f3 100644
--- a/SmartDeviceLink/SDLPerformAudioPassThru.m
+++ b/SmartDeviceLink/SDLPerformAudioPassThru.m
@@ -4,6 +4,7 @@
 
 #import "SDLPerformAudioPassThru.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "SDLTTSChunk.h"
 
@@ -46,111 +47,68 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setInitialPrompt:(nullable NSMutableArray<SDLTTSChunk *> *)initialPrompt {
-    if (initialPrompt != nil) {
-        [parameters setObject:initialPrompt forKey:SDLNameInitialPrompt];
-    } else {
-        [parameters removeObjectForKey:SDLNameInitialPrompt];
-    }
+    [parameters sdl_setObject:initialPrompt forName:SDLNameInitialPrompt];
 }
 
 - (nullable NSMutableArray<SDLTTSChunk *> *)initialPrompt {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameInitialPrompt];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLTTSChunk *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameInitialPrompt ofClass:SDLTTSChunk.class];
 }
 
 - (void)setAudioPassThruDisplayText1:(nullable NSString *)audioPassThruDisplayText1 {
-    if (audioPassThruDisplayText1 != nil) {
-        [parameters setObject:audioPassThruDisplayText1 forKey:SDLNameAudioPassThruDisplayText1];
-    } else {
-        [parameters removeObjectForKey:SDLNameAudioPassThruDisplayText1];
-    }
+    [parameters sdl_setObject:audioPassThruDisplayText1 forName:SDLNameAudioPassThruDisplayText1];
 }
 
 - (nullable NSString *)audioPassThruDisplayText1 {
-    return [parameters objectForKey:SDLNameAudioPassThruDisplayText1];
+    return [parameters sdl_objectForName:SDLNameAudioPassThruDisplayText1];
 }
 
 - (void)setAudioPassThruDisplayText2:(nullable NSString *)audioPassThruDisplayText2 {
-    if (audioPassThruDisplayText2 != nil) {
-        [parameters setObject:audioPassThruDisplayText2 forKey:SDLNameAudioPassThruDisplayText2];
-    } else {
-        [parameters removeObjectForKey:SDLNameAudioPassThruDisplayText2];
-    }
+    [parameters sdl_setObject:audioPassThruDisplayText2 forName:SDLNameAudioPassThruDisplayText2];
 }
 
 - (nullable NSString *)audioPassThruDisplayText2 {
-    return [parameters objectForKey:SDLNameAudioPassThruDisplayText2];
+    return [parameters sdl_objectForName:SDLNameAudioPassThruDisplayText2];
 }
 
 - (void)setSamplingRate:(SDLSamplingRate)samplingRate {
-    if (samplingRate != nil) {
-        [parameters setObject:samplingRate forKey:SDLNameSamplingRate];
-    } else {
-        [parameters removeObjectForKey:SDLNameSamplingRate];
-    }
+    [parameters sdl_setObject:samplingRate forName:SDLNameSamplingRate];
 }
 
 - (SDLSamplingRate)samplingRate {
-    NSObject *obj = [parameters objectForKey:SDLNameSamplingRate];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameSamplingRate];
     return (SDLSamplingRate )obj;
 }
 
 - (void)setMaxDuration:(NSNumber<SDLInt> *)maxDuration {
-    if (maxDuration != nil) {
-        [parameters setObject:maxDuration forKey:SDLNameMaxDuration];
-    } else {
-        [parameters removeObjectForKey:SDLNameMaxDuration];
-    }
+    [parameters sdl_setObject:maxDuration forName:SDLNameMaxDuration];
 }
 
 - (NSNumber<SDLInt> *)maxDuration {
-    return [parameters objectForKey:SDLNameMaxDuration];
+    return [parameters sdl_objectForName:SDLNameMaxDuration];
 }
 
 - (void)setBitsPerSample:(SDLBitsPerSample)bitsPerSample {
-    if (bitsPerSample != nil) {
-        [parameters setObject:bitsPerSample forKey:SDLNameBitsPerSample];
-    } else {
-        [parameters removeObjectForKey:SDLNameBitsPerSample];
-    }
+    [parameters sdl_setObject:bitsPerSample forName:SDLNameBitsPerSample];
 }
 
 - (SDLBitsPerSample)bitsPerSample {
-    NSObject *obj = [parameters objectForKey:SDLNameBitsPerSample];
-    return (SDLBitsPerSample)obj;
+    return [parameters sdl_objectForName:SDLNameBitsPerSample];
 }
 
 - (void)setAudioType:(SDLAudioType)audioType {
-    if (audioType != nil) {
-        [parameters setObject:audioType forKey:SDLNameAudioType];
-    } else {
-        [parameters removeObjectForKey:SDLNameAudioType];
-    }
+    [parameters sdl_setObject:audioType forName:SDLNameAudioType];
 }
 
 - (SDLAudioType)audioType {
-    NSObject *obj = [parameters objectForKey:SDLNameAudioType];
-    return (SDLAudioType)obj;
+    return [parameters sdl_objectForName:SDLNameAudioType];
 }
 
 - (void)setMuteAudio:(nullable NSNumber<SDLBool> *)muteAudio {
-    if (muteAudio != nil) {
-        [parameters setObject:muteAudio forKey:SDLNameMuteAudio];
-    } else {
-        [parameters removeObjectForKey:SDLNameMuteAudio];
-    }
+    [parameters sdl_setObject:muteAudio forName:SDLNameMuteAudio];
 }
 
 - (nullable NSNumber<SDLBool> *)muteAudio {
-    return [parameters objectForKey:SDLNameMuteAudio];
+    return [parameters sdl_objectForName:SDLNameMuteAudio];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLPerformAudioPassThruResponse.m b/SmartDeviceLink/SDLPerformAudioPassThruResponse.m
index dec6fbd88..31a5c5a57 100644
--- a/SmartDeviceLink/SDLPerformAudioPassThruResponse.m
+++ b/SmartDeviceLink/SDLPerformAudioPassThruResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLPerformAudioPassThruResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink/SDLPerformInteraction.m
index 8ee162446..708902eb1 100644
--- a/SmartDeviceLink/SDLPerformInteraction.m
+++ b/SmartDeviceLink/SDLPerformInteraction.m
@@ -4,6 +4,7 @@
 
 #import "SDLPerformInteraction.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "SDLTTSChunk.h"
 #import "SDLVRHelpItem.h"
@@ -90,149 +91,75 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setInitialText:(NSString *)initialText {
-    if (initialText != nil) {
-        [parameters setObject:initialText forKey:SDLNameInitialText];
-    } else {
-        [parameters removeObjectForKey:SDLNameInitialText];
-    }
+    [parameters sdl_setObject:initialText forName:SDLNameInitialText];
 }
 
 - (NSString *)initialText {
-    return [parameters objectForKey:SDLNameInitialText];
+    return [parameters sdl_objectForName:SDLNameInitialText];
 }
 
 - (void)setInitialPrompt:(nullable NSMutableArray<SDLTTSChunk *> *)initialPrompt {
-    if (initialPrompt != nil) {
-        [parameters setObject:initialPrompt forKey:SDLNameInitialPrompt];
-    } else {
-        [parameters removeObjectForKey:SDLNameInitialPrompt];
-    }
+    [parameters sdl_setObject:initialPrompt forName:SDLNameInitialPrompt];
 }
 
 - (nullable NSMutableArray<SDLTTSChunk *> *)initialPrompt {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameInitialPrompt];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLTTSChunk *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameInitialPrompt ofClass:SDLTTSChunk.class];
 }
 
 - (void)setInteractionMode:(SDLInteractionMode)interactionMode {
-    if (interactionMode != nil) {
-        [parameters setObject:interactionMode forKey:SDLNameInteractionMode];
-    } else {
-        [parameters removeObjectForKey:SDLNameInteractionMode];
-    }
+    [parameters sdl_setObject:interactionMode forName:SDLNameInteractionMode];
 }
 
 - (SDLInteractionMode)interactionMode {
-    NSObject *obj = [parameters objectForKey:SDLNameInteractionMode];
-    return (SDLInteractionMode)obj;
+    return [parameters sdl_objectForName:SDLNameInteractionMode];
 }
 
 - (void)setInteractionChoiceSetIDList:(NSMutableArray<NSNumber<SDLInt> *> *)interactionChoiceSetIDList {
-    if (interactionChoiceSetIDList != nil) {
-        [parameters setObject:interactionChoiceSetIDList forKey:SDLNameInteractionChoiceSetIdList];
-    } else {
-        [parameters removeObjectForKey:SDLNameInteractionChoiceSetIdList];
-    }
+    [parameters sdl_setObject:interactionChoiceSetIDList forName:SDLNameInteractionChoiceSetIdList];
 }
 
 - (NSMutableArray<NSNumber<SDLInt> *> *)interactionChoiceSetIDList {
-    return [parameters objectForKey:SDLNameInteractionChoiceSetIdList];
+    return [parameters sdl_objectForName:SDLNameInteractionChoiceSetIdList];
 }
 
 - (void)setHelpPrompt:(nullable NSMutableArray<SDLTTSChunk *> *)helpPrompt {
-    if (helpPrompt != nil) {
-        [parameters setObject:helpPrompt forKey:SDLNameHelpPrompt];
-    } else {
-        [parameters removeObjectForKey:SDLNameHelpPrompt];
-    }
+    [parameters sdl_setObject:helpPrompt forName:SDLNameHelpPrompt];
 }
 
 - (nullable NSMutableArray<SDLTTSChunk *> *)helpPrompt {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameHelpPrompt];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLTTSChunk *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameHelpPrompt ofClass:SDLTTSChunk.class];
 }
 
 - (void)setTimeoutPrompt:(nullable NSMutableArray<SDLTTSChunk *> *)timeoutPrompt {
-    if (timeoutPrompt != nil) {
-        [parameters setObject:timeoutPrompt forKey:SDLNameTimeoutPrompt];
-    } else {
-        [parameters removeObjectForKey:SDLNameTimeoutPrompt];
-    }
+    [parameters sdl_setObject:timeoutPrompt forName:SDLNameTimeoutPrompt];
 }
 
 - (nullable NSMutableArray<SDLTTSChunk *> *)timeoutPrompt {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameTimeoutPrompt];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLTTSChunk *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameTimeoutPrompt ofClass:SDLTTSChunk.class];
 }
 
 - (void)setTimeout:(nullable NSNumber<SDLInt> *)timeout {
-    if (timeout != nil) {
-        [parameters setObject:timeout forKey:SDLNameTimeout];
-    } else {
-        [parameters removeObjectForKey:SDLNameTimeout];
-    }
+    [parameters sdl_setObject:timeout forName:SDLNameTimeout];
 }
 
 - (nullable NSNumber<SDLInt> *)timeout {
-    return [parameters objectForKey:SDLNameTimeout];
+    return [parameters sdl_objectForName:SDLNameTimeout];
 }
 
 - (void)setVrHelp:(nullable NSMutableArray<SDLVRHelpItem *> *)vrHelp {
-    if (vrHelp != nil) {
-        [parameters setObject:vrHelp forKey:SDLNameVRHelp];
-    } else {
-        [parameters removeObjectForKey:SDLNameVRHelp];
-    }
+    [parameters sdl_setObject:vrHelp forName:SDLNameVRHelp];
 }
 
 - (nullable NSMutableArray<SDLVRHelpItem *> *)vrHelp {
-    NSMutableArray<SDLVRHelpItem *> *array = [parameters objectForKey:SDLNameVRHelp];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVRHelpItem.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLVRHelpItem *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLVRHelpItem alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameVRHelp ofClass:SDLVRHelpItem.class];
 }
 
 - (void)setInteractionLayout:(nullable SDLLayoutMode)interactionLayout {
-    if (interactionLayout != nil) {
-        [parameters setObject:interactionLayout forKey:SDLNameInteractionLayout];
-    } else {
-        [parameters removeObjectForKey:SDLNameInteractionLayout];
-    }
+    [parameters sdl_setObject:interactionLayout forName:SDLNameInteractionLayout];
 }
 
 - (nullable SDLLayoutMode)interactionLayout {
-    NSObject *obj = [parameters objectForKey:SDLNameInteractionLayout];
-    return (SDLLayoutMode)obj;
+    return [parameters sdl_objectForName:SDLNameInteractionLayout];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLPerformInteractionResponse.m b/SmartDeviceLink/SDLPerformInteractionResponse.m
index f606848f2..085c844d5 100644
--- a/SmartDeviceLink/SDLPerformInteractionResponse.m
+++ b/SmartDeviceLink/SDLPerformInteractionResponse.m
@@ -4,8 +4,11 @@
 
 #import "SDLPerformInteractionResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @implementation SDLPerformInteractionResponse
 
 - (instancetype)init {
@@ -15,40 +18,29 @@
 }
 
 - (void)setChoiceID:(nullable NSNumber<SDLInt> *)choiceID {
-    if (choiceID != nil) {
-        [parameters setObject:choiceID forKey:SDLNameChoiceId];
-    } else {
-        [parameters removeObjectForKey:SDLNameChoiceId];
-    }
+    [parameters sdl_setObject:choiceID forName:SDLNameChoiceId];
 }
 
 - (nullable NSNumber<SDLInt> *)choiceID {
-    return [parameters objectForKey:SDLNameChoiceId];
+    return [parameters sdl_objectForName:SDLNameChoiceId];
 }
 
 - (void)setManualTextEntry:(nullable NSString *)manualTextEntry {
-    if (manualTextEntry != nil) {
-        [parameters setObject:manualTextEntry forKey:SDLNameManualTextEntry];
-    } else {
-        [parameters removeObjectForKey:SDLNameManualTextEntry];
-    }
+    [parameters sdl_setObject:manualTextEntry forName:SDLNameManualTextEntry];
 }
 
 - (nullable NSString *)manualTextEntry {
-    return [parameters objectForKey:SDLNameManualTextEntry];
+    return [parameters sdl_objectForName:SDLNameManualTextEntry];
 }
 
 - (void)setTriggerSource:(nullable SDLTriggerSource)triggerSource {
-    if (triggerSource != nil) {
-        [parameters setObject:triggerSource forKey:SDLNameTriggerSource];
-    } else {
-        [parameters removeObjectForKey:SDLNameTriggerSource];
-    }
+    [parameters sdl_setObject:triggerSource forName:SDLNameTriggerSource];
 }
 
 - (nullable SDLTriggerSource)triggerSource {
-    NSObject *obj = [parameters objectForKey:SDLNameTriggerSource];
-    return (SDLTriggerSource)obj;
+    return [parameters sdl_objectForName:SDLNameTriggerSource];
 }
 
 @end
+    
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLPermissionItem.m b/SmartDeviceLink/SDLPermissionItem.m
index dabf169aa..01cdf127b 100644
--- a/SmartDeviceLink/SDLPermissionItem.m
+++ b/SmartDeviceLink/SDLPermissionItem.m
@@ -3,6 +3,7 @@
 
 #import "SDLPermissionItem.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLHMIPermissions.h"
 #import "SDLNames.h"
 #import "SDLParameterPermissions.h"
@@ -12,49 +13,27 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLPermissionItem
 
 - (void)setRpcName:(NSString *)rpcName {
-    if (rpcName != nil) {
-        [store setObject:rpcName forKey:SDLNameRPCName];
-    } else {
-        [store removeObjectForKey:SDLNameRPCName];
-    }
+    [store sdl_setObject:rpcName forName:SDLNameRPCName];
 }
 
 - (NSString *)rpcName {
-    return [store objectForKey:SDLNameRPCName];
+    return [store sdl_objectForName:SDLNameRPCName];
 }
 
 - (void)setHmiPermissions:(SDLHMIPermissions *)hmiPermissions {
-    if (hmiPermissions != nil) {
-        [store setObject:hmiPermissions forKey:SDLNameHMIPermissions];
-    } else {
-        [store removeObjectForKey:SDLNameHMIPermissions];
-    }
+    [store sdl_setObject:hmiPermissions forName:SDLNameHMIPermissions];
 }
 
 - (SDLHMIPermissions *)hmiPermissions {
-    NSObject *obj = [store objectForKey:SDLNameHMIPermissions];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLHMIPermissions alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLHMIPermissions*)obj;
+    return [store sdl_objectForName:SDLNameHMIPermissions ofClass:SDLHMIPermissions.class];
 }
 
 - (void)setParameterPermissions:(SDLParameterPermissions *)parameterPermissions {
-    if (parameterPermissions != nil) {
-        [store setObject:parameterPermissions forKey:SDLNameParameterPermissions];
-    } else {
-        [store removeObjectForKey:SDLNameParameterPermissions];
-    }
+    [store sdl_setObject:parameterPermissions forName:SDLNameParameterPermissions];
 }
 
 - (SDLParameterPermissions *)parameterPermissions {
-    NSObject *obj = [store objectForKey:SDLNameParameterPermissions];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLParameterPermissions alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLParameterPermissions*)obj;
+    return [store sdl_objectForName:SDLNameParameterPermissions ofClass:SDLParameterPermissions.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLPresetBankCapabilities.m b/SmartDeviceLink/SDLPresetBankCapabilities.m
index 1b0f56f31..2fe43d7a7 100644
--- a/SmartDeviceLink/SDLPresetBankCapabilities.m
+++ b/SmartDeviceLink/SDLPresetBankCapabilities.m
@@ -4,6 +4,7 @@
 
 #import "SDLPresetBankCapabilities.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -11,15 +12,11 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLPresetBankCapabilities
 
 - (void)setOnScreenPresetsAvailable:(NSNumber<SDLBool> *)onScreenPresetsAvailable {
-    if (onScreenPresetsAvailable != nil) {
-        [store setObject:onScreenPresetsAvailable forKey:SDLNameOnScreenPresetsAvailable];
-    } else {
-        [store removeObjectForKey:SDLNameOnScreenPresetsAvailable];
-    }
+    [store sdl_setObject:onScreenPresetsAvailable forName:SDLNameOnScreenPresetsAvailable];
 }
 
 - (NSNumber<SDLBool> *)onScreenPresetsAvailable {
-    return [store objectForKey:SDLNameOnScreenPresetsAvailable];
+    return [store sdl_objectForName:SDLNameOnScreenPresetsAvailable];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLProtocolMessage.m b/SmartDeviceLink/SDLProtocolMessage.m
index bdcf6883d..a66327eac 100644
--- a/SmartDeviceLink/SDLProtocolMessage.m
+++ b/SmartDeviceLink/SDLProtocolMessage.m
@@ -3,6 +3,8 @@
 
 
 #import "SDLProtocolMessage.h"
+
+#import "NSMutableDictionary+Store.h"
 #import "SDLFunctionID.h"
 #import "SDLNames.h"
 #import "SDLProtocolHeader.h"
diff --git a/SmartDeviceLink/SDLPutFile.m b/SmartDeviceLink/SDLPutFile.m
index dc420a59e..5b289d4ce 100644
--- a/SmartDeviceLink/SDLPutFile.m
+++ b/SmartDeviceLink/SDLPutFile.m
@@ -3,6 +3,7 @@
 
 #import "SDLPutFile.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -52,76 +53,51 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setSyncFileName:(NSString *)syncFileName {
-    if (syncFileName != nil) {
-        [parameters setObject:syncFileName forKey:SDLNameSyncFileName];
-    } else {
-        [parameters removeObjectForKey:SDLNameSyncFileName];
-    }
+    [parameters sdl_setObject:syncFileName forName:SDLNameSyncFileName];
 }
 
 - (NSString *)syncFileName {
-    return [parameters objectForKey:SDLNameSyncFileName];
+    return [parameters sdl_objectForName:SDLNameSyncFileName];
 }
 
 - (void)setFileType:(SDLFileType)fileType {
-    if (fileType != nil) {
-        [parameters setObject:fileType forKey:SDLNameFileType];
-    } else {
-        [parameters removeObjectForKey:SDLNameFileType];
-    }
+    [parameters sdl_setObject:fileType forName:SDLNameFileType];
 }
 
 - (SDLFileType)fileType {
-    NSObject *obj = [parameters objectForKey:SDLNameFileType];
-    return (SDLFileType)obj;
+    return [parameters sdl_objectForName:SDLNameFileType];
 }
 
 - (void)setPersistentFile:(nullable NSNumber<SDLBool> *)persistentFile {
-    if (persistentFile != nil) {
-        [parameters setObject:persistentFile forKey:SDLNamePersistentFile];
-    } else {
-        [parameters removeObjectForKey:SDLNamePersistentFile];
-    }
+    [parameters sdl_setObject:persistentFile forName:SDLNamePersistentFile];
 }
 
 - (nullable NSNumber<SDLBool> *)persistentFile {
-    return [parameters objectForKey:SDLNamePersistentFile];
+    return [parameters sdl_objectForName:SDLNamePersistentFile];
 }
 
 - (void)setSystemFile:(nullable NSNumber<SDLBool> *)systemFile {
-    if (systemFile != nil) {
-        [parameters setObject:systemFile forKey:SDLNameSystemFile];
-    } else {
-        [parameters removeObjectForKey:SDLNameSystemFile];
-    }
+    [parameters sdl_setObject:systemFile forName:SDLNameSystemFile];
 }
 
 - (nullable NSNumber<SDLBool> *)systemFile {
-    return [parameters objectForKey:SDLNameSystemFile];
+    return [parameters sdl_objectForName:SDLNameSystemFile];
 }
 
 - (void)setOffset:(nullable NSNumber<SDLUInt> *)offset {
-    if (offset != nil) {
-        [parameters setObject:offset forKey:SDLNameOffset];
-    } else {
-        [parameters removeObjectForKey:SDLNameOffset];
-    }
+    [parameters sdl_setObject:offset forName:SDLNameOffset];
 }
 
 - (nullable NSNumber<SDLUInt> *)offset {
-    return [parameters objectForKey:SDLNameOffset];
+    return [parameters sdl_objectForName:SDLNameOffset];
 }
 
 - (void)setLength:(nullable NSNumber<SDLUInt> *)length {
-    if (length != nil) {
-        [parameters setObject:length forKey:SDLNameLength];
-    } else {
-        [parameters removeObjectForKey:SDLNameLength];
-    }
+    [parameters sdl_setObject:length forName:SDLNameLength];
 }
 
 - (nullable NSNumber<SDLUInt> *)length {
-    return [parameters objectForKey:SDLNameLength];
+    return [parameters sdl_objectForName:SDLNameLength];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLPutFileResponse.m b/SmartDeviceLink/SDLPutFileResponse.m
index e392a2932..6f4dffa7e 100644
--- a/SmartDeviceLink/SDLPutFileResponse.m
+++ b/SmartDeviceLink/SDLPutFileResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLPutFileResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -17,11 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setSpaceAvailable:(NSNumber<SDLInt> *)spaceAvailable {
-    if (spaceAvailable != nil) {
-        [parameters setObject:spaceAvailable forKey:SDLNameSpaceAvailable];
-    } else {
-        [parameters removeObjectForKey:SDLNameSpaceAvailable];
-    }
+    [parameters sdl_setObject:spaceAvailable forName:SDLNameSpaceAvailable];
 }
 
 - (NSNumber<SDLInt> *)spaceAvailable {
diff --git a/SmartDeviceLink/SDLRPCMessage.m b/SmartDeviceLink/SDLRPCMessage.m
index 588d8c1a1..140762dc2 100644
--- a/SmartDeviceLink/SDLRPCMessage.m
+++ b/SmartDeviceLink/SDLRPCMessage.m
@@ -4,6 +4,7 @@
 
 #import "SDLRPCMessage.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -33,40 +34,33 @@ NS_ASSUME_NONNULL_BEGIN
             }
         }
         if (messageType != nil) {
-            function = [store objectForKey:messageType];
-            parameters = [function objectForKey:SDLNameParameters];
+            function = [[store objectForKey:messageType] mutableCopy];
+            parameters = [[function objectForKey:SDLNameParameters] mutableCopy];
         }
         self.bulkData = [dict objectForKey:SDLNameBulkData];
     }
+    
     return self;
 }
 
 - (nullable NSString *)getFunctionName {
-    return [function objectForKey:SDLNameOperationName];
+    return [function sdl_objectForName:SDLNameOperationName];
 }
 
 - (void)setFunctionName:(nullable NSString *)functionName {
-    if (functionName != nil) {
-        [function setObject:functionName forKey:SDLNameOperationName];
-    } else {
-        [function removeObjectForKey:SDLNameOperationName];
-    }
+    [function sdl_setObject:functionName forName:SDLNameOperationName];
 }
 
 - (nullable NSObject *)getParameters:(NSString *)functionName {
-    return [parameters objectForKey:functionName];
+    return [parameters sdl_objectForName:functionName];
 }
 
 - (void)setParameters:(NSString *)functionName value:(nullable NSObject *)value {
-    if (value != nil) {
-        [parameters setObject:value forKey:functionName];
-    } else {
-        [parameters removeObjectForKey:functionName];
-    }
+    [parameters sdl_setObject:value forName:functionName];
 }
 
 - (NSString *)name {
-    return [function objectForKey:SDLNameOperationName];
+    return [self getFunctionName];
 }
 
 - (NSString *)description {
diff --git a/SmartDeviceLink/SDLRPCNotification.m b/SmartDeviceLink/SDLRPCNotification.m
index 7aa6ef9ef..f300a2148 100644
--- a/SmartDeviceLink/SDLRPCNotification.m
+++ b/SmartDeviceLink/SDLRPCNotification.m
@@ -4,6 +4,7 @@
 
 #import "SDLRPCNotification.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLRPCRequest.m b/SmartDeviceLink/SDLRPCRequest.m
index 93b39751d..434c3e781 100644
--- a/SmartDeviceLink/SDLRPCRequest.m
+++ b/SmartDeviceLink/SDLRPCRequest.m
@@ -4,6 +4,7 @@
 
 #import "SDLRPCRequest.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -11,15 +12,11 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLRPCRequest
 
 - (NSNumber<SDLInt> *)correlationID {
-    return [function objectForKey:SDLNameCorrelationId];
+    return [function sdl_objectForName:SDLNameCorrelationId];
 }
 
 - (void)setCorrelationID:(NSNumber<SDLInt> *)corrID {
-    if (corrID != nil) {
-        [function setObject:corrID forKey:SDLNameCorrelationId];
-    } else {
-        [function removeObjectForKey:SDLNameCorrelationId];
-    }
+    [function sdl_setObject:corrID forName:SDLNameCorrelationId];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLRPCRequestFactory.h b/SmartDeviceLink/SDLRPCRequestFactory.h
deleted file mode 100644
index 30b2561f8..000000000
--- a/SmartDeviceLink/SDLRPCRequestFactory.h
+++ /dev/null
@@ -1,233 +0,0 @@
-//  SDLRPCRequestFactory.h
-//
-
-#import <Foundation/Foundation.h>
-
-#import "SDLAppHMIType.h"
-#import "SDLAudioType.h"
-#import "SDLBitsPerSample.h"
-#import "SDLButtonName.h"
-#import "SDLFileType.h"
-#import "SDLGlobalProperty.h"
-#import "SDLImageType.h"
-#import "SDLInteractionMode.h"
-#import "SDLLanguage.h"
-#import "SDLNotificationConstants.h"
-#import "SDLSamplingRate.h"
-#import "SDLSoftButtonType.h"
-#import "SDLSystemAction.h"
-#import "SDLTextAlignment.h"
-#import "SDLUpdateMode.h"
-#import "SDLVRHelpItem.h"
-
-@class SDLAddCommand;
-@class SDLAddSubMenu;
-@class SDLAlert;
-@class SDLAlertManeuver;
-@class SDLChangeRegistration;
-@class SDLChoice;
-@class SDLCreateInteractionChoiceSet;
-@class SDLDeleteCommand;
-@class SDLDeleteFile;
-@class SDLDeleteInteractionChoiceSet;
-@class SDLDeleteSubMenu;
-@class SDLDialNumber;
-@class SDLEndAudioPassThru;
-@class SDLGetDTCs;
-@class SDLGetVehicleData;
-@class SDLImage;
-@class SDLListFiles;
-@class SDLPerformAudioPassThru;
-@class SDLPerformInteraction;
-@class SDLPutFile;
-@class SDLReadDID;
-@class SDLRegisterAppInterface;
-@class SDLResetGlobalProperties;
-@class SDLScrollableMessage;
-@class SDLSendLocation;
-@class SDLSetAppIcon;
-@class SDLSetDisplayLayout;
-@class SDLSetGlobalProperties;
-@class SDLSetMediaClockTimer;
-@class SDLShow;
-@class SDLShowConstantTBT;
-@class SDLSlider;
-@class SDLSoftButton;
-@class SDLSpeak;
-@class SDLSubscribeButton;
-@class SDLSubscribeVehicleData;
-@class SDLTTSChunk;
-@class SDLTurn;
-@class SDLUnregisterAppInterface;
-@class SDLUnsubscribeButton;
-@class SDLUnsubscribeVehicleData;
-@class SDLUpdateTurnList;
-
-NS_ASSUME_NONNULL_BEGIN
-
-__deprecated_msg("use class's initializers instead") @interface SDLRPCRequestFactory : NSObject {
-}
-
-//***** AddCommand *****
-+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID menuName:(nullable NSString *)menuName parentID:(nullable NSNumber<SDLInt> *)parentID position:(nullable NSNumber<SDLInt> *)position vrCommands:(nullable NSArray<NSString *> *)vrCommands iconValue:(nullable NSString *)iconValue iconType:(nullable SDLImageType)iconType correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLAddCommand's buildAddCommandWithID:vrCommands:menuName:parentID:position:iconValue:iconType:handler: instead");
-;
-
-+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID menuName:(nullable NSString *)menuName vrCommands:(nullable NSArray<NSString *> *)vrCommands correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLAddCommands's initWithId:vrCommands:menuName:handler: instead");
-
-+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID vrCommands:(nullable NSArray<NSString *> *)vrCommands correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use buildAddCommandWithID:vrCommands:handler: with SDLManager instead");
-
-+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID menuName:(nullable NSString *)menuName parentID:(nullable NSNumber<SDLInt> *)parentID position:(nullable NSNumber<SDLInt> *)position vrCommands:(nullable NSArray<NSString *> *)vrCommands iconValue:(nullable NSString *)iconValue iconType:(nullable SDLImageType)iconType handler:(SDLRPCNotificationHandler)handler __deprecated_msg("use SDLAddCommand's initWithId:vrCommands:menuName:parentId:position:iconValue:iconType:handler: instead");
-
-+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID menuName:(nullable NSString *)menuName vrCommands:(nullable NSArray<NSString *> *)vrCommands handler:(SDLRPCNotificationHandler)handler __deprecated_msg("use SDLAddCommand's initWithId:vrCommands:menuName:handler: instead");
-
-+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID vrCommands:(nullable NSArray<NSString *> *)vrCommands handler:(SDLRPCNotificationHandler)handler __deprecated_msg("use SDLAddCommand's initWithId:vrCommands:handler: instead");
-//*****
-
-
-//***** AddSubMenu *****
-+ (SDLAddSubMenu *)buildAddSubMenuWithID:(NSNumber<SDLInt> *)menuID menuName:(NSString *)menuName position:(nullable NSNumber<SDLInt> *)position correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLAddSubMenu's initWithId:menuName:position: instead");
-
-+ (SDLAddSubMenu *)buildAddSubMenuWithID:(NSNumber<SDLInt> *)menuID menuName:(NSString *)menuName correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLAddSubMenu's initWithId:menuName: instead");
-//*****
-
-
-//***** Alert *****
-+ (SDLAlert *)buildAlertWithTTS:(nullable NSString *)ttsText alertText1:(nullable NSString *)alertText1 alertText2:(nullable NSString *)alertText2 alertText3:(nullable NSString *)alertText3 playTone:(nullable NSNumber<SDLBool> *)playTone duration:(nullable NSNumber<SDLInt> *)duration correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLAlert's initWithTTS:alertText1:alertText2:alertText3:playTone:duration: instead");
-
-+ (SDLAlert *)buildAlertWithTTS:(nullable NSString *)ttsText alertText1:(nullable NSString *)alertText1 alertText2:(nullable NSString *)alertText2 playTone:(nullable NSNumber<SDLBool> *)playTone duration:(nullable NSNumber<SDLInt> *)duration correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLAlert's initWithTTS:alertText1:alertText2:playTone:duration: instead");
-
-+ (SDLAlert *)buildAlertWithTTS:(nullable NSString *)ttsText playTone:(nullable NSNumber<SDLBool> *)playTone correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLAlert's initWithTTS:playTone:duration: instead");
-
-//***
-+ (SDLAlert *)buildAlertWithTTSChunks:(nullable NSArray<SDLTTSChunk *> *)ttsChunks alertText1:(nullable NSString *)alertText1 alertText2:(nullable NSString *)alertText2 alertText3:(nullable NSString *)alertText3 playTone:(nullable NSNumber<SDLBool> *)playTone duration:(nullable NSNumber<SDLInt> *)duration softButtons:(nullable NSArray<SDLSoftButton *> *)softButtons correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLAlert's initWithTTSChunks:alertText1:alertText2:alertText3:playTone:duration:softButtons: instead");
-
-+ (SDLAlert *)buildAlertWithTTSChunks:(nullable NSArray<SDLTTSChunk *> *)ttsChunks playTone:(nullable NSNumber<SDLBool> *)playTone correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLAlert's initWithTTSChunks:playTone: instead");
-
-//***
-+ (SDLAlert *)buildAlertWithAlertText1:(nullable NSString *)alertText1 alertText2:(nullable NSString *)alertText2 alertText3:(nullable NSString *)alertText3 duration:(nullable NSNumber<SDLInt> *)duration softButtons:(nullable NSArray<SDLSoftButton *> *)softButtons correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLAlert's initWithAlertText1:alertText2:alertText3:duration:softButtons: instead");
-
-+ (SDLAlert *)buildAlertWithAlertText1:(nullable NSString *)alertText1 alertText2:(nullable NSString *)alertText2 alertText3:(nullable NSString *)alertText3 duration:(nullable NSNumber<SDLInt> *)duration correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLAlert's initWithAlertText1:alertText2:alertText3:duration: instead");
-
-+ (SDLAlert *)buildAlertWithAlertText1:(nullable NSString *)alertText1 alertText2:(nullable NSString *)alertText2 duration:(nullable NSNumber<SDLInt> *)duration correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLAlert's initWithAlertText1:alertText2:duration: instead");
-//*****
-
-+ (SDLAlertManeuver *)buildAlertManeuverwithTTSchunks:(NSMutableArray<SDLTTSChunk *> *)ttsChunks softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLAlertManeuver's initWithTTSChunks:softButtons: instead");
-
-+ (SDLChangeRegistration *)buildChangeRegistrationWithLanguage:(SDLLanguage)language hmiDisplayLanguage:(SDLLanguage)hmiDisplayLanguage correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLChangeRegistration's initWithLanguage:hmiDisplayLanguage: instead");
-
-+ (SDLCreateInteractionChoiceSet *)buildCreateInteractionChoiceSetWithID:(NSNumber<SDLInt> *)interactionChoiceSetID choiceSet:(NSArray<SDLChoice *> *)choices correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLCreateInteractionChoiceSet's initWithId:choiceSet: instead");
-
-+ (SDLDeleteCommand *)buildDeleteCommandWithID:(NSNumber<SDLInt> *)cmdID correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLDeleteCommand's initWithId: instead");
-
-+ (SDLDeleteFile *)buildDeleteFileWithName:(NSString *)syncFileName correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLDeleteFile's initWithFileName: instead");
-
-+ (SDLDialNumber *)buildDialNumberWithNumber:(NSString *)phoneNumber __deprecated_msg("use SDLDialNumber's initWithNumber: instead");
-
-+ (SDLListFiles *)buildListFilesWithCorrelationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLListFiles's default initializer instead");
-
-+ (SDLDeleteInteractionChoiceSet *)buildDeleteInteractionChoiceSetWithID:(NSNumber<SDLInt> *)interactionChoiceSetID correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLDeleteInteractionChoiceSet's initWithId: instead");
-
-+ (SDLDeleteSubMenu *)buildDeleteSubMenuWithID:(NSNumber<SDLInt> *)menuID correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLDeleteSubMenu's initWithId: instead");
-
-+ (SDLEndAudioPassThru *)buildEndAudioPassThruWithCorrelationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLEndAudioPassThru's default initializer instead");
-
-+ (SDLGetDTCs *)buildGetDTCsWithECUName:(NSNumber<SDLInt> *)ecuName correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLGetDTCs's initWithECUName: instead");
-
-+ (SDLGetVehicleData *)buildGetVehicleDataWithGPS:(NSNumber<SDLBool> *)gps speed:(NSNumber<SDLBool> *)speed rpm:(NSNumber<SDLBool> *)rpm fuelLevel:(NSNumber<SDLBool> *)fuelLevel fuelLevelState:(NSNumber<SDLBool> *)fuelLevelState instantFuelConsumption:(NSNumber<SDLBool> *)instantFuelConsumption externalTemperature:(NSNumber<SDLBool> *)externalTemperature vin:(NSNumber<SDLBool> *)vin prndl:(NSNumber<SDLBool> *)prndl tirePressure:(NSNumber<SDLBool> *)tirePressure odometer:(NSNumber<SDLBool> *)odometer beltStatus:(NSNumber<SDLBool> *)beltStatus bodyInformation:(NSNumber<SDLBool> *)bodyInformation deviceStatus:(NSNumber<SDLBool> *)deviceStatus driverBraking:(NSNumber<SDLBool> *)driverBraking wiperStatus:(NSNumber<SDLBool> *)wiperStatus headLampStatus:(NSNumber<SDLBool> *)headLampStatus engineTorque:(NSNumber<SDLBool> *)engineTorque accPedalPosition:(NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(NSNumber<SDLBool> *)steeringWheelAngle correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLGetVehicleData's initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:emergencyEvent:engineTorque:externalTemperature:fuelLevel:fuelLevelState:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:vin:wiperStatus: instead");
-
-+ (SDLPerformAudioPassThru *)buildPerformAudioPassThruWithInitialPrompt:(NSString *)initialPrompt audioPassThruDisplayText1:(NSString *)audioPassThruDisplayText1 audioPassThruDisplayText2:(NSString *)audioPassThruDisplayText2 samplingRate:(SDLSamplingRate)samplingRate maxDuration:(NSNumber<SDLInt> *)maxDuration bitsPerSample:(SDLBitsPerSample)bitsPerSample audioType:(SDLAudioType)audioType muteAudio:(NSNumber<SDLBool> *)muteAudio correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLPerformAudioPassThru's initWithInitialPrompt:audioPassThruDisplayText1:audioPassThruDisplayText2:samplingRate:bitsPerSample:audioType:maxDuration:muteAudio: instead");
-
-
-//***** PerformInteraction *****
-+ (SDLPerformInteraction *)buildPerformInteractionWithInitialChunks:(nullable NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLInt> *> *)interactionChoiceSetIDList helpChunks:(nullable NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(nullable NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode)interactionMode timeout:(nullable NSNumber<SDLInt> *)timeout vrHelp:(nullable NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLPerformInteraction's initWithInitialChunks:initialText:interactionChoiceSetIDList:helpChunks:timeoutChunks:interactionMode:timeout:vrHelp: instead");
-
-//***
-+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(nullable NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLInt> *> *)interactionChoiceSetIDList helpPrompt:(nullable NSString *)helpPrompt timeoutPrompt:(nullable NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(nullable NSNumber<SDLInt> *)timeout vrHelp:(nullable NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLPerformInteraction's initWithInitialPrompt:initialText:interactionChoiceSetIDList:helpPrompt:timeoutPrompt:interactionMode:timeout:vrHelp: instead");
-
-+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(nullable NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber<SDLInt> *)interactionChoiceSetID vrHelp:(nullable NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLPerformInteraction's initWithInitialPrompt:initialText:interactionChoiceSetID:vrHelp: instead");
-
-+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(nullable NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLInt> *> *)interactionChoiceSetIDList helpPrompt:(nullable NSString *)helpPrompt timeoutPrompt:(nullable NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(nullable NSNumber<SDLInt> *)timeout correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLPerformInteraction's initWithInitialPrompt:initialText:interactionChoiceSetIDList:helpPrompt:timeoutPrompt:interactionMode:timeout: instead");
-
-+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(nullable NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber<SDLInt> *)interactionChoiceSetID correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLPerformInteraction's  initWithInitialPrompt:initialText:interactionChoiceSetID: instead");
-//*****
-
-+ (SDLPutFile *)buildPutFileWithFileName:(NSString *)fileName fileType:(SDLFileType)fileType persistentFile:(NSNumber<SDLBool> *)persistentFile correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLPutFile's initWithFileName:fileType: instead");
-+ (SDLPutFile *)buildPutFileWithFileName:(NSString *)syncFileName fileType:(SDLFileType)fileType persisistentFile:(NSNumber<SDLBool> *)persistentFile correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use buildPutFileWithFileName:fileType:persistentFile:correlationID: instead");
-
-+ (SDLReadDID *)buildReadDIDWithECUName:(NSNumber<SDLInt> *)ecuName didLocation:(NSArray<NSNumber<SDLInt> *> *)didLocation correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLReadDID's initWithECUName:didLocation: instead");
-
-//***** RegisterAppInterface *****
-+ (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName ttsName:(nullable NSMutableArray<SDLTTSChunk *> *)ttsName vrSynonyms:(nullable NSMutableArray<NSString *> *)vrSynonyms isMediaApp:(NSNumber<SDLBool> *)isMediaApp languageDesired:(SDLLanguage)languageDesired hmiDisplayLanguageDesired:(SDLLanguage)hmiDisplayLanguageDesired appID:(NSString *)appID __deprecated_msg("use SDLRegisterAppInterface's initWithAppName:appId:languageDesired:isMediaApp:appType:shortAppName:ttsName:vrSynonyms:hmiDisplayLanguageDesired:resumeHash: instead");
-
-+ (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName isMediaApp:(NSNumber<SDLBool> *)isMediaApp languageDesired:(SDLLanguage)languageDesired appID:(NSString *)appID __deprecated_msg("use SDLRegisterAppInterface's initWithAppName:appId:lanaugeDesired:isMediaApp:appType:shortAppName: instead");
-
-+ (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName languageDesired:(SDLLanguage)laguageDesired appID:(NSString *)appID __deprecated_msg("use SDLRegisterAppInterface's initWithAppName:appId:lanaugeDesired: instead");
-//*****
-
-+ (SDLResetGlobalProperties *)buildResetGlobalPropertiesWithProperties:(NSArray<SDLGlobalProperty> *)properties correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLResetGlobalProperties's initWithProperties: instead");
-
-+ (SDLSendLocation *)buildSendLocationWithLongitude:(NSNumber<SDLFloat> *)longitude latitude:(NSNumber<SDLFloat> *)latitude locationName:(NSString *)locationName locationDescription:(NSString *)locationDescription address:(NSArray<NSString *> *)address phoneNumber:(NSString *)phoneNumber image:(SDLImage *)image __deprecated_msg("use SDLSendLocation's initWithLongitude:latitude:locationName:locationDescription:address:phoneNumber:image: instead");
-
-+ (SDLScrollableMessage *)buildScrollableMessage:(NSString *)scrollableMessageBody timeout:(NSNumber<SDLInt> *)timeout softButtons:(NSArray<SDLSoftButton *> *)softButtons correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLScrollableMessage's initWithMessage:timeout:softButtons: instead");
-
-+ (SDLSetAppIcon *)buildSetAppIconWithFileName:(NSString *)syncFileName correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLSetAppIcon's initWithFileName: instead");
-
-+ (SDLSetDisplayLayout *)buildSetDisplayLayout:(NSString *)displayLayout correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLSetAppIcon's initWithLayout: instead");
-
-
-//***** SetGlobalProperties *****
-+ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText vrHelpTitle:(NSString *)vrHelpTitle vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLSetGlobalProperties's initWithHelpText:timeoutText:vrHelpTitle:vrHelp: instead");
-
-+ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLSetGlobalProperties's initWithHelpText:timeoutText: instead");
-//*****
-
-
-//***** SetMediaClockTimer *****
-+ (SDLSetMediaClockTimer *)buildSetMediaClockTimerWithHours:(NSNumber<SDLInt> *)hours minutes:(NSNumber<SDLInt> *)minutes seconds:(NSNumber<SDLInt> *)seconds updateMode:(SDLUpdateMode)updateMode correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLSetMediaClockTimer's initWithHours:minutes:seconds:updateMode: instead");
-
-+ (SDLSetMediaClockTimer *)buildSetMediaClockTimerWithUpdateMode:(SDLUpdateMode)updateMode correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLSetMediaClockTimer's initWithUpdateMode: instead");
-//*****
-
-
-//***** Show *****
-+ (SDLShow *)buildShowWithMainField1:(nullable NSString *)mainField1 mainField2:(nullable NSString *)mainField2 mainField3:(nullable NSString *)mainField3 mainField4:(nullable NSString *)mainField4 statusBar:(nullable NSString *)statusBar mediaClock:(nullable NSString *)mediaClock mediaTrack:(nullable NSString *)mediaTrack alignment:(nullable SDLTextAlignment)textAlignment graphic:(nullable SDLImage *)graphic softButtons:(nullable NSArray<SDLSoftButton *> *)softButtons customPresets:(nullable NSArray<NSString *> *)customPresets correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLShow's initWithMainField1:mainField2:mainField3:mainField4:alignment:statusBar:mediaClock:mediaTrack:graphic:softButtons:customPresets: instead");
-
-+ (SDLShow *)buildShowWithMainField1:(nullable NSString *)mainField1 mainField2:(nullable NSString *)mainField2 statusBar:(nullable NSString *)statusBar mediaClock:(nullable NSString *)mediaClock mediaTrack:(nullable NSString *)mediaTrack alignment:(nullable SDLTextAlignment)textAlignment correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLShow's initWithMainField1:mainField2:alignment:statusBar:mediaClock:mediaTrack: instead");
-
-+ (SDLShow *)buildShowWithMainField1:(nullable NSString *)mainField1 mainField2:(nullable NSString *)mainField2 alignment:(nullable SDLTextAlignment)alignment correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLShow's initWithMainField1:mainField2:alignment: instead");
-//*****
-
-
-//***** Slider *****
-+ (SDLSlider *)buildSliderDynamicFooterWithNumTicks:(NSNumber<SDLInt> *)numTicks position:(NSNumber<SDLInt> *)position sliderHeader:(NSString *)sliderHeader sliderFooter:(NSArray<NSString *> *)sliderFooter timeout:(NSNumber<SDLInt> *)timeout correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLSlider's initWithNumTicks:position:sliderHeader:sliderFooter:timeout: instead");
-
-+ (SDLSlider *)buildSliderStaticFooterWithNumTicks:(NSNumber<SDLInt> *)numTicks position:(NSNumber<SDLInt> *)position sliderHeader:(NSString *)sliderHeader sliderFooter:(NSString *)sliderFooter timeout:(NSNumber<SDLInt> *)timeout correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLSlider's initWithNumTicks:position:sliderHeader:sliderFooters:timeout: instead");
-//*****
-
-+ (SDLSoftButton *)buildSoftButtonWithType:(SDLSoftButtonType)type text:(NSString *)text image:(SDLImage *)image highlighted:(BOOL)highlighted buttonID:(UInt16)buttonID systemAction:(SDLSystemAction)systemAction handler:(SDLRPCNotificationHandler)handler __deprecated_msg("use SDLSoftButton's initWithType:text:image:highlighted:buttonId:systemAction:handler: instead");
-
-//***** Speak *****
-+ (SDLSpeak *)buildSpeakWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLSpeak's initWithTTSChunks: instead");
-
-//***
-+ (SDLSpeak *)buildSpeakWithTTS:(NSString *)ttsText correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLSpeak's initWithTTS: instead");
-//*****
-
-+ (SDLSubscribeButton *)buildSubscribeButtonWithName:(SDLButtonName)buttonName correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use buildSubscribeButtonWithName:handler: with SDLManager instead");
-
-+ (SDLSubscribeButton *)buildSubscribeButtonWithName:(SDLButtonName)buttonName handler:(SDLRPCNotificationHandler)handler __deprecated_msg("use SDLSubscribeButton's initWithButtonName:handler: instead");
-
-+ (SDLSubscribeVehicleData *)buildSubscribeVehicleDataWithGPS:(NSNumber<SDLBool> *)gps speed:(NSNumber<SDLBool> *)speed rpm:(NSNumber<SDLBool> *)rpm fuelLevel:(NSNumber<SDLBool> *)fuelLevel fuelLevelState:(NSNumber<SDLBool> *)fuelLevelState instantFuelConsumption:(NSNumber<SDLBool> *)instantFuelConsumption externalTemperature:(NSNumber<SDLBool> *)externalTemperature prndl:(NSNumber<SDLBool> *)prndl tirePressure:(NSNumber<SDLBool> *)tirePressure odometer:(NSNumber<SDLBool> *)odometer beltStatus:(NSNumber<SDLBool> *)beltStatus bodyInformation:(NSNumber<SDLBool> *)bodyInformation deviceStatus:(NSNumber<SDLBool> *)deviceStatus driverBraking:(NSNumber<SDLBool> *)driverBraking wiperStatus:(NSNumber<SDLBool> *)wiperStatus headLampStatus:(NSNumber<SDLBool> *)headLampStatus engineTorque:(NSNumber<SDLBool> *)engineTorque accPedalPosition:(NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(NSNumber<SDLBool> *)steeringWheelAngle correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLSubscribeVehicleData's initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:emergencyEvent:engineTorque:externalTemperature:fuelLevel:fuelLevelState:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:wiperStatus: instead");
-
-+ (SDLShowConstantTBT *)buildShowConstantTBTWithString:(NSString *)navigationText1 navigationText2:(NSString *)navigationText2 eta:(NSString *)eta timeToDestination:(NSString *)timeToDestination totalDistance:(NSString *)totalDistance turnIcon:(SDLImage *)turnIcon nextTurnIcon:(SDLImage *)nextTurnIcon distanceToManeuver:(NSNumber<SDLFloat> *)distanceToManeuver distanceToManeuverScale:(NSNumber<SDLFloat> *)distanceToManeuverScale maneuverComplete:(NSNumber<SDLFloat> *)maneuverComplete softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLShowConstantTBT's initWithNavigationText1:navigationText2:eta:timeToDestination:totalDistance:turnIcon:nextTurnIcon:distanceToManeuver:distanceToManeuverScale:maneuverComplete:softButtons: instead");
-
-+ (SDLUnregisterAppInterface *)buildUnregisterAppInterfaceWithCorrelationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLUnregisterAppInterface's default initializer instead");
-
-+ (SDLUnsubscribeButton *)buildUnsubscribeButtonWithName:(SDLButtonName)buttonName correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLUnsubscribeButton's initWithButtonName: instead");
-
-+ (SDLUnsubscribeVehicleData *)buildUnsubscribeVehicleDataWithGPS:(NSNumber<SDLBool> *)gps speed:(NSNumber<SDLBool> *)speed rpm:(NSNumber<SDLBool> *)rpm fuelLevel:(NSNumber<SDLBool> *)fuelLevel fuelLevelState:(NSNumber<SDLBool> *)fuelLevelState instantFuelConsumption:(NSNumber<SDLBool> *)instantFuelConsumption externalTemperature:(NSNumber<SDLBool> *)externalTemperature prndl:(NSNumber<SDLBool> *)prndl tirePressure:(NSNumber<SDLBool> *)tirePressure odometer:(NSNumber<SDLBool> *)odometer beltStatus:(NSNumber<SDLBool> *)beltStatus bodyInformation:(NSNumber<SDLBool> *)bodyInformation deviceStatus:(NSNumber<SDLBool> *)deviceStatus driverBraking:(NSNumber<SDLBool> *)driverBraking wiperStatus:(NSNumber<SDLBool> *)wiperStatus headLampStatus:(NSNumber<SDLBool> *)headLampStatus engineTorque:(NSNumber<SDLBool> *)engineTorque accPedalPosition:(NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(NSNumber<SDLBool> *)steeringWheelAngle correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLSubscribeVehicleData's initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:emergencyEvent:engineTorque:externalTemperature:fuelLevel:fuelLevelState:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:wiperStatus: instead");
-
-+ (SDLUpdateTurnList *)buildUpdateTurnListWithTurnList:(NSMutableArray<SDLTurn *> *)turnList softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(nullable NSNumber<SDLInt> *)correlationID __deprecated_msg("use SDLUpdateTurnList initWithTurnList:softButtons: instead");
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLRPCRequestFactory.m b/SmartDeviceLink/SDLRPCRequestFactory.m
deleted file mode 100644
index eae083a0e..000000000
--- a/SmartDeviceLink/SDLRPCRequestFactory.m
+++ /dev/null
@@ -1,756 +0,0 @@
-//  SDLRPCRequestFactory.m
-//
-
-#import "SDLRPCRequestFactory.h"
-#import <CoreTelephony/CTCarrier.h>
-#import <CoreTelephony/CTTelephonyNetworkInfo.h>
-#import <UIKit/UIKit.h>
-
-#import "SDLAddCommand.h"
-#import "SDLAddSubMenu.h"
-#import "SDLAlert.h"
-#import "SDLAlertManeuver.h"
-#import "SDLAppHMIType.h"
-#import "SDLAppInfo.h"
-#import "SDLChangeRegistration.h"
-#import "SDLCreateInteractionChoiceSet.h"
-#import "SDLDebugTool.h"
-#import "SDLDeleteCommand.h"
-#import "SDLDeleteFile.h"
-#import "SDLDeleteInteractionChoiceSet.h"
-#import "SDLDeleteSubMenu.h"
-#import "SDLDeviceInfo.h"
-#import "SDLDialNumber.h"
-#import "SDLEndAudioPassThru.h"
-#import "SDLGetDTCs.h"
-#import "SDLGetVehicleData.h"
-#import "SDLImage.h"
-#import "SDLListFiles.h"
-#import "SDLMenuParams.h"
-#import "SDLPerformAudioPassThru.h"
-#import "SDLPerformInteraction.h"
-#import "SDLPutFile.h"
-#import "SDLReadDID.h"
-#import "SDLRegisterAppInterface.h"
-#import "SDLResetGlobalProperties.h"
-#import "SDLScrollableMessage.h"
-#import "SDLSendLocation.h"
-#import "SDLSetAppIcon.h"
-#import "SDLSetDisplayLayout.h"
-#import "SDLSetGlobalProperties.h"
-#import "SDLSetMediaClockTimer.h"
-#import "SDLShow.h"
-#import "SDLShowConstantTBT.h"
-#import "SDLSlider.h"
-#import "SDLSoftButton.h"
-#import "SDLSpeak.h"
-#import "SDLSpeechCapabilities.h"
-#import "SDLStartTime.h"
-#import "SDLSubscribeButton.h"
-#import "SDLSubscribeVehicleData.h"
-#import "SDLSyncMsgVersion.h"
-#import "SDLTTSChunk.h"
-#import "SDLTTSChunkFactory.h"
-#import "SDLUnregisterAppInterface.h"
-#import "SDLUnsubscribeButton.h"
-#import "SDLUnsubscribeVehicleData.h"
-#import "SDLUpdateTurnList.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionString";
-
-@implementation SDLRPCRequestFactory
-
-//***** AddCommand *****
-+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID menuName:(nullable NSString *)menuName parentID:(nullable NSNumber<SDLInt> *)parentID position:(nullable NSNumber<SDLInt> *)position vrCommands:(nullable NSArray<NSString *> *)vrCommands iconValue:(nullable NSString *)iconValue iconType:(nullable SDLImageType)iconType correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLAddCommand *msg = [[SDLAddCommand alloc] init];
-
-    msg.cmdID = cmdID;
-
-    if (menuName != nil) {
-        SDLMenuParams *menuParams = [[SDLMenuParams alloc] init];
-        menuParams.menuName = menuName;
-        menuParams.parentID = parentID;
-        menuParams.position = position;
-        msg.menuParams = menuParams;
-    }
-    msg.vrCommands = [vrCommands mutableCopy];
-
-    if (iconValue != nil && iconType != nil) {
-        SDLImage *icon = [[SDLImage alloc] init];
-        icon.value = iconValue;
-        icon.imageType = iconType;
-        msg.cmdIcon = icon;
-    }
-
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID menuName:(nullable NSString *)menuName parentID:(nullable NSNumber<SDLInt> *)parentID position:(nullable NSNumber<SDLInt> *)position vrCommands:(nullable NSArray<NSString *> *)vrCommands iconValue:(nullable NSString *)iconValue iconType:(nullable SDLImageType)iconType handler:(SDLRPCNotificationHandler)handler {
-    SDLAddCommand *msg = [[SDLAddCommand alloc] initWithHandler:handler];
-
-    msg.cmdID = cmdID;
-
-    if (menuName != nil) {
-        SDLMenuParams *menuParams = [[SDLMenuParams alloc] init];
-        menuParams.menuName = menuName;
-        menuParams.parentID = parentID;
-        menuParams.position = position;
-        msg.menuParams = menuParams;
-    }
-    msg.vrCommands = [vrCommands mutableCopy];
-
-    if (iconValue != nil && iconType != nil) {
-        SDLImage *icon = [[SDLImage alloc] init];
-        icon.value = iconValue;
-        icon.imageType = iconType;
-        msg.cmdIcon = icon;
-    }
-
-    return msg;
-}
-
-+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID menuName:(nullable NSString *)menuName vrCommands:(nullable NSArray<NSString *> *)vrCommands correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    return [SDLRPCRequestFactory buildAddCommandWithID:cmdID menuName:menuName parentID:nil position:nil vrCommands:vrCommands iconValue:nil iconType:nil correlationID:correlationID];
-}
-
-+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID menuName:(nullable NSString *)menuName vrCommands:(nullable NSArray<NSString *> *)vrCommands handler:(SDLRPCNotificationHandler)handler {
-    return [SDLRPCRequestFactory buildAddCommandWithID:cmdID menuName:menuName parentID:nil position:nil vrCommands:vrCommands iconValue:nil iconType:nil handler:handler];
-}
-
-+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID vrCommands:(nullable NSArray<NSString *> *)vrCommands correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    return [SDLRPCRequestFactory buildAddCommandWithID:cmdID menuName:nil vrCommands:vrCommands correlationID:correlationID];
-}
-
-+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID vrCommands:(nullable NSArray<NSString *> *)vrCommands handler:(SDLRPCNotificationHandler)handler {
-    return [SDLRPCRequestFactory buildAddCommandWithID:cmdID menuName:nil vrCommands:vrCommands handler:handler];
-}
-//*****
-
-
-//***** AddSubMenu *****
-+ (SDLAddSubMenu *)buildAddSubMenuWithID:(NSNumber<SDLInt> *)menuID menuName:(NSString *)menuName position:(nullable NSNumber<SDLInt> *)position correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLAddSubMenu *msg = [[SDLAddSubMenu alloc] init];
-    msg.correlationID = correlationID;
-    msg.menuID = menuID;
-    msg.menuName = menuName;
-    msg.position = position;
-    return msg;
-}
-
-+ (SDLAddSubMenu *)buildAddSubMenuWithID:(NSNumber<SDLInt> *)menuID menuName:(NSString *)menuName correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    return [SDLRPCRequestFactory buildAddSubMenuWithID:menuID menuName:menuName position:nil correlationID:correlationID];
-}
-//*****
-
-
-//***** Alert *****
-+ (SDLAlert *)buildAlertWithTTS:(nullable NSString *)ttsText alertText1:(nullable NSString *)alertText1 alertText2:(nullable NSString *)alertText2 alertText3:(nullable NSString *)alertText3 playTone:(nullable NSNumber<SDLBool> *)playTone duration:(nullable NSNumber<SDLInt> *)duration correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLTTSChunk *simpleChunk = [[SDLTTSChunk alloc] init];
-    simpleChunk.text = ttsText;
-    simpleChunk.type = SDLSpeechCapabilitiesText;
-    NSArray<SDLTTSChunk *> *ttsChunks = [NSArray arrayWithObject:simpleChunk];
-
-    return [SDLRPCRequestFactory buildAlertWithTTSChunks:ttsChunks alertText1:alertText1 alertText2:alertText2 alertText3:alertText3 playTone:playTone duration:duration softButtons:nil correlationID:correlationID];
-}
-
-+ (SDLAlert *)buildAlertWithTTS:(nullable NSString *)ttsText alertText1:(nullable NSString *)alertText1 alertText2:(nullable NSString *)alertText2 playTone:(nullable NSNumber<SDLBool> *)playTone duration:(nullable NSNumber<SDLInt> *)duration correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    return [SDLRPCRequestFactory buildAlertWithTTS:ttsText alertText1:alertText1 alertText2:alertText2 alertText3:nil playTone:playTone duration:duration correlationID:correlationID];
-}
-
-+ (SDLAlert *)buildAlertWithTTS:(nullable NSString *)ttsText playTone:(nullable NSNumber<SDLBool> *)playTone correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    return [SDLRPCRequestFactory buildAlertWithTTS:ttsText alertText1:nil alertText2:nil alertText3:nil playTone:playTone duration:nil correlationID:correlationID];
-}
-
-//***
-+ (SDLAlert *)buildAlertWithTTSChunks:(nullable NSArray<SDLTTSChunk *> *)ttsChunks alertText1:(nullable NSString *)alertText1 alertText2:(nullable NSString *)alertText2 alertText3:(nullable NSString *)alertText3 playTone:(nullable NSNumber<SDLBool> *)playTone duration:(nullable NSNumber<SDLInt> *)duration softButtons:(nullable NSArray<SDLSoftButton *> *)softButtons correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLAlert *msg = [[SDLAlert alloc] init];
-    msg.correlationID = correlationID;
-    msg.alertText1 = alertText1;
-    msg.alertText2 = alertText2;
-    msg.alertText3 = alertText3;
-    msg.ttsChunks = [ttsChunks mutableCopy];
-    msg.playTone = playTone;
-    msg.duration = duration;
-    msg.softButtons = [softButtons mutableCopy];
-    return msg;
-}
-
-+ (SDLAlert *)buildAlertWithTTSChunks:(nullable NSArray<SDLTTSChunk *> *)ttsChunks playTone:(nullable NSNumber<SDLBool> *)playTone correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    return [SDLRPCRequestFactory buildAlertWithTTSChunks:ttsChunks alertText1:nil alertText2:nil alertText3:nil playTone:playTone duration:nil softButtons:nil correlationID:correlationID];
-}
-
-//***
-+ (SDLAlert *)buildAlertWithAlertText1:(nullable NSString *)alertText1 alertText2:(nullable NSString *)alertText2 alertText3:(nullable NSString *)alertText3 duration:(nullable NSNumber<SDLInt> *)duration softButtons:(nullable NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    return [SDLRPCRequestFactory buildAlertWithTTSChunks:nil alertText1:alertText1 alertText2:alertText2 alertText3:alertText3 playTone:nil duration:duration softButtons:softButtons correlationID:correlationID];
-}
-
-+ (SDLAlert *)buildAlertWithAlertText1:(nullable NSString *)alertText1 alertText2:(nullable NSString *)alertText2 alertText3:(nullable NSString *)alertText3 duration:(nullable NSNumber<SDLInt> *)duration correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    return [SDLRPCRequestFactory buildAlertWithTTSChunks:nil alertText1:alertText1 alertText2:alertText2 alertText3:alertText3 playTone:nil duration:duration softButtons:nil correlationID:correlationID];
-}
-
-+ (SDLAlert *)buildAlertWithAlertText1:(nullable NSString *)alertText1 alertText2:(nullable NSString *)alertText2 duration:(nullable NSNumber<SDLInt> *)duration correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    return [SDLRPCRequestFactory buildAlertWithTTSChunks:nil alertText1:alertText1 alertText2:alertText2 alertText3:nil playTone:nil duration:duration softButtons:nil correlationID:correlationID];
-}
-//*****
-
-
-+ (SDLAlertManeuver *)buildAlertManeuverwithTTSchunks:(NSMutableArray<SDLTTSChunk *> *)ttsChunks softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLAlertManeuver *msg = [[SDLAlertManeuver alloc] init];
-    msg.ttsChunks = ttsChunks;
-    msg.softButtons = softButtons;
-    msg.correlationID = correlationID;
-    return msg;
-}
-
-+ (SDLChangeRegistration *)buildChangeRegistrationWithLanguage:(SDLLanguage)language hmiDisplayLanguage:(SDLLanguage)hmiDisplayLanguage correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLChangeRegistration *msg = [[SDLChangeRegistration alloc] init];
-    msg.language = language;
-    msg.hmiDisplayLanguage = hmiDisplayLanguage;
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLCreateInteractionChoiceSet *)buildCreateInteractionChoiceSetWithID:(NSNumber<SDLInt> *)interactionChoiceSetID choiceSet:(NSArray<SDLChoice *> *)choices correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLCreateInteractionChoiceSet *msg = [[SDLCreateInteractionChoiceSet alloc] init];
-    msg.interactionChoiceSetID = interactionChoiceSetID;
-    msg.choiceSet = [choices mutableCopy];
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLDeleteCommand *)buildDeleteCommandWithID:(NSNumber<SDLInt> *)cmdID correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLDeleteCommand *msg = [[SDLDeleteCommand alloc] init];
-    msg.cmdID = cmdID;
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLDeleteFile *)buildDeleteFileWithName:(NSString *)syncFileName correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLDeleteFile *msg = [[SDLDeleteFile alloc] init];
-    msg.syncFileName = syncFileName;
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLDialNumber *)buildDialNumberWithNumber:(NSString *)phoneNumber {
-    SDLDialNumber *msg = [[SDLDialNumber alloc] init];
-    msg.number = phoneNumber;
-
-    return msg;
-}
-
-+ (SDLListFiles *)buildListFilesWithCorrelationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLListFiles *msg = [[SDLListFiles alloc] init];
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLDeleteInteractionChoiceSet *)buildDeleteInteractionChoiceSetWithID:(NSNumber<SDLInt> *)interactionChoiceSetID correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLDeleteInteractionChoiceSet *msg = [[SDLDeleteInteractionChoiceSet alloc] init];
-    msg.interactionChoiceSetID = interactionChoiceSetID;
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLDeleteSubMenu *)buildDeleteSubMenuWithID:(NSNumber<SDLInt> *)menuID correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLDeleteSubMenu *msg = [[SDLDeleteSubMenu alloc] init];
-    msg.menuID = menuID;
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLEndAudioPassThru *)buildEndAudioPassThruWithCorrelationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLEndAudioPassThru *msg = [[SDLEndAudioPassThru alloc] init];
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLGetDTCs *)buildGetDTCsWithECUName:(NSNumber<SDLInt> *)ecuName correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLGetDTCs *msg = [[SDLGetDTCs alloc] init];
-    msg.ecuName = ecuName;
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLGetVehicleData *)buildGetVehicleDataWithGPS:(NSNumber<SDLBool> *)gps speed:(NSNumber<SDLBool> *)speed rpm:(NSNumber<SDLBool> *)rpm fuelLevel:(NSNumber<SDLBool> *)fuelLevel fuelLevelState:(NSNumber<SDLBool> *)fuelLevelState instantFuelConsumption:(NSNumber<SDLBool> *)instantFuelConsumption externalTemperature:(NSNumber<SDLBool> *)externalTemperature vin:(NSNumber<SDLBool> *)vin prndl:(NSNumber<SDLBool> *)prndl tirePressure:(NSNumber<SDLBool> *)tirePressure odometer:(NSNumber<SDLBool> *)odometer beltStatus:(NSNumber<SDLBool> *)beltStatus bodyInformation:(NSNumber<SDLBool> *)bodyInformation deviceStatus:(NSNumber<SDLBool> *)deviceStatus driverBraking:(NSNumber<SDLBool> *)driverBraking wiperStatus:(NSNumber<SDLBool> *)wiperStatus headLampStatus:(NSNumber<SDLBool> *)headLampStatus engineTorque:(NSNumber<SDLBool> *)engineTorque accPedalPosition:(NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(NSNumber<SDLBool> *)steeringWheelAngle correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLGetVehicleData *msg = [[SDLGetVehicleData alloc] init];
-    msg.gps = gps;
-    msg.speed = speed;
-    msg.rpm = rpm;
-    msg.fuelLevel = fuelLevel;
-    msg.fuelLevel_State = fuelLevelState;
-    msg.instantFuelConsumption = instantFuelConsumption;
-    msg.externalTemperature = externalTemperature;
-    msg.vin = vin;
-    msg.prndl = prndl;
-    msg.tirePressure = tirePressure;
-    msg.odometer = odometer;
-    msg.beltStatus = beltStatus;
-    msg.bodyInformation = bodyInformation;
-    msg.deviceStatus = deviceStatus;
-    msg.driverBraking = driverBraking;
-    msg.wiperStatus = wiperStatus;
-    msg.headLampStatus = headLampStatus;
-    msg.engineTorque = engineTorque;
-    msg.accPedalPosition = accPedalPosition;
-    msg.steeringWheelAngle = steeringWheelAngle;
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLPerformAudioPassThru *)buildPerformAudioPassThruWithInitialPrompt:(NSString *)initialPrompt audioPassThruDisplayText1:(NSString *)audioPassThruDisplayText1 audioPassThruDisplayText2:(NSString *)audioPassThruDisplayText2 samplingRate:(SDLSamplingRate)samplingRate maxDuration:(NSNumber<SDLInt> *)maxDuration bitsPerSample:(SDLBitsPerSample)bitsPerSample audioType:(SDLAudioType)audioType muteAudio:(NSNumber<SDLBool> *)muteAudio correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    NSArray<SDLTTSChunk *> *initialChunks = [SDLTTSChunk textChunksFromString:initialPrompt];
-
-    SDLPerformAudioPassThru *msg = [[SDLPerformAudioPassThru alloc] init];
-    msg.initialPrompt = [initialChunks mutableCopy];
-    msg.audioPassThruDisplayText1 = audioPassThruDisplayText1;
-    msg.audioPassThruDisplayText2 = audioPassThruDisplayText2;
-    msg.samplingRate = samplingRate;
-    msg.maxDuration = maxDuration;
-    msg.bitsPerSample = bitsPerSample;
-    msg.audioType = audioType;
-    msg.muteAudio = muteAudio;
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-
-//***** PerformInteraction *****
-+ (SDLPerformInteraction *)buildPerformInteractionWithInitialChunks:(nullable NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpChunks:(nullable NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(nullable NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode)interactionMode timeout:(nullable NSNumber<SDLInt> *)timeout vrHelp:(nullable NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLPerformInteraction *msg = [[SDLPerformInteraction alloc] init];
-    msg.initialPrompt = [initialChunks mutableCopy];
-    msg.initialText = initialText;
-    msg.interactionChoiceSetIDList = [interactionChoiceSetIDList mutableCopy];
-    msg.helpPrompt = [helpChunks mutableCopy];
-    msg.timeoutPrompt = [timeoutChunks mutableCopy];
-    msg.interactionMode = interactionMode;
-    msg.timeout = timeout;
-    msg.vrHelp = [vrHelp mutableCopy];
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-//***
-+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(nullable NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpPrompt:(nullable NSString *)helpPrompt timeoutPrompt:(nullable NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(nullable NSNumber<SDLInt> *)timeout vrHelp:(nullable NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    NSArray<SDLTTSChunk *> *initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt];
-    NSArray<SDLTTSChunk *> *helpChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:helpPrompt];
-    NSArray<SDLTTSChunk *> *timeoutChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:timeoutPrompt];
-
-    return [SDLRPCRequestFactory buildPerformInteractionWithInitialChunks:initialChunks initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpChunks:helpChunks timeoutChunks:timeoutChunks interactionMode:interactionMode timeout:timeout vrHelp:vrHelp correlationID:correlationID];
-}
-
-+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(nullable NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber<SDLInt> *)interactionChoiceSetID vrHelp:(nullable NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    NSArray<NSNumber *> *interactionChoiceSetIDList = [NSArray arrayWithObject:interactionChoiceSetID];
-    NSArray<SDLTTSChunk *> *initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt];
-
-    return [SDLRPCRequestFactory buildPerformInteractionWithInitialChunks:initialChunks initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpChunks:nil timeoutChunks:nil interactionMode:SDLInteractionModeBoth timeout:nil vrHelp:vrHelp correlationID:correlationID];
-}
-
-+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(nullable NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpPrompt:(nullable NSString *)helpPrompt timeoutPrompt:(nullable NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(nullable NSNumber<SDLInt> *)timeout correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    return [SDLRPCRequestFactory buildPerformInteractionWithInitialPrompt:initialPrompt initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpPrompt:helpPrompt timeoutPrompt:timeoutPrompt interactionMode:interactionMode timeout:timeout vrHelp:nil correlationID:correlationID];
-}
-
-+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(nullable NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber<SDLInt> *)interactionChoiceSetID correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    return [SDLRPCRequestFactory buildPerformInteractionWithInitialPrompt:initialPrompt initialText:initialText interactionChoiceSetID:interactionChoiceSetID vrHelp:nil correlationID:correlationID];
-}
-//*****
-
-+ (SDLPutFile *)buildPutFileWithFileName:(NSString *)fileName fileType:(SDLFileType)fileType persistentFile:(NSNumber<SDLBool> *)persistentFile correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLPutFile *msg = [[SDLPutFile alloc] init];
-    msg.syncFileName = fileName;
-
-    msg.fileType = fileType;
-    msg.persistentFile = persistentFile;
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLPutFile *)buildPutFileWithFileName:(NSString *)syncFileName fileType:(SDLFileType)fileType persisistentFile:(NSNumber<SDLBool> *)persistentFile correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    return [self buildPutFileWithFileName:syncFileName fileType:fileType persistentFile:persistentFile correlationID:correlationID];
-}
-
-+ (SDLReadDID *)buildReadDIDWithECUName:(NSNumber<SDLInt> *)ecuName didLocation:(NSArray<NSNumber *> *)didLocation correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLReadDID *msg = [[SDLReadDID alloc] init];
-    msg.ecuName = ecuName;
-    msg.didLocation = [didLocation mutableCopy];
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-//***** RegisterAppInterface *****
-+ (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName ttsName:(nullable NSArray<SDLTTSChunk *> *)ttsName vrSynonyms:(nullable NSArray<NSString *> *)vrSynonyms isMediaApp:(NSNumber<SDLFloat> *)isMediaApp languageDesired:(SDLLanguage)languageDesired hmiDisplayLanguageDesired:(SDLLanguage)hmiDisplayLanguageDesired appID:(NSString *)appID {
-    SDLRegisterAppInterface *msg = [[SDLRegisterAppInterface alloc] init];
-    SDLSyncMsgVersion *version = [[SDLSyncMsgVersion alloc] init];
-    version.majorVersion = [NSNumber numberWithInt:1];
-    version.minorVersion = [NSNumber numberWithInt:0];
-    msg.syncMsgVersion = version;
-    msg.appName = appName;
-    msg.ttsName = [ttsName mutableCopy];
-    msg.ngnMediaScreenAppName = appName;
-    msg.vrSynonyms = [vrSynonyms mutableCopy];
-    msg.isMediaApplication = isMediaApp;
-    msg.languageDesired = languageDesired;
-    msg.hmiDisplayLanguageDesired = hmiDisplayLanguageDesired;
-    msg.appID = appID;
-    msg.deviceInfo = [self sdl_buildDeviceInfo];
-    msg.correlationID = [NSNumber numberWithInt:1];
-    SDLAppInfo *appInfo = [self sdl_buildAppInfo];
-    appInfo.appDisplayName = appName;
-    msg.appInfo = appInfo;
-    return msg;
-}
-
-+ (SDLDeviceInfo *)sdl_buildDeviceInfo {
-    SDLDeviceInfo *deviceInfo = [[SDLDeviceInfo alloc] init];
-    deviceInfo.hardware = [UIDevice currentDevice].model;
-    deviceInfo.os = [UIDevice currentDevice].systemName;
-    deviceInfo.osVersion = [UIDevice currentDevice].systemVersion;
-    CTTelephonyNetworkInfo *netinfo = [[CTTelephonyNetworkInfo alloc] init];
-    CTCarrier *carrier = netinfo.subscriberCellularProvider;
-    NSString *carrierName = carrier.carrierName;
-    deviceInfo.carrier = carrierName;
-
-    return deviceInfo;
-}
-
-+ (SDLAppInfo *)sdl_buildAppInfo {
-    SDLAppInfo *appInfo = [[SDLAppInfo alloc] init];
-    NSBundle *mainBundle = [NSBundle mainBundle];
-    NSDictionary *bundleDictionary = mainBundle.infoDictionary;
-    appInfo.appVersion = bundleDictionary[SDLBundleShortVersionStringKey];
-    appInfo.appBundleID = mainBundle.bundleIdentifier;
-    return appInfo;
-}
-
-+ (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName isMediaApp:(NSNumber<SDLFloat> *)isMediaApp languageDesired:(SDLLanguage)languageDesired appID:(NSString *)appID {
-    NSMutableArray<NSString *> *syns = [NSMutableArray arrayWithObject:appName];
-    return [SDLRPCRequestFactory buildRegisterAppInterfaceWithAppName:appName ttsName:nil vrSynonyms:syns isMediaApp:isMediaApp languageDesired:languageDesired hmiDisplayLanguageDesired:languageDesired appID:appID];
-}
-
-+ (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName languageDesired:(SDLLanguage)languageDesired appID:(NSString *)appID {
-    return [SDLRPCRequestFactory buildRegisterAppInterfaceWithAppName:appName isMediaApp:@NO languageDesired:languageDesired appID:appID];
-}
-//*****
-
-
-+ (SDLResetGlobalProperties *)buildResetGlobalPropertiesWithProperties:(NSArray<SDLGlobalProperty> *)properties correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLResetGlobalProperties *msg = [[SDLResetGlobalProperties alloc] init];
-    msg.properties = [properties mutableCopy];
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLScrollableMessage *)buildScrollableMessage:(NSString *)scrollableMessageBody timeout:(NSNumber<SDLInt> *)timeout softButtons:(NSArray<SDLSoftButton *> *)softButtons correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLScrollableMessage *msg = [[SDLScrollableMessage alloc] init];
-    msg.scrollableMessageBody = scrollableMessageBody;
-    msg.timeout = timeout;
-    msg.softButtons = [softButtons mutableCopy];
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLSendLocation *)buildSendLocationWithLongitude:(NSNumber<SDLFloat> *)longitude latitude:(NSNumber<SDLFloat> *)latitude locationName:(NSString *)locationName locationDescription:(NSString *)locationDescription address:(NSArray<NSString *> *)address phoneNumber:(NSString *)phoneNumber image:(SDLImage *)image {
-    SDLSendLocation *msg = [[SDLSendLocation alloc] init];
-    msg.longitudeDegrees = longitude;
-    msg.latitudeDegrees = latitude;
-    msg.locationName = locationName;
-    msg.locationDescription = locationDescription;
-    msg.addressLines = address;
-    msg.phoneNumber = phoneNumber;
-    msg.locationImage = image;
-
-    return msg;
-}
-
-+ (SDLSetAppIcon *)buildSetAppIconWithFileName:(NSString *)syncFileName correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLSetAppIcon *msg = [[SDLSetAppIcon alloc] init];
-    msg.syncFileName = syncFileName;
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLSetDisplayLayout *)buildSetDisplayLayout:(NSString *)displayLayout correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLSetDisplayLayout *msg = [[SDLSetDisplayLayout alloc] init];
-    msg.displayLayout = displayLayout;
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-
-//***** SetGlobalProperties *****
-+ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText vrHelpTitle:(NSString *)vrHelpTitle vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLSetGlobalProperties *msg = [[SDLSetGlobalProperties alloc] init];
-    msg.helpPrompt = [SDLTTSChunk textChunksFromString:helpText];
-    msg.timeoutPrompt = [SDLTTSChunk textChunksFromString:timeoutText];
-    msg.vrHelpTitle = vrHelpTitle;
-    msg.vrHelp = [vrHelp mutableCopy];
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLSetGlobalProperties *msg = [[SDLSetGlobalProperties alloc] init];
-    msg.helpPrompt = [SDLTTSChunk textChunksFromString:helpText];
-    msg.timeoutPrompt = [SDLTTSChunk textChunksFromString:timeoutText];
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-//*****
-
-
-//***** SetMediaClockTimer *****
-+ (SDLSetMediaClockTimer *)buildSetMediaClockTimerWithHours:(NSNumber<SDLInt> *)hours minutes:(NSNumber<SDLInt> *)minutes seconds:(NSNumber<SDLInt> *)seconds updateMode:(SDLUpdateMode)updateMode correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLSetMediaClockTimer *msg = [[SDLSetMediaClockTimer alloc] init];
-    SDLStartTime *startTime = [[SDLStartTime alloc] init];
-    startTime.hours = hours;
-    startTime.minutes = minutes;
-    startTime.seconds = seconds;
-    msg.startTime = startTime;
-    msg.updateMode = updateMode;
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLSetMediaClockTimer *)buildSetMediaClockTimerWithUpdateMode:(SDLUpdateMode)updateMode correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLSetMediaClockTimer *msg = [[SDLSetMediaClockTimer alloc] init];
-    msg.updateMode = updateMode;
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-//*****
-
-
-//***** Show *****
-+ (SDLShow *)buildShowWithMainField1:(nullable NSString *)mainField1 mainField2:(nullable NSString *)mainField2 mainField3:(nullable NSString *)mainField3 mainField4:(nullable NSString *)mainField4 statusBar:(nullable NSString *)statusBar mediaClock:(nullable NSString *)mediaClock mediaTrack:(nullable NSString *)mediaTrack alignment:(nullable SDLTextAlignment)textAlignment graphic:(nullable SDLImage *)graphic softButtons:(nullable NSArray<SDLSoftButton *> *)softButtons customPresets:(nullable NSArray<NSString *> *)customPresets correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLShow *msg = [[SDLShow alloc] init];
-    msg.correlationID = correlationID;
-    msg.mainField1 = mainField1;
-    msg.mainField2 = mainField2;
-    msg.mainField3 = mainField3;
-    msg.mainField4 = mainField4;
-    msg.statusBar = statusBar;
-    msg.mediaClock = mediaClock;
-    msg.mediaTrack = mediaTrack;
-    msg.alignment = textAlignment;
-    msg.graphic = graphic;
-    msg.softButtons = [softButtons mutableCopy];
-    msg.customPresets = [customPresets mutableCopy];
-
-    return msg;
-}
-
-+ (SDLShow *)buildShowWithMainField1:(nullable NSString *)mainField1 mainField2:(nullable NSString *)mainField2 statusBar:(nullable NSString *)statusBar mediaClock:(nullable NSString *)mediaClock mediaTrack:(nullable NSString *)mediaTrack alignment:(nullable SDLTextAlignment)textAlignment correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLShow *msg = [[SDLShow alloc] init];
-    msg.correlationID = correlationID;
-    msg.mainField1 = mainField1;
-    msg.mainField2 = mainField2;
-    msg.statusBar = statusBar;
-    msg.mediaClock = mediaClock;
-    msg.mediaTrack = mediaTrack;
-    msg.alignment = textAlignment;
-
-    return msg;
-}
-
-+ (SDLShow *)buildShowWithMainField1:(nullable NSString *)mainField1 mainField2:(nullable NSString *)mainField2 alignment:(nullable SDLTextAlignment)alignment correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    return [SDLRPCRequestFactory buildShowWithMainField1:mainField1 mainField2:mainField2 statusBar:nil mediaClock:nil mediaTrack:nil alignment:alignment correlationID:correlationID];
-}
-
-+ (SDLShowConstantTBT *)buildShowConstantTBTWithString:(NSString *)navigationText1 navigationText2:(NSString *)navigationText2 eta:(NSString *)eta timeToDestination:(NSString *)timeToDestination totalDistance:(NSString *)totalDistance turnIcon:(SDLImage *)turnIcon nextTurnIcon:(SDLImage *)nextTurnIcon distanceToManeuver:(NSNumber<SDLFloat> *)distanceToManeuver distanceToManeuverScale:(NSNumber<SDLFloat> *)distanceToManeuverScale maneuverComplete:(NSNumber<SDLBool> *)maneuverComplete softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLShowConstantTBT *msg = [[SDLShowConstantTBT alloc] init];
-    msg.navigationText1 = navigationText1;
-    msg.navigationText2 = navigationText2;
-    msg.eta = eta;
-    msg.timeToDestination = timeToDestination;
-    msg.totalDistance = totalDistance;
-    msg.turnIcon = turnIcon;
-    msg.nextTurnIcon = nextTurnIcon;
-    msg.distanceToManeuver = distanceToManeuver;
-    msg.distanceToManeuverScale = distanceToManeuverScale;
-    msg.maneuverComplete = maneuverComplete;
-    msg.softButtons = [softButtons mutableCopy];
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-//*****
-
-
-//***** Slider *****
-+ (SDLSlider *)buildSliderDynamicFooterWithNumTicks:(NSNumber<SDLInt> *)numTicks position:(NSNumber<SDLInt> *)position sliderHeader:(NSString *)sliderHeader sliderFooter:(NSArray<NSString *> *)sliderFooter timeout:(NSNumber<SDLInt> *)timeout correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLSlider *msg = [[SDLSlider alloc] init];
-    msg.correlationID = correlationID;
-    msg.numTicks = numTicks;
-    msg.position = position;
-    msg.sliderHeader = sliderHeader;
-    msg.sliderFooter = [sliderFooter mutableCopy];
-    msg.timeout = timeout;
-
-    return msg;
-}
-
-+ (SDLSlider *)buildSliderStaticFooterWithNumTicks:(NSNumber<SDLInt> *)numTicks position:(NSNumber<SDLInt> *)position sliderHeader:(NSString *)sliderHeader sliderFooter:(NSString *)sliderFooter timeout:(NSNumber<SDLInt> *)timeout correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    NSArray<NSString *> *sliderFooters = [NSArray arrayWithObject:sliderFooter];
-
-    // Populates array with the same footer value for each position
-    for (UInt32 i = 1; i < numTicks.unsignedIntegerValue; i++) {
-        sliderFooters = [sliderFooters arrayByAddingObject:sliderFooter];
-    }
-
-    return [SDLRPCRequestFactory buildSliderDynamicFooterWithNumTicks:numTicks position:position sliderHeader:sliderHeader sliderFooter:sliderFooters timeout:timeout correlationID:correlationID];
-}
-//*****
-
-+ (SDLSoftButton *)buildSoftButtonWithType:(SDLSoftButtonType)type text:(NSString *)text image:(SDLImage *)image highlighted:(BOOL)highlighted buttonID:(UInt16)buttonID systemAction:(SDLSystemAction)systemAction handler:(SDLRPCNotificationHandler)handler {
-    SDLSoftButton *button = [[SDLSoftButton alloc] initWithHandler:handler];
-    button.type = type;
-    button.text = text;
-    button.image = image;
-    button.isHighlighted = @(highlighted);
-    button.softButtonID = @(buttonID);
-    button.systemAction = systemAction;
-
-    return button;
-}
-
-
-//***** Speak *****
-+ (SDLSpeak *)buildSpeakWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLSpeak *msg = [[SDLSpeak alloc] init];
-    msg.correlationID = correlationID;
-    msg.ttsChunks = [ttsChunks mutableCopy];
-
-    return msg;
-}
-
-//***
-+ (SDLSpeak *)buildSpeakWithTTS:(NSString *)ttsText correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLTTSChunk *simpleChunk = [[SDLTTSChunk alloc] init];
-    simpleChunk.text = ttsText;
-    simpleChunk.type = SDLSpeechCapabilitiesText;
-    NSArray<SDLTTSChunk *> *ttsChunks = [NSMutableArray arrayWithObject:simpleChunk];
-
-    return [SDLRPCRequestFactory buildSpeakWithTTSChunks:ttsChunks correlationID:correlationID];
-}
-//*****
-
-+ (SDLSubscribeButton *)buildSubscribeButtonWithName:(SDLButtonName)buttonName correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLSubscribeButton *msg = [[SDLSubscribeButton alloc] init];
-    msg.buttonName = buttonName;
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLSubscribeButton *)buildSubscribeButtonWithName:(SDLButtonName)buttonName handler:(SDLRPCNotificationHandler)handler {
-    SDLSubscribeButton *msg = [[SDLSubscribeButton alloc] initWithHandler:handler];
-    msg.buttonName = buttonName;
-
-    return msg;
-}
-
-+ (SDLSubscribeVehicleData *)buildSubscribeVehicleDataWithGPS:(NSNumber<SDLBool> *)gps speed:(NSNumber<SDLBool> *)speed rpm:(NSNumber<SDLBool> *)rpm fuelLevel:(NSNumber<SDLBool> *)fuelLevel fuelLevelState:(NSNumber<SDLBool> *)fuelLevelState instantFuelConsumption:(NSNumber<SDLBool> *)instantFuelConsumption externalTemperature:(NSNumber<SDLBool> *)externalTemperature prndl:(NSNumber<SDLBool> *)prndl tirePressure:(NSNumber<SDLBool> *)tirePressure odometer:(NSNumber<SDLBool> *)odometer beltStatus:(NSNumber<SDLBool> *)beltStatus bodyInformation:(NSNumber<SDLBool> *)bodyInformation deviceStatus:(NSNumber<SDLBool> *)deviceStatus driverBraking:(NSNumber<SDLBool> *)driverBraking wiperStatus:(NSNumber<SDLBool> *)wiperStatus headLampStatus:(NSNumber<SDLBool> *)headLampStatus engineTorque:(NSNumber<SDLBool> *)engineTorque accPedalPosition:(NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(NSNumber<SDLBool> *)steeringWheelAngle correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLSubscribeVehicleData *msg = [[SDLSubscribeVehicleData alloc] init];
-    msg.gps = gps;
-    msg.speed = speed;
-    msg.rpm = rpm;
-    msg.fuelLevel = fuelLevel;
-    msg.fuelLevel_State = fuelLevelState;
-    msg.instantFuelConsumption = instantFuelConsumption;
-    msg.externalTemperature = externalTemperature;
-    msg.prndl = prndl;
-    msg.tirePressure = tirePressure;
-    msg.odometer = odometer;
-    msg.beltStatus = beltStatus;
-    msg.bodyInformation = bodyInformation;
-    msg.deviceStatus = deviceStatus;
-    msg.driverBraking = driverBraking;
-    msg.wiperStatus = wiperStatus;
-    msg.headLampStatus = headLampStatus;
-    msg.engineTorque = engineTorque;
-    msg.accPedalPosition = accPedalPosition;
-    msg.steeringWheelAngle = steeringWheelAngle;
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLUnregisterAppInterface *)buildUnregisterAppInterfaceWithCorrelationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLUnregisterAppInterface *msg = [[SDLUnregisterAppInterface alloc] init];
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLUnsubscribeButton *)buildUnsubscribeButtonWithName:(SDLButtonName)buttonName correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLUnsubscribeButton *msg = [[SDLUnsubscribeButton alloc] init];
-    msg.buttonName = buttonName;
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLUnsubscribeVehicleData *)buildUnsubscribeVehicleDataWithGPS:(NSNumber<SDLBool> *)gps speed:(NSNumber<SDLBool> *)speed rpm:(NSNumber<SDLBool> *)rpm fuelLevel:(NSNumber<SDLBool> *)fuelLevel fuelLevelState:(NSNumber<SDLBool> *)fuelLevelState instantFuelConsumption:(NSNumber<SDLBool> *)instantFuelConsumption externalTemperature:(NSNumber<SDLBool> *)externalTemperature prndl:(NSNumber<SDLBool> *)prndl tirePressure:(NSNumber<SDLBool> *)tirePressure odometer:(NSNumber<SDLBool> *)odometer beltStatus:(NSNumber<SDLBool> *)beltStatus bodyInformation:(NSNumber<SDLBool> *)bodyInformation deviceStatus:(NSNumber<SDLBool> *)deviceStatus driverBraking:(NSNumber<SDLBool> *)driverBraking wiperStatus:(NSNumber<SDLBool> *)wiperStatus headLampStatus:(NSNumber<SDLBool> *)headLampStatus engineTorque:(NSNumber<SDLBool> *)engineTorque accPedalPosition:(NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(NSNumber<SDLBool> *)steeringWheelAngle correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLUnsubscribeVehicleData *msg = [[SDLUnsubscribeVehicleData alloc] init];
-    msg.gps = gps;
-    msg.speed = speed;
-    msg.rpm = rpm;
-    msg.fuelLevel = fuelLevel;
-    msg.fuelLevel_State = fuelLevelState;
-    msg.instantFuelConsumption = instantFuelConsumption;
-    msg.externalTemperature = externalTemperature;
-    msg.prndl = prndl;
-    msg.tirePressure = tirePressure;
-    msg.odometer = odometer;
-    msg.beltStatus = beltStatus;
-    msg.bodyInformation = bodyInformation;
-    msg.deviceStatus = deviceStatus;
-    msg.driverBraking = driverBraking;
-    msg.wiperStatus = wiperStatus;
-    msg.headLampStatus = headLampStatus;
-    msg.engineTorque = engineTorque;
-    msg.accPedalPosition = accPedalPosition;
-    msg.steeringWheelAngle = steeringWheelAngle;
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-+ (SDLUpdateTurnList *)buildUpdateTurnListWithTurnList:(NSMutableArray<SDLTurn *> *)turnList softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(nullable NSNumber<SDLInt> *)correlationID {
-    SDLUpdateTurnList *msg = [[SDLUpdateTurnList alloc] init];
-    msg.turnList = [turnList mutableCopy];
-    msg.softButtons = [softButtons mutableCopy];
-    msg.correlationID = correlationID;
-
-    return msg;
-}
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLRPCResponse.m b/SmartDeviceLink/SDLRPCResponse.m
index 62bcb5e61..f27369270 100644
--- a/SmartDeviceLink/SDLRPCResponse.m
+++ b/SmartDeviceLink/SDLRPCResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLRPCResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "SDLResult.h"
 
@@ -18,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
     }
 
     messageType = SDLNameResponse;
-    [store setObject:function forKey:messageType];
+    [store sdl_setObject:function forName:messageType];
 
     return self;
 }
@@ -30,58 +31,41 @@ NS_ASSUME_NONNULL_BEGIN
     }
 
     messageType = SDLNameResponse;
-    [store setObject:function forKey:messageType];
-
+    [store sdl_setObject:function forName:messageType];
+    
     return self;
 }
 
 - (NSNumber<SDLInt> *)correlationID {
-    return [function objectForKey:SDLNameCorrelationId];
+    return [function sdl_objectForName:SDLNameCorrelationId];
 }
 
 - (void)setCorrelationID:(NSNumber<SDLInt> *)corrID {
-    if (corrID != nil) {
-        [function setObject:corrID forKey:SDLNameCorrelationId];
-    } else {
-        [function removeObjectForKey:SDLNameCorrelationId];
-    }
+    [function sdl_setObject:corrID forName:SDLNameCorrelationId];
 }
 
 - (void)setSuccess:(NSNumber<SDLBool> *)success {
-    if (success != nil) {
-        [parameters setObject:success forKey:SDLNameSuccess];
-    } else {
-        [parameters removeObjectForKey:SDLNameSuccess];
-    }
+    [store sdl_setObject:success forName:SDLNameSuccess];
 }
 
 - (NSNumber<SDLBool> *)success {
-    return [parameters objectForKey:SDLNameSuccess];
+    return [store sdl_objectForName:SDLNameSuccess];
 }
 
 - (void)setResultCode:(SDLResult)resultCode {
-    if (resultCode != nil) {
-        [parameters setObject:resultCode forKey:SDLNameResultCode];
-    } else {
-        [parameters removeObjectForKey:SDLNameResultCode];
-    }
+    [store sdl_setObject:resultCode forName:SDLNameResultCode];
 }
 
 - (SDLResult)resultCode {
-    NSObject *obj = [parameters objectForKey:SDLNameResultCode];
-    return (SDLResult)obj;
+    return [store sdl_objectForName:SDLNameResultCode];
 }
 
 - (void)setInfo:(nullable NSString *)info {
-    if (info != nil) {
-        [parameters setObject:info forKey:SDLNameInfo];
-    } else {
-        [parameters removeObjectForKey:SDLNameInfo];
-    }
+    [store sdl_setObject:info forName:SDLNameInfo];
 }
 
 - (nullable NSString *)info {
-    return [parameters objectForKey:SDLNameInfo];
+    return [store sdl_objectForName:SDLNameInfo];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLReadDID.m b/SmartDeviceLink/SDLReadDID.m
index c41ba5a8d..5c491825e 100644
--- a/SmartDeviceLink/SDLReadDID.m
+++ b/SmartDeviceLink/SDLReadDID.m
@@ -4,6 +4,7 @@
 
 #import "SDLReadDID.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -29,27 +30,19 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setEcuName:(NSNumber<SDLInt> *)ecuName {
-    if (ecuName != nil) {
-        [parameters setObject:ecuName forKey:SDLNameECUName];
-    } else {
-        [parameters removeObjectForKey:SDLNameECUName];
-    }
+    [parameters sdl_setObject:ecuName forName:SDLNameECUName];
 }
 
 - (NSNumber<SDLInt> *)ecuName {
-    return [parameters objectForKey:SDLNameECUName];
+    return [parameters sdl_objectForName:SDLNameECUName];
 }
 
 - (void)setDidLocation:(NSMutableArray<NSNumber<SDLInt> *> *)didLocation {
-    if (didLocation != nil) {
-        [parameters setObject:didLocation forKey:SDLNameDIDLocation];
-    } else {
-        [parameters removeObjectForKey:SDLNameDIDLocation];
-    }
+    [parameters sdl_setObject:didLocation forName:SDLNameDIDLocation];
 }
 
 - (NSMutableArray<NSNumber<SDLInt> *> *)didLocation {
-    return [parameters objectForKey:SDLNameDIDLocation];
+    return [parameters sdl_objectForName:SDLNameDIDLocation];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLReadDIDResponse.m b/SmartDeviceLink/SDLReadDIDResponse.m
index 48651fff1..a0f71b20e 100644
--- a/SmartDeviceLink/SDLReadDIDResponse.m
+++ b/SmartDeviceLink/SDLReadDIDResponse.m
@@ -4,9 +4,12 @@
 
 #import "SDLReadDIDResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLDIDResult.h"
 #import "SDLNames.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @implementation SDLReadDIDResponse
 
 - (instancetype)init {
@@ -16,24 +19,13 @@
 }
 
 - (void)setDidResult:(nullable NSMutableArray<SDLDIDResult *> *)didResult {
-    if (didResult != nil) {
-        [parameters setObject:didResult forKey:SDLNameDIDResult];
-    } else {
-        [parameters removeObjectForKey:SDLNameDIDResult];
-    }
+    [parameters sdl_setObject:didResult forName:SDLNameDIDResult];
 }
 
 - (nullable NSMutableArray<SDLDIDResult *> *)didResult {
-    NSMutableArray<SDLDIDResult *> *array = [parameters objectForKey:SDLNameDIDResult];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLDIDResult.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLDIDResult *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLDIDResult alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameDIDResult ofClass:SDLDIDResult.class];
 }
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLRegisterAppInterface.m b/SmartDeviceLink/SDLRegisterAppInterface.m
index 8d01abe89..acf94b418 100644
--- a/SmartDeviceLink/SDLRegisterAppInterface.m
+++ b/SmartDeviceLink/SDLRegisterAppInterface.m
@@ -4,6 +4,7 @@
 
 #import "SDLRegisterAppInterface.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLAppHMIType.h"
 #import "SDLAppInfo.h"
 #import "SDLDeviceInfo.h"
@@ -78,196 +79,107 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setSyncMsgVersion:(SDLSyncMsgVersion *)syncMsgVersion {
-    if (syncMsgVersion != nil) {
-        [parameters setObject:syncMsgVersion forKey:SDLNameSyncMessageVersion];
-    } else {
-        [parameters removeObjectForKey:SDLNameSyncMessageVersion];
-    }
+    [parameters sdl_setObject:syncMsgVersion forName:SDLNameSyncMessageVersion];
 }
 
 - (SDLSyncMsgVersion *)syncMsgVersion {
-    NSObject *obj = [parameters objectForKey:SDLNameSyncMessageVersion];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLSyncMsgVersion alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLSyncMsgVersion*)obj;
-
-    
+    return [parameters sdl_objectForName:SDLNameSyncMessageVersion ofClass:SDLSyncMsgVersion.class];
 }
 
 - (void)setAppName:(NSString *)appName {
-    if (appName != nil) {
-        [parameters setObject:appName forKey:SDLNameAppName];
-    } else {
-        [parameters removeObjectForKey:SDLNameAppName];
-    }
+    [parameters sdl_setObject:appName forName:SDLNameAppName];
 }
 
 - (NSString *)appName {
-    return [parameters objectForKey:SDLNameAppName];
+    return [parameters sdl_objectForName:SDLNameAppName];
 }
 
 - (void)setTtsName:(nullable NSMutableArray<SDLTTSChunk *> *)ttsName {
-    if (ttsName != nil) {
-        [parameters setObject:ttsName forKey:SDLNameTTSName];
-    } else {
-        [parameters removeObjectForKey:SDLNameTTSName];
-    }
+    [parameters sdl_setObject:ttsName forName:SDLNameTTSName];
 }
 
 - (nullable NSMutableArray<SDLTTSChunk *> *)ttsName {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameTTSName];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLTTSChunk *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameTTSName ofClass:SDLTTSChunk.class];
 }
 
 - (void)setNgnMediaScreenAppName:(nullable NSString *)ngnMediaScreenAppName {
-    if (ngnMediaScreenAppName != nil) {
-        [parameters setObject:ngnMediaScreenAppName forKey:SDLNameNGNMediaScreenAppName];
-    } else {
-        [parameters removeObjectForKey:SDLNameNGNMediaScreenAppName];
-    }
+    [parameters sdl_setObject:ngnMediaScreenAppName forName:SDLNameNGNMediaScreenAppName];
 }
 
 - (nullable NSString *)ngnMediaScreenAppName {
-    return [parameters objectForKey:SDLNameNGNMediaScreenAppName];
+    return [parameters sdl_objectForName:SDLNameNGNMediaScreenAppName];
 }
 
 - (void)setVrSynonyms:(nullable NSMutableArray<NSString *> *)vrSynonyms {
-    if (vrSynonyms != nil) {
-        [parameters setObject:vrSynonyms forKey:SDLNameVRSynonyms];
-    } else {
-        [parameters removeObjectForKey:SDLNameVRSynonyms];
-    }
+    [parameters sdl_setObject:vrSynonyms forName:SDLNameVRSynonyms];
 }
 
 - (nullable NSMutableArray<NSString *> *)vrSynonyms {
-    return [parameters objectForKey:SDLNameVRSynonyms];
+    return [parameters sdl_objectForName:SDLNameVRSynonyms];
 }
 
 - (void)setIsMediaApplication:(NSNumber<SDLBool> *)isMediaApplication {
-    if (isMediaApplication != nil) {
-        [parameters setObject:isMediaApplication forKey:SDLNameIsMediaApplication];
-    } else {
-        [parameters removeObjectForKey:SDLNameIsMediaApplication];
-    }
+    [parameters sdl_setObject:isMediaApplication forName:SDLNameIsMediaApplication];
 }
 
 - (NSNumber<SDLBool> *)isMediaApplication {
-    return [parameters objectForKey:SDLNameIsMediaApplication];
+    return [parameters sdl_objectForName:SDLNameIsMediaApplication];
 }
 
 - (void)setLanguageDesired:(SDLLanguage)languageDesired {
-    if (languageDesired != nil) {
-        [parameters setObject:languageDesired forKey:SDLNameLanguageDesired];
-    } else {
-        [parameters removeObjectForKey:SDLNameLanguageDesired];
-    }
+    [parameters sdl_setObject:languageDesired forName:SDLNameLanguageDesired];
 }
 
 - (SDLLanguage)languageDesired {
-    NSObject *obj = [parameters objectForKey:SDLNameLanguageDesired];
-    return (SDLLanguage)obj;
+    return [parameters sdl_objectForName:SDLNameLanguageDesired];
 }
 
 - (void)setHmiDisplayLanguageDesired:(SDLLanguage)hmiDisplayLanguageDesired {
-    if (hmiDisplayLanguageDesired != nil) {
-        [parameters setObject:hmiDisplayLanguageDesired forKey:SDLNameHMIDisplayLanguageDesired];
-    } else {
-        [parameters removeObjectForKey:SDLNameHMIDisplayLanguageDesired];
-    }
+    [parameters sdl_setObject:hmiDisplayLanguageDesired forName:SDLNameHMIDisplayLanguageDesired];
 }
 
 - (SDLLanguage)hmiDisplayLanguageDesired {
-    NSObject *obj = [parameters objectForKey:SDLNameHMIDisplayLanguageDesired];
-    return (SDLLanguage)obj;
+    return [parameters sdl_objectForName:SDLNameHMIDisplayLanguageDesired];
 }
 
 - (void)setAppHMIType:(nullable NSMutableArray<SDLAppHMIType> *)appHMIType {
-    if (appHMIType != nil) {
-        [parameters setObject:appHMIType forKey:SDLNameAppHMIType];
-    } else {
-        [parameters removeObjectForKey:SDLNameAppHMIType];
-    }
+    [parameters sdl_setObject:appHMIType forName:SDLNameAppHMIType];
 }
 
 - (nullable NSMutableArray<SDLAppHMIType> *)appHMIType {
-    NSMutableArray<SDLAppHMIType> *array = [parameters objectForKey:SDLNameAppHMIType];
-    if ([array count] < 1) {
-        return array;
-    } else {
-        NSMutableArray<SDLAppHMIType> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSString *enumString in array) {
-            [newList addObject:(SDLAppHMIType)enumString];
-        }
-        return newList;
-    }
+    return [parameters sdl_enumsForName:SDLNameAppHMIType];
 }
 
 - (void)setHashID:(nullable NSString *)hashID {
-    if (hashID != nil) {
-        [parameters setObject:hashID forKey:SDLNameHashId];
-    } else {
-        [parameters removeObjectForKey:SDLNameHashId];
-    }
+    [parameters sdl_setObject:hashID forName:SDLNameHashId];
 }
 
 - (nullable NSString *)hashID {
-    return [parameters objectForKey:SDLNameHashId];
+    return [parameters sdl_objectForName:SDLNameHashId];
 }
 
 - (void)setDeviceInfo:(nullable SDLDeviceInfo *)deviceInfo {
-    if (deviceInfo != nil) {
-        [parameters setObject:deviceInfo forKey:SDLNameDeviceInfo];
-    } else {
-        [parameters removeObjectForKey:SDLNameDeviceInfo];
-    }
+    [parameters sdl_setObject:deviceInfo forName:SDLNameDeviceInfo];
 }
 
 - (nullable SDLDeviceInfo *)deviceInfo {
-    NSObject *obj = [parameters objectForKey:SDLNameDeviceInfo];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLDeviceInfo alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLDeviceInfo*)obj;
+    return [parameters sdl_objectForName:SDLNameDeviceInfo ofClass:SDLDeviceInfo.class];
 }
 
 - (void)setAppID:(NSString *)appID {
-    if (appID != nil) {
-        [parameters setObject:appID forKey:SDLNameAppId];
-    } else {
-        [parameters removeObjectForKey:SDLNameAppId];
-    }
+    [parameters sdl_setObject:appID forName:SDLNameAppId];
 }
 
 - (NSString *)appID {
-    return [parameters objectForKey:SDLNameAppId];
+    return [parameters sdl_objectForName:SDLNameAppId];
 }
 
 - (void)setAppInfo:(nullable SDLAppInfo *)appInfo {
-    if (appInfo != nil) {
-        [parameters setObject:appInfo forKey:SDLNameAppInfo];
-    } else {
-        [parameters removeObjectForKey:SDLNameAppInfo];
-    }
+    [parameters sdl_setObject:appInfo forName:SDLNameAppInfo];
 }
 
 - (nullable SDLAppInfo *)appInfo {
-    NSObject *obj = [parameters objectForKey:SDLNameAppInfo];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLAppInfo alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLAppInfo*)obj;
+    return [parameters sdl_objectForName:SDLNameAppInfo ofClass:SDLAppInfo.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
index e6f928edb..e26c64431 100644
--- a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
+++ b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLRegisterAppInterfaceResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLAudioPassThruCapabilities.h"
 #import "SDLButtonCapabilities.h"
 #import "SDLDisplayCapabilities.h"
@@ -14,6 +15,8 @@
 #import "SDLSyncMsgVersion.h"
 #import "SDLVehicleType.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @implementation SDLRegisterAppInterfaceResponse
 
 - (instancetype)init {
@@ -23,297 +26,141 @@
 }
 
 - (void)setSyncMsgVersion:(nullable SDLSyncMsgVersion *)syncMsgVersion {
-    if (syncMsgVersion != nil) {
-        [parameters setObject:syncMsgVersion forKey:SDLNameSyncMessageVersion];
-    } else {
-        [parameters removeObjectForKey:SDLNameSyncMessageVersion];
-    }
+    [parameters sdl_setObject:syncMsgVersion forName:SDLNameSyncMessageVersion];
 }
 
 - (nullable SDLSyncMsgVersion *)syncMsgVersion {
-    NSObject *obj = [parameters objectForKey:SDLNameSyncMessageVersion];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLSyncMsgVersion alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLSyncMsgVersion*)obj;
+    return [parameters sdl_objectForName:SDLNameSyncMessageVersion ofClass:SDLSyncMsgVersion.class];
 }
 
 - (void)setLanguage:(nullable SDLLanguage)language {
-    if (language != nil) {
-        [parameters setObject:language forKey:SDLNameLanguage];
-    } else {
-        [parameters removeObjectForKey:SDLNameLanguage];
-    }
+    [parameters sdl_setObject:language forName:SDLNameLanguage];
 }
 
 - (nullable SDLLanguage)language {
-    NSObject *obj = [parameters objectForKey:SDLNameLanguage];
-    return (SDLLanguage)obj;
+    return [parameters sdl_objectForName:SDLNameLanguage];
 }
 
 - (void)setHmiDisplayLanguage:(nullable SDLLanguage)hmiDisplayLanguage {
-    if (hmiDisplayLanguage != nil) {
-        [parameters setObject:hmiDisplayLanguage forKey:SDLNameHMIDisplayLanguage];
-    } else {
-        [parameters removeObjectForKey:SDLNameHMIDisplayLanguage];
-    }
+    [parameters sdl_setObject:hmiDisplayLanguage forName:SDLNameHMIDisplayLanguage];
 }
 
 - (nullable SDLLanguage)hmiDisplayLanguage {
-    NSObject *obj = [parameters objectForKey:SDLNameHMIDisplayLanguage];
-    return (SDLLanguage)obj;
+    return [parameters sdl_objectForName:SDLNameHMIDisplayLanguage];
 }
 
 - (void)setDisplayCapabilities:(nullable SDLDisplayCapabilities *)displayCapabilities {
-    if (displayCapabilities != nil) {
-        [parameters setObject:displayCapabilities forKey:SDLNameDisplayCapabilities];
-    } else {
-        [parameters removeObjectForKey:SDLNameDisplayCapabilities];
-    }
+    [parameters sdl_setObject:displayCapabilities forName:SDLNameDisplayCapabilities];
 }
 
 - (nullable SDLDisplayCapabilities *)displayCapabilities {
-    NSObject *obj = [parameters objectForKey:SDLNameDisplayCapabilities];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLDisplayCapabilities alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLDisplayCapabilities*)obj;
+    return [parameters sdl_objectForName:SDLNameDisplayCapabilities ofClass:SDLDisplayCapabilities.class];
 }
 
 - (void)setButtonCapabilities:(nullable NSMutableArray<SDLButtonCapabilities *> *)buttonCapabilities {
-    if (buttonCapabilities != nil) {
-        [parameters setObject:buttonCapabilities forKey:SDLNameButtonCapabilities];
-    } else {
-        [parameters removeObjectForKey:SDLNameButtonCapabilities];
-    }
+    [parameters sdl_setObject:buttonCapabilities forName:SDLNameButtonCapabilities];
 }
 
 - (nullable NSMutableArray<SDLButtonCapabilities *> *)buttonCapabilities {
-    NSMutableArray<SDLButtonCapabilities *> *array = [parameters objectForKey:SDLNameButtonCapabilities];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLButtonCapabilities.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLButtonCapabilities *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLButtonCapabilities alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameButtonCapabilities ofClass:SDLButtonCapabilities.class];
 }
 
 - (void)setSoftButtonCapabilities:(nullable NSMutableArray<SDLSoftButtonCapabilities *> *)softButtonCapabilities {
-    if (softButtonCapabilities != nil) {
-        [parameters setObject:softButtonCapabilities forKey:SDLNameSoftButtonCapabilities];
-    } else {
-        [parameters removeObjectForKey:SDLNameSoftButtonCapabilities];
-    }
+    [parameters sdl_setObject:softButtonCapabilities forName:SDLNameSoftButtonCapabilities];
 }
 
 - (nullable NSMutableArray<SDLSoftButtonCapabilities *> *)softButtonCapabilities {
-    NSMutableArray<SDLSoftButtonCapabilities *> *array = [parameters objectForKey:SDLNameSoftButtonCapabilities];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButtonCapabilities.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLSoftButtonCapabilities *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLSoftButtonCapabilities alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameSoftButtonCapabilities ofClass:SDLSoftButtonCapabilities.class];
 }
 
 - (void)setPresetBankCapabilities:(nullable SDLPresetBankCapabilities *)presetBankCapabilities {
-    if (presetBankCapabilities != nil) {
-        [parameters setObject:presetBankCapabilities forKey:SDLNamePresetBankCapabilities];
-    } else {
-        [parameters removeObjectForKey:SDLNamePresetBankCapabilities];
-    }
+    [parameters sdl_setObject:presetBankCapabilities forName:SDLNamePresetBankCapabilities];
 }
 
 - (nullable SDLPresetBankCapabilities *)presetBankCapabilities {
-    NSObject *obj = [parameters objectForKey:SDLNamePresetBankCapabilities];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLPresetBankCapabilities alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLPresetBankCapabilities*)obj;
+    return [parameters sdl_objectForName:SDLNamePresetBankCapabilities ofClass:SDLPresetBankCapabilities.class];
 }
 
 - (void)setHmiZoneCapabilities:(nullable NSMutableArray<SDLHMIZoneCapabilities> *)hmiZoneCapabilities {
-    if (hmiZoneCapabilities != nil) {
-        [parameters setObject:hmiZoneCapabilities forKey:SDLNameHMIZoneCapabilities];
-    } else {
-        [parameters removeObjectForKey:SDLNameHMIZoneCapabilities];
-    }
+    [parameters sdl_setObject:hmiZoneCapabilities forName:SDLNameHMIZoneCapabilities];
 }
 
 - (nullable NSMutableArray<SDLHMIZoneCapabilities> *)hmiZoneCapabilities {
-    NSMutableArray<SDLHMIZoneCapabilities> *array = [parameters objectForKey:SDLNameHMIZoneCapabilities];
-    if ([array count] < 1) {
-        return array;
-    } else {
-        NSMutableArray<SDLHMIZoneCapabilities> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSString *enumString in array) {
-            [newList addObject:(SDLHMIZoneCapabilities)enumString];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectForName:SDLNameHMIZoneCapabilities];
 }
 
 - (void)setSpeechCapabilities:(nullable NSMutableArray<SDLSpeechCapabilities> *)speechCapabilities {
-    if (speechCapabilities != nil) {
-        [parameters setObject:speechCapabilities forKey:SDLNameSpeechCapabilities];
-    } else {
-        [parameters removeObjectForKey:SDLNameSpeechCapabilities];
-    }
+    [parameters sdl_setObject:speechCapabilities forName:SDLNameSpeechCapabilities];
 }
 
 - (nullable NSMutableArray<SDLSpeechCapabilities> *)speechCapabilities {
-    NSMutableArray<SDLSpeechCapabilities> *array = [parameters objectForKey:SDLNameSpeechCapabilities];
-    if ([array count] < 1) {
-        return array;
-    } else {
-        NSMutableArray<SDLSpeechCapabilities> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSString *enumString in array) {
-            [newList addObject:(SDLSpeechCapabilities)enumString];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectForName:SDLNameSpeechCapabilities];
 }
 
 - (void)setPrerecordedSpeech:(nullable NSMutableArray<SDLPrerecordedSpeech> *)prerecordedSpeech {
-    if (prerecordedSpeech != nil) {
-        [parameters setObject:prerecordedSpeech forKey:SDLNamePrerecordedSpeech];
-    } else {
-        [parameters removeObjectForKey:SDLNamePrerecordedSpeech];
-    }
+    [parameters sdl_setObject:prerecordedSpeech forName:SDLNamePrerecordedSpeech];
 }
 
 - (nullable NSMutableArray<SDLPrerecordedSpeech> *)prerecordedSpeech {
-    NSMutableArray<SDLPrerecordedSpeech> *array = [parameters objectForKey:SDLNamePrerecordedSpeech];
-    if ([array count] < 1) {
-        return array;
-    } else {
-        NSMutableArray<SDLPrerecordedSpeech> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSString *enumString in array) {
-            [newList addObject:(SDLPrerecordedSpeech)enumString];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectForName:SDLNamePrerecordedSpeech];
 }
 
 - (void)setVrCapabilities:(nullable NSMutableArray<SDLVRCapabilities> *)vrCapabilities {
-    if (vrCapabilities != nil) {
-        [parameters setObject:vrCapabilities forKey:SDLNameVRCapabilities];
-    } else {
-        [parameters removeObjectForKey:SDLNameVRCapabilities];
-    }
+    [parameters sdl_setObject:vrCapabilities forName:SDLNameVRCapabilities];
 }
 
 - (nullable NSMutableArray<SDLVRCapabilities> *)vrCapabilities {
-    NSMutableArray<SDLVRCapabilities> *array = [parameters objectForKey:SDLNameVRCapabilities];
-    if ([array count] < 1) {
-        return array;
-    } else {
-        NSMutableArray<SDLVRCapabilities> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSString *enumString in array) {
-            [newList addObject:(SDLVRCapabilities)enumString];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectForName:SDLNameVRCapabilities];
 }
 
 - (void)setAudioPassThruCapabilities:(nullable NSMutableArray<SDLAudioPassThruCapabilities *> *)audioPassThruCapabilities {
-    if (audioPassThruCapabilities != nil) {
-        [parameters setObject:audioPassThruCapabilities forKey:SDLNameAudioPassThruCapabilities];
-    } else {
-        [parameters removeObjectForKey:SDLNameAudioPassThruCapabilities];
-    }
+    [parameters sdl_setObject:audioPassThruCapabilities forName:SDLNameAudioPassThruCapabilities];
 }
 
 - (nullable NSMutableArray<SDLAudioPassThruCapabilities *> *)audioPassThruCapabilities {
-    NSMutableArray<SDLAudioPassThruCapabilities *> *array = [parameters objectForKey:SDLNameAudioPassThruCapabilities];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLAudioPassThruCapabilities.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLAudioPassThruCapabilities *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLAudioPassThruCapabilities alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameAudioPassThruCapabilities ofClass:SDLAudioPassThruCapabilities.class];
 }
 
 - (void)setVehicleType:(nullable SDLVehicleType *)vehicleType {
-    if (vehicleType != nil) {
-        [parameters setObject:vehicleType forKey:SDLNameVehicleType];
-    } else {
-        [parameters removeObjectForKey:SDLNameVehicleType];
-    }
+    [parameters sdl_setObject:vehicleType forName:SDLNameVehicleType];
 }
 
 - (nullable SDLVehicleType *)vehicleType {
-    NSObject *obj = [parameters objectForKey:SDLNameVehicleType];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleType alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleType*)obj;
+    return [parameters sdl_objectForName:SDLNameVehicleType ofClass:SDLVehicleType.class];
 }
 
 - (void)setSupportedDiagModes:(nullable NSMutableArray<NSNumber<SDLInt> *> *)supportedDiagModes {
-    if (supportedDiagModes != nil) {
-        [parameters setObject:supportedDiagModes forKey:SDLNameSupportedDiagnosticModes];
-    } else {
-        [parameters removeObjectForKey:SDLNameSupportedDiagnosticModes];
-    }
+    [parameters sdl_setObject:supportedDiagModes forName:SDLNameSupportedDiagnosticModes];
 }
 
 - (nullable NSMutableArray<NSNumber<SDLInt> *> *)supportedDiagModes {
-    return [parameters objectForKey:SDLNameSupportedDiagnosticModes];
+    return [parameters sdl_objectForName:SDLNameSupportedDiagnosticModes];
 }
 
 - (void)setHmiCapabilities:(nullable SDLHMICapabilities *)hmiCapabilities {
-    if (hmiCapabilities != nil) {
-        [parameters setObject:hmiCapabilities forKey:SDLNameHMICapabilities];
-    } else {
-        [parameters removeObjectForKey:SDLNameHMICapabilities];
-    }
+    [parameters sdl_setObject:hmiCapabilities forName:SDLNameHMICapabilities];
 }
 
 - (nullable SDLHMICapabilities *)hmiCapabilities {
-    NSObject *obj = [parameters objectForKey:SDLNameHMICapabilities];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLHMICapabilities alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLHMICapabilities*)obj;
+    return [parameters sdl_objectForName:SDLNameHMICapabilities ofClass:SDLHMICapabilities.class];
 }
 
 - (void)setSdlVersion:(nullable NSString *)sdlVersion {
-    if (sdlVersion != nil) {
-        parameters[SDLNameSDLVersion] = sdlVersion;
-    } else {
-        [parameters removeObjectForKey:SDLNameSDLVersion];
-    }
+    [parameters sdl_setObject:sdlVersion forName:SDLNameSDLVersion];
 }
 
 - (nullable NSString *)sdlVersion {
-    return parameters[SDLNameSDLVersion];
+    return [parameters sdl_objectForName:SDLNameSDLVersion];
 }
 
 - (void)setSystemSoftwareVersion:(nullable NSString *)systemSoftwareVersion {
-    if (systemSoftwareVersion != nil) {
-        parameters[SDLNameSystemSoftwareVersion] = systemSoftwareVersion;
-    } else {
-        [parameters removeObjectForKey:SDLNameSystemSoftwareVersion];
-    }
+    [parameters sdl_setObject:systemSoftwareVersion forName:SDLNameSystemSoftwareVersion];
 }
 
 - (nullable NSString *)systemSoftwareVersion {
-    return parameters[SDLNameSystemSoftwareVersion];
+    return [parameters sdl_objectForName:SDLNameSystemSoftwareVersion];
 }
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLResetGlobalProperties.m b/SmartDeviceLink/SDLResetGlobalProperties.m
index c31121329..8c7b317b4 100644
--- a/SmartDeviceLink/SDLResetGlobalProperties.m
+++ b/SmartDeviceLink/SDLResetGlobalProperties.m
@@ -4,6 +4,7 @@
 
 #import "SDLResetGlobalProperties.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLGlobalProperty.h"
 #import "SDLNames.h"
 
@@ -29,24 +30,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setProperties:(NSMutableArray<SDLGlobalProperty> *)properties {
-    if (properties != nil) {
-        [parameters setObject:properties forKey:SDLNameProperties];
-    } else {
-        [parameters removeObjectForKey:SDLNameProperties];
-    }
+    [parameters sdl_setObject:properties forName:SDLNameProperties];
 }
 
 - (NSMutableArray<SDLGlobalProperty> *)properties {
-    NSMutableArray<SDLGlobalProperty> *array = [parameters objectForKey:SDLNameProperties];
-    if ([array count] < 1) {
-        return array;
-    } else {
-        NSMutableArray<SDLGlobalProperty> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSString *enumString in array) {
-            [newList addObject:(SDLGlobalProperty)enumString];
-        }
-        return newList;
-    }
+    return [parameters sdl_enumsForName:SDLNameProperties];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m
index 30b85e13a..4db428b7b 100644
--- a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m
+++ b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLResetGlobalPropertiesResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLScreenParams.m b/SmartDeviceLink/SDLScreenParams.m
index 22a425472..d531dfadd 100644
--- a/SmartDeviceLink/SDLScreenParams.m
+++ b/SmartDeviceLink/SDLScreenParams.m
@@ -3,6 +3,7 @@
 
 #import "SDLScreenParams.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLImageResolution.h"
 #import "SDLNames.h"
 #import "SDLTouchEventCapabilities.h"
@@ -12,37 +13,19 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLScreenParams
 
 - (void)setResolution:(SDLImageResolution *)resolution {
-    if (resolution != nil) {
-        [store setObject:resolution forKey:SDLNameResolution];
-    } else {
-        [store removeObjectForKey:SDLNameResolution];
-    }
+    [store sdl_setObject:resolution forName:SDLNameResolution];
 }
 
 - (SDLImageResolution *)resolution {
-    NSObject *obj = [store objectForKey:SDLNameResolution];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLImageResolution alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLImageResolution*)obj;
+    return [store sdl_objectForName:SDLNameResolution ofClass:SDLImageResolution.class];
 }
 
 - (void)setTouchEventAvailable:(nullable SDLTouchEventCapabilities *)touchEventAvailable {
-    if (touchEventAvailable != nil) {
-        [store setObject:touchEventAvailable forKey:SDLNameTouchEventAvailable];
-    } else {
-        [store removeObjectForKey:SDLNameTouchEventAvailable];
-    }
+    [store sdl_setObject:touchEventAvailable forName:SDLNameTouchEventAvailable];
 }
 
 - (nullable SDLTouchEventCapabilities *)touchEventAvailable {
-    NSObject *obj = [store objectForKey:SDLNameTouchEventAvailable];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLTouchEventCapabilities alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLTouchEventCapabilities*)obj;
+    return [store sdl_objectForName:SDLNameTouchEventAvailable ofClass:SDLTouchEventCapabilities.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLScrollableMessage.m b/SmartDeviceLink/SDLScrollableMessage.m
index 0af15c581..f156e5453 100644
--- a/SmartDeviceLink/SDLScrollableMessage.m
+++ b/SmartDeviceLink/SDLScrollableMessage.m
@@ -4,6 +4,7 @@
 
 #import "SDLScrollableMessage.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "SDLSoftButton.h"
 
@@ -41,48 +42,27 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setScrollableMessageBody:(NSString *)scrollableMessageBody {
-    if (scrollableMessageBody != nil) {
-        [parameters setObject:scrollableMessageBody forKey:SDLNameScrollableMessageBody];
-    } else {
-        [parameters removeObjectForKey:SDLNameScrollableMessageBody];
-    }
+    [parameters sdl_setObject:scrollableMessageBody forName:SDLNameScrollableMessageBody];
 }
 
 - (NSString *)scrollableMessageBody {
-    return [parameters objectForKey:SDLNameScrollableMessageBody];
+    return [parameters sdl_objectForName:SDLNameScrollableMessageBody];
 }
 
 - (void)setTimeout:(nullable NSNumber<SDLInt> *)timeout {
-    if (timeout != nil) {
-        [parameters setObject:timeout forKey:SDLNameTimeout];
-    } else {
-        [parameters removeObjectForKey:SDLNameTimeout];
-    }
+    [parameters sdl_setObject:timeout forName:SDLNameTimeout];
 }
 
 - (nullable NSNumber<SDLInt> *)timeout {
-    return [parameters objectForKey:SDLNameTimeout];
+    return [parameters sdl_objectForName:SDLNameTimeout];
 }
 
 - (void)setSoftButtons:(nullable NSMutableArray<SDLSoftButton *> *)softButtons {
-    if (softButtons != nil) {
-        [parameters setObject:softButtons forKey:SDLNameSoftButtons];
-    } else {
-        [parameters removeObjectForKey:SDLNameSoftButtons];
-    }
+    [parameters sdl_setObject:softButtons forName:SDLNameSoftButtons];
 }
 
 - (nullable NSMutableArray<SDLSoftButton *> *)softButtons {
-    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:SDLNameSoftButtons];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLSoftButton *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameSoftButtons ofClass:SDLSoftButton.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLScrollableMessageResponse.m b/SmartDeviceLink/SDLScrollableMessageResponse.m
index f9b00e33b..0777c3de2 100644
--- a/SmartDeviceLink/SDLScrollableMessageResponse.m
+++ b/SmartDeviceLink/SDLScrollableMessageResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLScrollableMessageResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 @implementation SDLScrollableMessageResponse
diff --git a/SmartDeviceLink/SDLSendLocation.m b/SmartDeviceLink/SDLSendLocation.m
index a4814166c..115c30a34 100644
--- a/SmartDeviceLink/SDLSendLocation.m
+++ b/SmartDeviceLink/SDLSendLocation.m
@@ -4,6 +4,7 @@
 
 #import "SDLSendLocation.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -44,138 +45,83 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setLongitudeDegrees:(nullable NSNumber<SDLFloat> *)longitudeDegrees {
-    if (longitudeDegrees != nil) {
-        parameters[SDLNameLongitudeDegrees] = longitudeDegrees;
-    } else {
-        [parameters removeObjectForKey:SDLNameLongitudeDegrees];
-    }
+    [parameters sdl_setObject:longitudeDegrees forName:SDLNameLongitudeDegrees];
 }
 
 - (nullable NSNumber<SDLFloat> *)longitudeDegrees {
-    return parameters[SDLNameLongitudeDegrees];
+    return [parameters sdl_objectForName:SDLNameLongitudeDegrees];
 }
 
 - (void)setLatitudeDegrees:(nullable NSNumber<SDLFloat> *)latitudeDegrees {
-    if (latitudeDegrees != nil) {
-        parameters[SDLNameLatitudeDegrees] = latitudeDegrees;
-    } else {
-        [parameters removeObjectForKey:SDLNameLatitudeDegrees];
-    }
+    [parameters sdl_setObject:latitudeDegrees forName:SDLNameLatitudeDegrees];
 }
 
 - (nullable NSNumber<SDLFloat> *)latitudeDegrees {
-    return parameters[SDLNameLatitudeDegrees];
+    return [parameters sdl_objectForName:SDLNameLatitudeDegrees];
 }
 
 - (void)setLocationName:(nullable NSString *)locationName {
-    if (locationName != nil) {
-        parameters[SDLNameLocationName] = locationName;
-    } else {
-        [parameters removeObjectForKey:SDLNameLocationName];
-    }
+    [parameters sdl_setObject:locationName forName:SDLNameLocationName];
 }
 
 - (nullable NSString *)locationName {
-    return parameters[SDLNameLocationName];
+    return [parameters sdl_objectForName:SDLNameLocationName];
 }
 
 - (void)setAddressLines:(nullable NSArray<NSString *> *)addressLines {
-    if (addressLines != nil) {
-        parameters[SDLNameAddressLines] = addressLines;
-    } else {
-        [parameters removeObjectForKey:SDLNameAddressLines];
-    }
+    [parameters sdl_setObject:addressLines forName:SDLNameAddressLines];
 }
 
 - (nullable NSString *)locationDescription {
-    return parameters[SDLNameLocationDescription];
+    return [parameters sdl_objectForName:SDLNameLocationDescription];
 }
 
 - (void)setLocationDescription:(nullable NSString *)locationDescription {
-    if (locationDescription != nil) {
-        parameters[SDLNameLocationDescription] = locationDescription;
-    } else {
-        [parameters removeObjectForKey:SDLNameLocationDescription];
-    }
+    [parameters sdl_setObject:locationDescription forName:SDLNameLocationDescription];
 }
 
 - (nullable NSArray<NSString *> *)addressLines {
-    return parameters[SDLNameAddressLines];
+    return [parameters sdl_objectForName:SDLNameAddressLines];
 }
 
 - (void)setPhoneNumber:(nullable NSString *)phoneNumber {
-    if (phoneNumber != nil) {
-        parameters[SDLNamePhoneNumber] = phoneNumber;
-    } else {
-        [parameters removeObjectForKey:SDLNamePhoneNumber];
-    }
+    [parameters sdl_setObject:phoneNumber forName:SDLNamePhoneNumber];
 }
 
 - (nullable NSString *)phoneNumber {
-    return parameters[SDLNamePhoneNumber];
+    return [parameters sdl_objectForName:SDLNamePhoneNumber];
 }
 
 - (void)setLocationImage:(nullable SDLImage *)locationImage {
-    if (locationImage != nil) {
-        parameters[SDLNameLocationImage] = locationImage;
-    } else {
-        [parameters removeObjectForKey:SDLNameLocationImage];
-    }
+    [parameters sdl_setObject:locationImage forName:SDLNameLocationImage];
 }
 
 - (nullable SDLImage *)locationImage {
-    id obj = parameters[SDLNameLocationImage];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLImage*)obj;
+    return [parameters sdl_objectForName:SDLNameLocationImage ofClass:SDLImage.class];
 }
 
 - (void)setDeliveryMode:(nullable SDLDeliveryMode)deliveryMode {
-    if (deliveryMode != nil) {
-        parameters[SDLNameDeliveryMode] = deliveryMode;
-    } else {
-        [parameters removeObjectForKey:SDLNameDeliveryMode];
-    }
+    [parameters sdl_setObject:deliveryMode forName:SDLNameDeliveryMode];
 }
 
 - (nullable SDLDeliveryMode)deliveryMode {
-    return parameters[SDLNameDeliveryMode];
+    return [parameters sdl_objectForName:SDLNameDeliveryMode];
 }
 
 - (void)setTimeStamp:(nullable SDLDateTime *)timeStamp {
-    if (timeStamp != nil) {
-        parameters[SDLNameLocationTimeStamp] = timeStamp;
-    } else {
-        [parameters removeObjectForKey:SDLNameLocationTimeStamp];
-    }
+    [parameters sdl_setObject:timeStamp forName:SDLNameLocationTimeStamp];
 }
 
 - (nullable SDLDateTime *)timeStamp {
-    id obj = parameters[SDLNameLocationTimeStamp];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLDateTime alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLDateTime*)obj;
+    return [parameters sdl_objectForName:SDLNameLocationTimeStamp ofClass:SDLDateTime.class];
 }
 
 - (void)setAddress:(nullable SDLOasisAddress *)address {
-    if (address != nil) {
-        parameters[SDLNameAddress] = address;
-    } else {
-        [parameters removeObjectForKey:SDLNameAddress];
-    }
+    [parameters sdl_setObject:address forName:SDLNameAddress];
 }
 
 - (nullable SDLOasisAddress *)address {
-    id obj = parameters[SDLNameAddress];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLOasisAddress alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLOasisAddress*)obj;
+    return [parameters sdl_objectForName:SDLNameAddress ofClass:SDLOasisAddress.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSendLocationResponse.m b/SmartDeviceLink/SDLSendLocationResponse.m
index db339e753..3b03a5a67 100644
--- a/SmartDeviceLink/SDLSendLocationResponse.m
+++ b/SmartDeviceLink/SDLSendLocationResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLSendLocationResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLSetAppIcon.m b/SmartDeviceLink/SDLSetAppIcon.m
index 165318132..8287d18e8 100644
--- a/SmartDeviceLink/SDLSetAppIcon.m
+++ b/SmartDeviceLink/SDLSetAppIcon.m
@@ -4,6 +4,7 @@
 
 #import "SDLSetAppIcon.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 @implementation SDLSetAppIcon
@@ -26,15 +27,11 @@
 }
 
 - (void)setSyncFileName:(NSString *)syncFileName {
-    if (syncFileName != nil) {
-        [parameters setObject:syncFileName forKey:SDLNameSyncFileName];
-    } else {
-        [parameters removeObjectForKey:SDLNameSyncFileName];
-    }
+    [parameters sdl_setObject:syncFileName forName:SDLNameSyncFileName];
 }
 
 - (NSString *)syncFileName {
-    return [parameters objectForKey:SDLNameSyncFileName];
+    return [parameters sdl_objectForName:SDLNameSyncFileName];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSetAppIconResponse.m b/SmartDeviceLink/SDLSetAppIconResponse.m
index c5126ee30..2a0b72793 100644
--- a/SmartDeviceLink/SDLSetAppIconResponse.m
+++ b/SmartDeviceLink/SDLSetAppIconResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLSetAppIconResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLSetDisplayLayout.m b/SmartDeviceLink/SDLSetDisplayLayout.m
index 0a07830dd..21c8627f1 100644
--- a/SmartDeviceLink/SDLSetDisplayLayout.m
+++ b/SmartDeviceLink/SDLSetDisplayLayout.m
@@ -4,6 +4,7 @@
 
 #import "SDLSetDisplayLayout.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -32,15 +33,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setDisplayLayout:(NSString *)displayLayout {
-    if (displayLayout != nil) {
-        [parameters setObject:displayLayout forKey:SDLNameDisplayLayout];
-    } else {
-        [parameters removeObjectForKey:SDLNameDisplayLayout];
-    }
+    [parameters sdl_setObject:displayLayout forName:SDLNameDisplayLayout];
 }
 
 - (NSString *)displayLayout {
-    return [parameters objectForKey:SDLNameDisplayLayout];
+    return [parameters sdl_objectForName:SDLNameDisplayLayout];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSetDisplayLayoutResponse.m b/SmartDeviceLink/SDLSetDisplayLayoutResponse.m
index c5c790415..2d1795413 100644
--- a/SmartDeviceLink/SDLSetDisplayLayoutResponse.m
+++ b/SmartDeviceLink/SDLSetDisplayLayoutResponse.m
@@ -4,12 +4,15 @@
 
 #import "SDLSetDisplayLayoutResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLButtonCapabilities.h"
 #import "SDLDisplayCapabilities.h"
 #import "SDLNames.h"
 #import "SDLPresetBankCapabilities.h"
 #import "SDLSoftButtonCapabilities.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @implementation SDLSetDisplayLayoutResponse
 
 - (instancetype)init {
@@ -19,79 +22,37 @@
 }
 
 - (void)setDisplayCapabilities:(nullable SDLDisplayCapabilities *)displayCapabilities {
-    if (displayCapabilities != nil) {
-        [parameters setObject:displayCapabilities forKey:SDLNameDisplayCapabilities];
-    } else {
-        [parameters removeObjectForKey:SDLNameDisplayCapabilities];
-    }
+    [parameters sdl_setObject:displayCapabilities forName:SDLNameDisplayCapabilities];
 }
 
 - (nullable SDLDisplayCapabilities *)displayCapabilities {
-    NSObject *obj = [parameters objectForKey:SDLNameDisplayCapabilities];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLDisplayCapabilities alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLDisplayCapabilities*)obj;
+    return [parameters sdl_objectForName:SDLNameDisplayCapabilities ofClass:SDLDisplayCapabilities.class];
 }
 
 - (void)setButtonCapabilities:(nullable NSMutableArray<SDLButtonCapabilities *> *)buttonCapabilities {
-    if (buttonCapabilities != nil) {
-        [parameters setObject:buttonCapabilities forKey:SDLNameButtonCapabilities];
-    } else {
-        [parameters removeObjectForKey:SDLNameButtonCapabilities];
-    }
+    [parameters sdl_setObject:buttonCapabilities forName:SDLNameButtonCapabilities];
 }
 
 - (nullable NSMutableArray<SDLButtonCapabilities *> *)buttonCapabilities {
-    NSMutableArray<SDLButtonCapabilities *> *array = [parameters objectForKey:SDLNameButtonCapabilities];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLButtonCapabilities.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLButtonCapabilities *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLButtonCapabilities alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameButtonCapabilities ofClass:SDLButtonCapabilities.class];
 }
 
 - (void)setSoftButtonCapabilities:(nullable NSMutableArray<SDLSoftButtonCapabilities *> *)softButtonCapabilities {
-    if (softButtonCapabilities != nil) {
-        [parameters setObject:softButtonCapabilities forKey:SDLNameSoftButtonCapabilities];
-    } else {
-        [parameters removeObjectForKey:SDLNameSoftButtonCapabilities];
-    }
+    [parameters sdl_setObject:softButtonCapabilities forName:SDLNameSoftButtonCapabilities];
 }
 
 - (nullable NSMutableArray<SDLSoftButtonCapabilities *> *)softButtonCapabilities {
-    NSMutableArray<SDLSoftButtonCapabilities *> *array = [parameters objectForKey:SDLNameSoftButtonCapabilities];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButtonCapabilities.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLSoftButtonCapabilities *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLSoftButtonCapabilities alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameSoftButtonCapabilities ofClass:SDLSoftButtonCapabilities.class];
 }
 
 - (void)setPresetBankCapabilities:(nullable SDLPresetBankCapabilities *)presetBankCapabilities {
-    if (presetBankCapabilities != nil) {
-        [parameters setObject:presetBankCapabilities forKey:SDLNamePresetBankCapabilities];
-    } else {
-        [parameters removeObjectForKey:SDLNamePresetBankCapabilities];
-    }
+    [parameters sdl_setObject:presetBankCapabilities forName:SDLNamePresetBankCapabilities];
 }
 
 - (nullable SDLPresetBankCapabilities *)presetBankCapabilities {
-    NSObject *obj = [parameters objectForKey:SDLNamePresetBankCapabilities];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLPresetBankCapabilities alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLPresetBankCapabilities*)obj;
+    return [parameters sdl_objectForName:SDLNamePresetBankCapabilities ofClass:SDLPresetBankCapabilities.class];
 }
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLSetGlobalProperties.m b/SmartDeviceLink/SDLSetGlobalProperties.m
index 7df4f19d6..8cc46bdc1 100644
--- a/SmartDeviceLink/SDLSetGlobalProperties.m
+++ b/SmartDeviceLink/SDLSetGlobalProperties.m
@@ -4,6 +4,7 @@
 
 #import "SDLSetGlobalProperties.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLImage.h"
 #import "SDLKeyboardProperties.h"
 #import "SDLNames.h"
@@ -45,126 +46,60 @@ NS_ASSUME_NONNULL_BEGIN
     return self;
 }
 
-
 - (void)setHelpPrompt:(nullable NSMutableArray<SDLTTSChunk *> *)helpPrompt {
-    if (helpPrompt != nil) {
-        [parameters setObject:helpPrompt forKey:SDLNameHelpPrompt];
-    } else {
-        [parameters removeObjectForKey:SDLNameHelpPrompt];
-    }
+    [parameters sdl_setObject:helpPrompt forName:SDLNameHelpPrompt];
 }
 
 - (nullable NSMutableArray<SDLTTSChunk *> *)helpPrompt {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameHelpPrompt];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLTTSChunk *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameHelpPrompt ofClass:SDLTTSChunk.class];
 }
 
 - (void)setTimeoutPrompt:(nullable NSMutableArray<SDLTTSChunk *> *)timeoutPrompt {
-    if (timeoutPrompt != nil) {
-        [parameters setObject:timeoutPrompt forKey:SDLNameTimeoutPrompt];
-    } else {
-        [parameters removeObjectForKey:SDLNameTimeoutPrompt];
-    }
+    [parameters sdl_setObject:timeoutPrompt forName:SDLNameTimeoutPrompt];
 }
 
 - (nullable NSMutableArray<SDLTTSChunk *> *)timeoutPrompt {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameTimeoutPrompt];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLTTSChunk *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameTimeoutPrompt ofClass:SDLTTSChunk.class];
 }
 
 - (void)setVrHelpTitle:(nullable NSString *)vrHelpTitle {
-    if (vrHelpTitle != nil) {
-        [parameters setObject:vrHelpTitle forKey:SDLNameVRHelpTitle];
-    } else {
-        [parameters removeObjectForKey:SDLNameVRHelpTitle];
-    }
+    [parameters sdl_setObject:vrHelpTitle forName:SDLNameVRHelpTitle];
 }
 
 - (nullable NSString *)vrHelpTitle {
-    return [parameters objectForKey:SDLNameVRHelpTitle];
+    return [parameters sdl_objectForName:SDLNameVRHelpTitle];
 }
 
 - (void)setVrHelp:(nullable NSMutableArray<SDLVRHelpItem *> *)vrHelp {
-    if (vrHelp != nil) {
-        [parameters setObject:vrHelp forKey:SDLNameVRHelp];
-    } else {
-        [parameters removeObjectForKey:SDLNameVRHelp];
-    }
+    [parameters sdl_setObject:vrHelp forName:SDLNameVRHelp];
 }
 
 - (nullable NSMutableArray<SDLVRHelpItem *> *)vrHelp {
-    NSMutableArray<SDLVRHelpItem *> *array = [parameters objectForKey:SDLNameVRHelp];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVRHelpItem.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLVRHelpItem *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLVRHelpItem alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameVRHelp ofClass:SDLVRHelpItem.class];
 }
 
 - (void)setMenuTitle:(nullable NSString *)menuTitle {
-    if (menuTitle != nil) {
-        [parameters setObject:menuTitle forKey:SDLNameMenuTitle];
-    } else {
-        [parameters removeObjectForKey:SDLNameMenuTitle];
-    }
+    [parameters sdl_setObject:menuTitle forName:SDLNameMenuTitle];
 }
 
 - (nullable NSString *)menuTitle {
-    return [parameters objectForKey:SDLNameMenuTitle];
+    return [parameters sdl_objectForName:SDLNameMenuTitle];
 }
 
 - (void)setMenuIcon:(nullable SDLImage *)menuIcon {
-    if (menuIcon != nil) {
-        [parameters setObject:menuIcon forKey:SDLNameMenuIcon];
-    } else {
-        [parameters removeObjectForKey:SDLNameMenuIcon];
-    }
+    [parameters sdl_setObject:menuIcon forName:SDLNameMenuIcon];
 }
 
 - (nullable SDLImage *)menuIcon {
-    NSObject *obj = [parameters objectForKey:SDLNameMenuIcon];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLImage*)obj;
+    return [parameters sdl_objectForName:SDLNameMenuIcon ofClass:SDLImage.class];
 }
 
 - (void)setKeyboardProperties:(nullable SDLKeyboardProperties *)keyboardProperties {
-    if (keyboardProperties != nil) {
-        [parameters setObject:keyboardProperties forKey:SDLNameKeyboardProperties];
-    } else {
-        [parameters removeObjectForKey:SDLNameKeyboardProperties];
-    }
+    [parameters sdl_setObject:keyboardProperties forName:SDLNameKeyboardProperties];
 }
 
 - (nullable SDLKeyboardProperties *)keyboardProperties {
-    NSObject *obj = [parameters objectForKey:SDLNameKeyboardProperties];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLKeyboardProperties alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLKeyboardProperties*)obj;
+    return [parameters sdl_objectForName:SDLNameKeyboardProperties ofClass:SDLKeyboardProperties.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m
index 3ae2e6591..9da9719cc 100644
--- a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m
+++ b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLSetGlobalPropertiesResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLSetMediaClockTimer.m b/SmartDeviceLink/SDLSetMediaClockTimer.m
index d35be05cd..793fd1493 100644
--- a/SmartDeviceLink/SDLSetMediaClockTimer.m
+++ b/SmartDeviceLink/SDLSetMediaClockTimer.m
@@ -4,6 +4,7 @@
 
 #import "SDLSetMediaClockTimer.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "SDLStartTime.h"
 
@@ -41,50 +42,27 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setStartTime:(nullable SDLStartTime *)startTime {
-    if (startTime != nil) {
-        [parameters setObject:startTime forKey:SDLNameStartTime];
-    } else {
-        [parameters removeObjectForKey:SDLNameStartTime];
-    }
+    [parameters sdl_setObject:startTime forName:SDLNameStartTime];
 }
 
 - (nullable SDLStartTime *)startTime {
-    NSObject *obj = [parameters objectForKey:SDLNameStartTime];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLStartTime alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLStartTime*)obj;
+    return [parameters sdl_objectForName:SDLNameStartTime ofClass:SDLStartTime.class];
 }
 
 - (void)setEndTime:(nullable SDLStartTime *)endTime {
-    if (endTime != nil) {
-        [parameters setObject:endTime forKey:SDLNameEndTime];
-    } else {
-        [parameters removeObjectForKey:SDLNameEndTime];
-    }
+    [parameters sdl_setObject:endTime forName:SDLNameEndTime];
 }
 
 - (nullable SDLStartTime *)endTime {
-    NSObject *obj = [parameters objectForKey:SDLNameEndTime];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLStartTime alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLStartTime*)obj;
+    return [parameters sdl_objectForName:SDLNameEndTime ofClass:SDLStartTime.class];
 }
 
 - (void)setUpdateMode:(SDLUpdateMode)updateMode {
-    if (updateMode != nil) {
-        [parameters setObject:updateMode forKey:SDLNameUpdateMode];
-    } else {
-        [parameters removeObjectForKey:SDLNameUpdateMode];
-    }
+    [parameters sdl_setObject:updateMode forName:SDLNameUpdateMode];
 }
 
 - (SDLUpdateMode)updateMode {
-    NSObject *obj = [parameters objectForKey:SDLNameUpdateMode];
-    return (SDLUpdateMode)obj;
+    return [parameters sdl_objectForName:SDLNameUpdateMode];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSetMediaClockTimerResponse.m b/SmartDeviceLink/SDLSetMediaClockTimerResponse.m
index b976ba119..f293e7d79 100644
--- a/SmartDeviceLink/SDLSetMediaClockTimerResponse.m
+++ b/SmartDeviceLink/SDLSetMediaClockTimerResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLSetMediaClockTimerResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLShow.m b/SmartDeviceLink/SDLShow.m
index 875d70481..39977b640 100644
--- a/SmartDeviceLink/SDLShow.m
+++ b/SmartDeviceLink/SDLShow.m
@@ -4,10 +4,12 @@
 
 #import "SDLShow.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLImage.h"
 #import "SDLNames.h"
 #import "SDLSoftButton.h"
 
+NS_ASSUME_NONNULL_BEGIN
 
 @implementation SDLShow
 
@@ -17,19 +19,19 @@
     return self;
 }
 
-- (instancetype)initWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 alignment:(SDLTextAlignment)alignment {
+- (instancetype)initWithMainField1:(nullable NSString *)mainField1 mainField2:(nullable NSString *)mainField2 alignment:(nullable SDLTextAlignment)alignment {
     return [self initWithMainField1:mainField1 mainField2:mainField2 mainField3:nil mainField4:nil alignment:alignment];
 }
 
-- (instancetype)initWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString *)mainField3 mainField4:(NSString *)mainField4 alignment:(SDLTextAlignment)alignment {
+- (instancetype)initWithMainField1:(nullable NSString *)mainField1 mainField2:(nullable NSString *)mainField2 mainField3:(nullable NSString *)mainField3 mainField4:(nullable NSString *)mainField4 alignment:(nullable SDLTextAlignment)alignment {
     return [self initWithMainField1:mainField1 mainField2:mainField2 mainField3:mainField3 mainField4:mainField4 alignment:alignment statusBar:nil mediaClock:nil mediaTrack:nil graphic:nil softButtons:nil customPresets:nil];
 }
 
-- (instancetype)initWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 alignment:(SDLTextAlignment)alignment statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack {
+- (instancetype)initWithMainField1:(nullable NSString *)mainField1 mainField2:(nullable NSString *)mainField2 alignment:(nullable SDLTextAlignment)alignment statusBar:(nullable NSString *)statusBar mediaClock:(nullable NSString *)mediaClock mediaTrack:(nullable NSString *)mediaTrack {
     return [self initWithMainField1:mainField1 mainField2:mainField2 mainField3:nil mainField4:nil alignment:alignment statusBar:statusBar mediaClock:mediaClock mediaTrack:mediaTrack graphic:nil softButtons:nil customPresets:nil];
 }
 
-- (instancetype)initWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString *)mainField3 mainField4:(NSString *)mainField4 alignment:(SDLTextAlignment)alignment statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack graphic:(SDLImage *)graphic softButtons:(NSArray<SDLSoftButton *> *)softButtons customPresets:(NSArray<NSString *> *)customPresets {
+- (instancetype)initWithMainField1:(nullable NSString *)mainField1 mainField2:(nullable NSString *)mainField2 mainField3:(nullable NSString *)mainField3 mainField4:(nullable NSString *)mainField4 alignment:(nullable SDLTextAlignment)alignment statusBar:(nullable NSString *)statusBar mediaClock:(nullable NSString *)mediaClock mediaTrack:(nullable NSString *)mediaTrack graphic:(nullable SDLImage *)graphic softButtons:(nullable NSArray<SDLSoftButton *> *)softButtons customPresets:(nullable NSArray<NSString *> *)customPresets {
     self = [self init];
     if (!self) {
         return nil;
@@ -50,168 +52,102 @@
     return self;
 }
 
-- (void)setMainField1:(NSString *)mainField1 {
-    if (mainField1 != nil) {
-        [parameters setObject:mainField1 forKey:SDLNameMainField1];
-    } else {
-        [parameters removeObjectForKey:SDLNameMainField1];
-    }
+- (void)setMainField1:(nullable NSString *)mainField1 {
+    [parameters sdl_setObject:mainField1 forName:SDLNameMainField1];
 }
 
-- (NSString *)mainField1 {
-    return [parameters objectForKey:SDLNameMainField1];
+- (nullable NSString *)mainField1 {
+    return [parameters sdl_objectForName:SDLNameMainField1];
 }
 
-- (void)setMainField2:(NSString *)mainField2 {
-    if (mainField2 != nil) {
-        [parameters setObject:mainField2 forKey:SDLNameMainField2];
-    } else {
-        [parameters removeObjectForKey:SDLNameMainField2];
-    }
+- (void)setMainField2:(nullable NSString *)mainField2 {
+    [parameters sdl_setObject:mainField2 forName:SDLNameMainField2];
 }
 
-- (NSString *)mainField2 {
-    return [parameters objectForKey:SDLNameMainField2];
+- (nullable NSString *)mainField2 {
+    return [parameters sdl_objectForName:SDLNameMainField2];
 }
 
-- (void)setMainField3:(NSString *)mainField3 {
-    if (mainField3 != nil) {
-        [parameters setObject:mainField3 forKey:SDLNameMainField3];
-    } else {
-        [parameters removeObjectForKey:SDLNameMainField3];
-    }
+- (void)setMainField3:(nullable NSString *)mainField3 {
+    [parameters sdl_setObject:mainField3 forName:SDLNameMainField3];
 }
 
-- (NSString *)mainField3 {
-    return [parameters objectForKey:SDLNameMainField3];
+- (nullable NSString *)mainField3 {
+    return [parameters sdl_objectForName:SDLNameMainField3];
 }
 
-- (void)setMainField4:(NSString *)mainField4 {
-    if (mainField4 != nil) {
-        [parameters setObject:mainField4 forKey:SDLNameMainField4];
-    } else {
-        [parameters removeObjectForKey:SDLNameMainField4];
-    }
+- (void)setMainField4:(nullable NSString *)mainField4 {
+    [parameters sdl_setObject:mainField4 forName:SDLNameMainField4];
 }
 
-- (NSString *)mainField4 {
-    return [parameters objectForKey:SDLNameMainField4];
+- (nullable NSString *)mainField4 {
+    return [parameters sdl_objectForName:SDLNameMainField4];
 }
 
-- (void)setAlignment:(SDLTextAlignment)alignment {
-    if (alignment != nil) {
-        [parameters setObject:alignment forKey:SDLNameAlignment];
-    } else {
-        [parameters removeObjectForKey:SDLNameAlignment];
-    }
+- (void)setAlignment:(nullable SDLTextAlignment)alignment {
+    [parameters sdl_setObject:alignment forName:SDLNameAlignment];
 }
 
-- (SDLTextAlignment)alignment {
-    NSObject *obj = [parameters objectForKey:SDLNameAlignment];
-    return (SDLTextAlignment)obj;
+- (nullable SDLTextAlignment)alignment {
+    return [parameters sdl_objectForName:SDLNameAlignment];
 }
 
-- (void)setStatusBar:(NSString *)statusBar {
-    if (statusBar != nil) {
-        [parameters setObject:statusBar forKey:SDLNameStatusBar];
-    } else {
-        [parameters removeObjectForKey:SDLNameStatusBar];
-    }
+- (void)setStatusBar:(nullable NSString *)statusBar {
+    [parameters sdl_setObject:statusBar forName:SDLNameStatusBar];
 }
 
-- (NSString *)statusBar {
-    return [parameters objectForKey:SDLNameStatusBar];
+- (nullable NSString *)statusBar {
+    return [parameters sdl_objectForName:SDLNameStatusBar];
 }
 
-- (void)setMediaClock:(NSString *)mediaClock {
-    if (mediaClock != nil) {
-        [parameters setObject:mediaClock forKey:SDLNameMediaClock];
-    } else {
-        [parameters removeObjectForKey:SDLNameMediaClock];
-    }
+- (void)setMediaClock:(nullable NSString *)mediaClock {
+    [parameters sdl_setObject:mediaClock forName:SDLNameMediaClock];
 }
 
-- (NSString *)mediaClock {
-    return [parameters objectForKey:SDLNameMediaClock];
+- (nullable NSString *)mediaClock {
+    return [parameters sdl_objectForName:SDLNameMediaClock];
 }
 
-- (void)setMediaTrack:(NSString *)mediaTrack {
-    if (mediaTrack != nil) {
-        [parameters setObject:mediaTrack forKey:SDLNameMediaTrack];
-    } else {
-        [parameters removeObjectForKey:SDLNameMediaTrack];
-    }
+- (void)setMediaTrack:(nullable NSString *)mediaTrack {
+    [parameters sdl_setObject:mediaTrack forName:SDLNameMediaTrack];
 }
 
-- (NSString *)mediaTrack {
-    return [parameters objectForKey:SDLNameMediaTrack];
+- (nullable NSString *)mediaTrack {
+    return [parameters sdl_objectForName:SDLNameMediaTrack];
 }
 
-- (void)setGraphic:(SDLImage *)graphic {
-    if (graphic != nil) {
-        [parameters setObject:graphic forKey:SDLNameGraphic];
-    } else {
-        [parameters removeObjectForKey:SDLNameGraphic];
-    }
+- (void)setGraphic:(nullable SDLImage *)graphic {
+    [parameters sdl_setObject:graphic forName:SDLNameGraphic];
 }
 
-- (SDLImage *)graphic {
-    NSObject *obj = [parameters objectForKey:SDLNameGraphic];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLImage*)obj;
+- (nullable SDLImage *)graphic {
+    return [parameters sdl_objectForName:SDLNameGraphic ofClass:SDLImage.class];
 }
 
-- (void)setSecondaryGraphic:(SDLImage *)secondaryGraphic {
-    if (secondaryGraphic != nil) {
-        [parameters setObject:secondaryGraphic forKey:SDLNameSecondaryGraphic];
-    } else {
-        [parameters removeObjectForKey:SDLNameSecondaryGraphic];
-    }
+- (void)setSecondaryGraphic:(nullable SDLImage *)secondaryGraphic {
+    [parameters sdl_setObject:secondaryGraphic forName:SDLNameSecondaryGraphic];
 }
 
-- (SDLImage *)secondaryGraphic {
-    NSObject *obj = [parameters objectForKey:SDLNameSecondaryGraphic];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLImage*)obj;
+- (nullable SDLImage *)secondaryGraphic {
+    return [parameters sdl_objectForName:SDLNameSecondaryGraphic ofClass:SDLImage.class];
 }
 
-- (void)setSoftButtons:(NSMutableArray<SDLSoftButton *> *)softButtons {
-    if (softButtons != nil) {
-        [parameters setObject:softButtons forKey:SDLNameSoftButtons];
-    } else {
-        [parameters removeObjectForKey:SDLNameSoftButtons];
-    }
+- (void)setSoftButtons:(nullable NSMutableArray<SDLSoftButton *> *)softButtons {
+    [parameters sdl_setObject:softButtons forName:SDLNameSoftButtons];
 }
 
-- (NSMutableArray<SDLSoftButton *> *)softButtons {
-    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:SDLNameSoftButtons];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLSoftButton *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+- (nullable NSMutableArray<SDLSoftButton *> *)softButtons {
+    return [parameters sdl_objectsForName:SDLNameSoftButtons ofClass:SDLSoftButton.class];
 }
 
-- (void)setCustomPresets:(NSMutableArray<NSString *> *)customPresets {
-    if (customPresets != nil) {
-        [parameters setObject:customPresets forKey:SDLNameCustomPresets];
-    } else {
-        [parameters removeObjectForKey:SDLNameCustomPresets];
-    }
+- (void)setCustomPresets:(nullable NSMutableArray<NSString *> *)customPresets {
+    [parameters sdl_setObject:customPresets forName:SDLNameCustomPresets];
 }
 
-- (NSMutableArray<NSString *> *)customPresets {
-    return [parameters objectForKey:SDLNameCustomPresets];
+- (nullable NSMutableArray<NSString *> *)customPresets {
+    return [parameters sdl_objectForName:SDLNameCustomPresets];
 }
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLShowConstantTBT.m b/SmartDeviceLink/SDLShowConstantTBT.m
index c32fb0d1b..f410b85af 100644
--- a/SmartDeviceLink/SDLShowConstantTBT.m
+++ b/SmartDeviceLink/SDLShowConstantTBT.m
@@ -4,6 +4,7 @@
 
 #import "SDLShowConstantTBT.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLImage.h"
 #import "SDLNames.h"
 #import "SDLSoftButton.h"
@@ -40,154 +41,91 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setNavigationText1:(nullable NSString *)navigationText1 {
-    if (navigationText1 != nil) {
-        [parameters setObject:navigationText1 forKey:SDLNameNavigationText1];
-    } else {
-        [parameters removeObjectForKey:SDLNameNavigationText1];
-    }
+    [parameters sdl_setObject:navigationText1 forName:SDLNameNavigationText1];
 }
 
 - (nullable NSString *)navigationText1 {
-    return [parameters objectForKey:SDLNameNavigationText1];
+    return [parameters sdl_objectForName:SDLNameNavigationText1];
 }
 
 - (void)setNavigationText2:(nullable NSString *)navigationText2 {
-    if (navigationText2 != nil) {
-        [parameters setObject:navigationText2 forKey:SDLNameNavigationText2];
-    } else {
-        [parameters removeObjectForKey:SDLNameNavigationText2];
-    }
+    [parameters sdl_setObject:navigationText2 forName:SDLNameNavigationText2];
 }
 
 - (nullable NSString *)navigationText2 {
-    return [parameters objectForKey:SDLNameNavigationText2];
+    return [parameters sdl_objectForName:SDLNameNavigationText2];
 }
 
 - (void)setEta:(nullable NSString *)eta {
-    if (eta != nil) {
-        [parameters setObject:eta forKey:SDLNameETA];
-    } else {
-        [parameters removeObjectForKey:SDLNameETA];
-    }
+    [parameters sdl_setObject:eta forName:SDLNameETA];
 }
 
 - (nullable NSString *)eta {
-    return [parameters objectForKey:SDLNameETA];
+    return [parameters sdl_objectForName:SDLNameETA];
 }
 
 - (void)setTimeToDestination:(nullable NSString *)timeToDestination {
-    if (timeToDestination != nil) {
-        [parameters setObject:timeToDestination forKey:SDLNameTimeToDestination];
-    } else {
-        [parameters removeObjectForKey:SDLNameTimeToDestination];
-    }
+    [parameters sdl_setObject:timeToDestination forName:SDLNameTimeToDestination];
 }
 
 - (nullable NSString *)timeToDestination {
-    return [parameters objectForKey:SDLNameTimeToDestination];
+    return [parameters sdl_objectForName:SDLNameTimeToDestination];
 }
 
 - (void)setTotalDistance:(nullable NSString *)totalDistance {
-    if (totalDistance != nil) {
-        [parameters setObject:totalDistance forKey:SDLNameTotalDistance];
-    } else {
-        [parameters removeObjectForKey:SDLNameTotalDistance];
-    }
+    [parameters sdl_setObject:totalDistance forName:SDLNameTotalDistance];
 }
 
 - (nullable NSString *)totalDistance {
-    return [parameters objectForKey:SDLNameTotalDistance];
+    return [parameters sdl_objectForName:SDLNameTotalDistance];
 }
 
 - (void)setTurnIcon:(nullable SDLImage *)turnIcon {
-    if (turnIcon != nil) {
-        [parameters setObject:turnIcon forKey:SDLNameTurnIcon];
-    } else {
-        [parameters removeObjectForKey:SDLNameTurnIcon];
-    }
+    [parameters sdl_setObject:turnIcon forName:SDLNameTurnIcon];
 }
 
 - (nullable SDLImage *)turnIcon {
-    NSObject *obj = [parameters objectForKey:SDLNameTurnIcon];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLImage*)obj;
+    return [parameters sdl_objectForName:SDLNameTurnIcon ofClass:SDLImage.class];
 }
 
 - (void)setNextTurnIcon:(nullable SDLImage *)nextTurnIcon {
-    if (nextTurnIcon != nil) {
-        [parameters setObject:nextTurnIcon forKey:SDLNameNextTurnIcon];
-    } else {
-        [parameters removeObjectForKey:SDLNameNextTurnIcon];
-    }
+    [parameters sdl_setObject:nextTurnIcon forName:SDLNameNextTurnIcon];
 }
 
 - (nullable SDLImage *)nextTurnIcon {
-    NSObject *obj = [parameters objectForKey:SDLNameNextTurnIcon];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLImage*)obj;
+    return [parameters sdl_objectForName:SDLNameNextTurnIcon ofClass:SDLImage.class];
 }
 
 - (void)setDistanceToManeuver:(nullable NSNumber<SDLFloat> *)distanceToManeuver {
-    if (distanceToManeuver != nil) {
-        [parameters setObject:distanceToManeuver forKey:SDLNameDistanceToManeuver];
-    } else {
-        [parameters removeObjectForKey:SDLNameDistanceToManeuver];
-    }
+    [parameters sdl_setObject:distanceToManeuver forName:SDLNameDistanceToManeuver];
 }
 
 - (nullable NSNumber<SDLFloat> *)distanceToManeuver {
-    return [parameters objectForKey:SDLNameDistanceToManeuver];
+    return [parameters sdl_objectForName:SDLNameDistanceToManeuver];
 }
 
 - (void)setDistanceToManeuverScale:(nullable NSNumber<SDLFloat> *)distanceToManeuverScale {
-    if (distanceToManeuverScale != nil) {
-        [parameters setObject:distanceToManeuverScale forKey:SDLNameDistanceToManeuverScale];
-    } else {
-        [parameters removeObjectForKey:SDLNameDistanceToManeuverScale];
-    }
+    [parameters sdl_setObject:distanceToManeuverScale forName:SDLNameDistanceToManeuverScale];
 }
 
 - (nullable NSNumber<SDLFloat> *)distanceToManeuverScale {
-    return [parameters objectForKey:SDLNameDistanceToManeuverScale];
+    return [parameters sdl_objectForName:SDLNameDistanceToManeuverScale];
 }
 
 - (void)setManeuverComplete:(nullable NSNumber<SDLBool> *)maneuverComplete {
-    if (maneuverComplete != nil) {
-        [parameters setObject:maneuverComplete forKey:SDLNameManeuverComplete];
-    } else {
-        [parameters removeObjectForKey:SDLNameManeuverComplete];
-    }
+    [parameters sdl_setObject:maneuverComplete forName:SDLNameManeuverComplete];
 }
 
 - (nullable NSNumber<SDLBool> *)maneuverComplete {
-    return [parameters objectForKey:SDLNameManeuverComplete];
+    return [parameters sdl_objectForName:SDLNameManeuverComplete];
 }
 
 - (void)setSoftButtons:(nullable NSMutableArray<SDLSoftButton *> *)softButtons {
-    if (softButtons != nil) {
-        [parameters setObject:softButtons forKey:SDLNameSoftButtons];
-    } else {
-        [parameters removeObjectForKey:SDLNameSoftButtons];
-    }
+    [parameters sdl_setObject:softButtons forName:SDLNameSoftButtons];
 }
 
 - (nullable NSMutableArray<SDLSoftButton *> *)softButtons {
-    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:SDLNameSoftButtons];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLSoftButton *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameSoftButtons ofClass:SDLSoftButton.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLShowConstantTBTResponse.m b/SmartDeviceLink/SDLShowConstantTBTResponse.m
index 0327f0420..40a9c9bd9 100644
--- a/SmartDeviceLink/SDLShowConstantTBTResponse.m
+++ b/SmartDeviceLink/SDLShowConstantTBTResponse.m
@@ -3,6 +3,8 @@
 
 
 #import "SDLShowConstantTBTResponse.h"
+
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLShowResponse.m b/SmartDeviceLink/SDLShowResponse.m
index 75a5819aa..cca46c426 100644
--- a/SmartDeviceLink/SDLShowResponse.m
+++ b/SmartDeviceLink/SDLShowResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLShowResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLSingleTireStatus.m b/SmartDeviceLink/SDLSingleTireStatus.m
index fff301ee0..a43be45b9 100644
--- a/SmartDeviceLink/SDLSingleTireStatus.m
+++ b/SmartDeviceLink/SDLSingleTireStatus.m
@@ -3,21 +3,17 @@
 
 #import "SDLSingleTireStatus.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 @implementation SDLSingleTireStatus
 
 - (void)setStatus:(SDLComponentVolumeStatus)status {
-    if (status != nil) {
-        [store setObject:status forKey:SDLNameStatus];
-    } else {
-        [store removeObjectForKey:SDLNameStatus];
-    }
+    [store sdl_setObject:status forName:SDLNameStatus];
 }
 
 - (SDLComponentVolumeStatus)status {
-    NSObject *obj = [store objectForKey:SDLNameStatus];
-    return (SDLComponentVolumeStatus)obj;
+    return [store sdl_objectForName:SDLNameStatus];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSlider.m b/SmartDeviceLink/SDLSlider.m
index 7f03dd32c..702ca2531 100644
--- a/SmartDeviceLink/SDLSlider.m
+++ b/SmartDeviceLink/SDLSlider.m
@@ -4,6 +4,7 @@
 
 #import "SDLSlider.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -53,63 +54,43 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setNumTicks:(NSNumber<SDLInt> *)numTicks {
-    if (numTicks != nil) {
-        [parameters setObject:numTicks forKey:SDLNameNumberTicks];
-    } else {
-        [parameters removeObjectForKey:SDLNameNumberTicks];
-    }
+    [parameters sdl_setObject:numTicks forName:SDLNameNumberTicks];
 }
 
 - (NSNumber<SDLInt> *)numTicks {
-    return [parameters objectForKey:SDLNameNumberTicks];
+    return [parameters sdl_objectForName:SDLNameNumberTicks];
 }
 
 - (void)setPosition:(NSNumber<SDLInt> *)position {
-    if (position != nil) {
-        [parameters setObject:position forKey:SDLNamePosition];
-    } else {
-        [parameters removeObjectForKey:SDLNamePosition];
-    }
+    [parameters sdl_setObject:position forName:SDLNamePosition];
 }
 
 - (NSNumber<SDLInt> *)position {
-    return [parameters objectForKey:SDLNamePosition];
+    return [parameters sdl_objectForName:SDLNamePosition];
 }
 
 - (void)setSliderHeader:(NSString *)sliderHeader {
-    if (sliderHeader != nil) {
-        [parameters setObject:sliderHeader forKey:SDLNameSliderHeader];
-    } else {
-        [parameters removeObjectForKey:SDLNameSliderHeader];
-    }
+    [parameters sdl_setObject:sliderHeader forName:SDLNameSliderHeader];
 }
 
 - (NSString *)sliderHeader {
-    return [parameters objectForKey:SDLNameSliderHeader];
+    return [parameters sdl_objectForName:SDLNameSliderHeader];
 }
 
 - (void)setSliderFooter:(nullable NSMutableArray<NSString *> *)sliderFooter {
-    if (sliderFooter != nil) {
-        [parameters setObject:sliderFooter forKey:SDLNameSliderFooter];
-    } else {
-        [parameters removeObjectForKey:SDLNameSliderFooter];
-    }
+    [parameters sdl_setObject:sliderFooter forName:SDLNameSliderFooter];
 }
 
 - (nullable NSMutableArray<NSString *> *)sliderFooter {
-    return [parameters objectForKey:SDLNameSliderFooter];
+    return [parameters sdl_objectForName:SDLNameSliderFooter];
 }
 
 - (void)setTimeout:(nullable NSNumber<SDLInt> *)timeout {
-    if (timeout != nil) {
-        [parameters setObject:timeout forKey:SDLNameTimeout];
-    } else {
-        [parameters removeObjectForKey:SDLNameTimeout];
-    }
+    [parameters sdl_setObject:timeout forName:SDLNameTimeout];
 }
 
 - (nullable NSNumber<SDLInt> *)timeout {
-    return [parameters objectForKey:SDLNameTimeout];
+    return [parameters sdl_objectForName:SDLNameTimeout];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSliderResponse.m b/SmartDeviceLink/SDLSliderResponse.m
index aa53544d7..2b41bf9e3 100644
--- a/SmartDeviceLink/SDLSliderResponse.m
+++ b/SmartDeviceLink/SDLSliderResponse.m
@@ -4,8 +4,11 @@
 
 #import "SDLSliderResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @implementation SDLSliderResponse
 
 - (instancetype)init {
@@ -15,11 +18,7 @@
 }
 
 - (void)setSliderPosition:(nullable NSNumber<SDLInt> *)sliderPosition {
-    if (sliderPosition != nil) {
-        [parameters setObject:sliderPosition forKey:SDLNameSliderPosition];
-    } else {
-        [parameters removeObjectForKey:SDLNameSliderPosition];
-    }
+    [parameters sdl_setObject:sliderPosition forName:SDLNameSliderPosition];
 }
 
 - (nullable NSNumber<SDLInt> *)sliderPosition {
@@ -27,3 +26,5 @@
 }
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLSoftButton.m b/SmartDeviceLink/SDLSoftButton.m
index 47af67dae..9f9a5c21e 100644
--- a/SmartDeviceLink/SDLSoftButton.m
+++ b/SmartDeviceLink/SDLSoftButton.m
@@ -3,6 +3,7 @@
 
 #import "SDLSoftButton.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLImage.h"
 #import "SDLNames.h"
 
@@ -39,82 +40,51 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setType:(SDLSoftButtonType)type {
-    if (type != nil) {
-        [store setObject:type forKey:SDLNameType];
-    } else {
-        [store removeObjectForKey:SDLNameType];
-    }
+    [store sdl_setObject:type forName:SDLNameType];
 }
 
 - (SDLSoftButtonType)type {
-    NSObject *obj = [store objectForKey:SDLNameType];
-    return (SDLSoftButtonType)obj;
+    return [store sdl_objectForName:SDLNameType];
 }
 
 - (void)setText:(nullable NSString *)text {
-    if (text != nil) {
-        [store setObject:text forKey:SDLNameText];
-    } else {
-        [store removeObjectForKey:SDLNameText];
-    }
+    [store sdl_setObject:text forName:SDLNameText];
 }
 
 - (nullable NSString *)text {
-    return [store objectForKey:SDLNameText];
+    return [store sdl_objectForName:SDLNameText];
 }
 
 - (void)setImage:(nullable SDLImage *)image {
-    if (image != nil) {
-        [store setObject:image forKey:SDLNameImage];
-    } else {
-        [store removeObjectForKey:SDLNameImage];
-    }
+    [store sdl_setObject:image forName:SDLNameImage];
 }
 
 - (nullable SDLImage *)image {
-    NSObject *obj = [store objectForKey:SDLNameImage];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLImage*)obj;
+    return [store sdl_objectForName:SDLNameImage ofClass:SDLImage.class];
 }
 
 - (void)setIsHighlighted:(nullable NSNumber<SDLBool> *)isHighlighted {
-    if (isHighlighted != nil) {
-        [store setObject:isHighlighted forKey:SDLNameIsHighlighted];
-    } else {
-        [store removeObjectForKey:SDLNameIsHighlighted];
-    }
+    [store sdl_setObject:isHighlighted forName:SDLNameIsHighlighted];
 }
 
 - (nullable NSNumber<SDLBool> *)isHighlighted {
-    return [store objectForKey:SDLNameIsHighlighted];
+    return [store sdl_objectForName:SDLNameIsHighlighted];
 }
 
 - (void)setSoftButtonID:(NSNumber<SDLInt> *)softButtonID {
-    if (softButtonID != nil) {
-        [store setObject:softButtonID forKey:SDLNameSoftButtonId];
-    } else {
-        [store removeObjectForKey:SDLNameSoftButtonId];
-    }
+    [store sdl_setObject:softButtonID forName:SDLNameSoftButtonId];
 }
 
 - (NSNumber<SDLInt> *)softButtonID {
-    return [store objectForKey:SDLNameSoftButtonId];
+    return [store sdl_objectForName:SDLNameSoftButtonId];
 }
 
 - (void)setSystemAction:(nullable SDLSystemAction)systemAction {
-    if (systemAction != nil) {
-        [store setObject:systemAction forKey:SDLNameSystemAction];
-    } else {
-        [store removeObjectForKey:SDLNameSystemAction];
-    }
+    [store sdl_setObject:systemAction forName:SDLNameSystemAction];
 }
 
 - (nullable SDLSystemAction)systemAction {
-    NSObject *obj = [store objectForKey:SDLNameSystemAction];
-    return (SDLSystemAction)obj;
+    return [store sdl_objectForName:SDLNameSystemAction];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSoftButtonCapabilities.m b/SmartDeviceLink/SDLSoftButtonCapabilities.m
index 4dbc7ca2e..6bf391496 100644
--- a/SmartDeviceLink/SDLSoftButtonCapabilities.m
+++ b/SmartDeviceLink/SDLSoftButtonCapabilities.m
@@ -4,6 +4,7 @@
 
 #import "SDLSoftButtonCapabilities.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -11,51 +12,35 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLSoftButtonCapabilities
 
 - (void)setShortPressAvailable:(NSNumber<SDLBool> *)shortPressAvailable {
-    if (shortPressAvailable != nil) {
-        [store setObject:shortPressAvailable forKey:SDLNameShortPressAvailable];
-    } else {
-        [store removeObjectForKey:SDLNameShortPressAvailable];
-    }
+    [store sdl_setObject:shortPressAvailable forName:SDLNameShortPressAvailable];
 }
 
 - (NSNumber<SDLBool> *)shortPressAvailable {
-    return [store objectForKey:SDLNameShortPressAvailable];
+    return [store sdl_objectForName:SDLNameShortPressAvailable];
 }
 
 - (void)setLongPressAvailable:(NSNumber<SDLBool> *)longPressAvailable {
-    if (longPressAvailable != nil) {
-        [store setObject:longPressAvailable forKey:SDLNameLongPressAvailable];
-    } else {
-        [store removeObjectForKey:SDLNameLongPressAvailable];
-    }
+    [store sdl_setObject:longPressAvailable forName:SDLNameLongPressAvailable];
 }
 
 - (NSNumber<SDLBool> *)longPressAvailable {
-    return [store objectForKey:SDLNameLongPressAvailable];
+    return [store sdl_objectForName:SDLNameLongPressAvailable];
 }
 
 - (void)setUpDownAvailable:(NSNumber<SDLBool> *)upDownAvailable {
-    if (upDownAvailable != nil) {
-        [store setObject:upDownAvailable forKey:SDLNameUpDownAvailable];
-    } else {
-        [store removeObjectForKey:SDLNameUpDownAvailable];
-    }
+    [store sdl_setObject:upDownAvailable forName:SDLNameUpDownAvailable];
 }
 
 - (NSNumber<SDLBool> *)upDownAvailable {
-    return [store objectForKey:SDLNameUpDownAvailable];
+    return [store sdl_objectForName:SDLNameUpDownAvailable];
 }
 
 - (void)setImageSupported:(NSNumber<SDLBool> *)imageSupported {
-    if (imageSupported != nil) {
-        [store setObject:imageSupported forKey:SDLNameImageSupported];
-    } else {
-        [store removeObjectForKey:SDLNameImageSupported];
-    }
+    [store sdl_setObject:imageSupported forName:SDLNameImageSupported];
 }
 
 - (NSNumber<SDLBool> *)imageSupported {
-    return [store objectForKey:SDLNameImageSupported];
+    return [store sdl_objectForName:SDLNameImageSupported];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSpeak.m b/SmartDeviceLink/SDLSpeak.m
index 8236eb611..774947831 100644
--- a/SmartDeviceLink/SDLSpeak.m
+++ b/SmartDeviceLink/SDLSpeak.m
@@ -4,6 +4,7 @@
 
 #import "SDLSpeak.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "SDLTTSChunk.h"
 
@@ -34,24 +35,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setTtsChunks:(NSMutableArray<SDLTTSChunk *> *)ttsChunks {
-    if (ttsChunks != nil) {
-        [parameters setObject:ttsChunks forKey:SDLNameTTSChunks];
-    } else {
-        [parameters removeObjectForKey:SDLNameTTSChunks];
-    }
+    [parameters sdl_setObject:ttsChunks forName:SDLNameTTSChunks];
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)ttsChunks {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameTTSChunks];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLTTSChunk *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameTTSChunks ofClass:SDLTTSChunk.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSpeakResponse.m b/SmartDeviceLink/SDLSpeakResponse.m
index d61fa37a3..f8e8a248c 100644
--- a/SmartDeviceLink/SDLSpeakResponse.m
+++ b/SmartDeviceLink/SDLSpeakResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLSpeakResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLStartTime.m b/SmartDeviceLink/SDLStartTime.m
index 8071ad7ff..df8490f7a 100644
--- a/SmartDeviceLink/SDLStartTime.m
+++ b/SmartDeviceLink/SDLStartTime.m
@@ -4,6 +4,7 @@
 
 #import "SDLStartTime.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -24,39 +25,27 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setHours:(NSNumber<SDLInt> *)hours {
-    if (hours != nil) {
-        [store setObject:hours forKey:SDLNameHours];
-    } else {
-        [store removeObjectForKey:SDLNameHours];
-    }
+    [store sdl_setObject:hours forName:SDLNameHours];
 }
 
 - (NSNumber<SDLInt> *)hours {
-    return [store objectForKey:SDLNameHours];
+    return [store sdl_objectForName:SDLNameHours];
 }
 
 - (void)setMinutes:(NSNumber<SDLInt> *)minutes {
-    if (minutes != nil) {
-        [store setObject:minutes forKey:SDLNameMinutes];
-    } else {
-        [store removeObjectForKey:SDLNameMinutes];
-    }
+    [store sdl_setObject:minutes forName:SDLNameMinutes];
 }
 
 - (NSNumber<SDLInt> *)minutes {
-    return [store objectForKey:SDLNameMinutes];
+    return [store sdl_objectForName:SDLNameMinutes];
 }
 
 - (void)setSeconds:(NSNumber<SDLInt> *)seconds {
-    if (seconds != nil) {
-        [store setObject:seconds forKey:SDLNameSeconds];
-    } else {
-        [store removeObjectForKey:SDLNameSeconds];
-    }
+    [store sdl_setObject:seconds forName:SDLNameSeconds];
 }
 
 - (NSNumber<SDLInt> *)seconds {
-    return [store objectForKey:SDLNameSeconds];
+    return [store sdl_objectForName:SDLNameSeconds];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSubscribeButton.m b/SmartDeviceLink/SDLSubscribeButton.m
index ef5a7deb5..50d9ac37b 100644
--- a/SmartDeviceLink/SDLSubscribeButton.m
+++ b/SmartDeviceLink/SDLSubscribeButton.m
@@ -4,6 +4,7 @@
 
 #import "SDLSubscribeButton.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -40,16 +41,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setButtonName:(SDLButtonName)buttonName {
-    if (buttonName != nil) {
-        [parameters setObject:buttonName forKey:SDLNameButtonName];
-    } else {
-        [parameters removeObjectForKey:SDLNameButtonName];
-    }
+    [parameters sdl_setObject:buttonName forName:SDLNameButtonName];
 }
 
 - (SDLButtonName)buttonName {
-    NSObject *obj = [parameters objectForKey:SDLNameButtonName];
-    return (SDLButtonName)obj;
+    return [parameters sdl_objectForName:SDLNameButtonName];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSubscribeButtonResponse.m b/SmartDeviceLink/SDLSubscribeButtonResponse.m
index ca14f3861..bf2b860f6 100644
--- a/SmartDeviceLink/SDLSubscribeButtonResponse.m
+++ b/SmartDeviceLink/SDLSubscribeButtonResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLSubscribeButtonResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.m b/SmartDeviceLink/SDLSubscribeVehicleData.m
index 1d8a1ee4e..d8973045e 100644
--- a/SmartDeviceLink/SDLSubscribeVehicleData.m
+++ b/SmartDeviceLink/SDLSubscribeVehicleData.m
@@ -4,6 +4,7 @@
 
 #import "SDLSubscribeVehicleData.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -51,291 +52,195 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setGps:(nullable NSNumber<SDLBool> *)gps {
-    if (gps != nil) {
-        [parameters setObject:gps forKey:SDLNameGPS];
-    } else {
-        [parameters removeObjectForKey:SDLNameGPS];
-    }
+    [parameters sdl_setObject:gps forName:SDLNameGPS];
 }
 
 - (nullable NSNumber<SDLBool> *)gps {
-    return [parameters objectForKey:SDLNameGPS];
+    return [parameters sdl_objectForName:SDLNameGPS];
 }
 
 - (void)setSpeed:(nullable NSNumber<SDLBool> *)speed {
-    if (speed != nil) {
-        [parameters setObject:speed forKey:SDLNameSpeed];
-    } else {
-        [parameters removeObjectForKey:SDLNameSpeed];
-    }
+    [parameters sdl_setObject:speed forName:SDLNameSpeed];
 }
 
 - (nullable NSNumber<SDLBool> *)speed {
-    return [parameters objectForKey:SDLNameSpeed];
+    return [parameters sdl_objectForName:SDLNameSpeed];
 }
 
 - (void)setRpm:(nullable NSNumber<SDLBool> *)rpm {
-    if (rpm != nil) {
-        [parameters setObject:rpm forKey:SDLNameRPM];
-    } else {
-        [parameters removeObjectForKey:SDLNameRPM];
-    }
+    [parameters sdl_setObject:rpm forName:SDLNameRPM];
 }
 
 - (nullable NSNumber<SDLBool> *)rpm {
-    return [parameters objectForKey:SDLNameRPM];
+    return [parameters sdl_objectForName:SDLNameRPM];
 }
 
 - (void)setFuelLevel:(nullable NSNumber<SDLBool> *)fuelLevel {
-    if (fuelLevel != nil) {
-        [parameters setObject:fuelLevel forKey:SDLNameFuelLevel];
-    } else {
-        [parameters removeObjectForKey:SDLNameFuelLevel];
-    }
+    [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel];
 }
 
 - (nullable NSNumber<SDLBool> *)fuelLevel {
-    return [parameters objectForKey:SDLNameFuelLevel];
+    return [parameters sdl_objectForName:SDLNameFuelLevel];
 }
 
 - (void)setFuelLevel_State:(nullable NSNumber<SDLBool> *)fuelLevel_State {
-    if (fuelLevel_State != nil) {
-        [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState];
-    } else {
-        [parameters removeObjectForKey:SDLNameFuelLevelState];
-    }
+    [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState];
 }
 
 - (nullable NSNumber<SDLBool> *)fuelLevel_State {
-    return [parameters objectForKey:SDLNameFuelLevelState];
+    return [parameters sdl_objectForName:SDLNameFuelLevelState];
 }
 
 - (void)setInstantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption {
-    if (instantFuelConsumption != nil) {
-        [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption];
-    } else {
-        [parameters removeObjectForKey:SDLNameInstantFuelConsumption];
-    }
+    [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
 }
 
 - (nullable NSNumber<SDLBool> *)instantFuelConsumption {
-    return [parameters objectForKey:SDLNameInstantFuelConsumption];
+    return [parameters sdl_objectForName:SDLNameInstantFuelConsumption];
 }
 
 - (void)setExternalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature {
-    if (externalTemperature != nil) {
-        [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature];
-    } else {
-        [parameters removeObjectForKey:SDLNameExternalTemperature];
-    }
+    [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature];
 }
 
 - (nullable NSNumber<SDLBool> *)externalTemperature {
-    return [parameters objectForKey:SDLNameExternalTemperature];
+    return [parameters sdl_objectForName:SDLNameExternalTemperature];
 }
 
 - (void)setPrndl:(nullable NSNumber<SDLBool> *)prndl {
-    if (prndl != nil) {
-        [parameters setObject:prndl forKey:SDLNamePRNDL];
-    } else {
-        [parameters removeObjectForKey:SDLNamePRNDL];
-    }
+    [parameters sdl_setObject:prndl forName:SDLNamePRNDL];
 }
 
 - (nullable NSNumber<SDLBool> *)prndl {
-    return [parameters objectForKey:SDLNamePRNDL];
+    return [parameters sdl_objectForName:SDLNamePRNDL];
 }
 
 - (void)setTirePressure:(nullable NSNumber<SDLBool> *)tirePressure {
-    if (tirePressure != nil) {
-        [parameters setObject:tirePressure forKey:SDLNameTirePressure];
-    } else {
-        [parameters removeObjectForKey:SDLNameTirePressure];
-    }
+    [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure];
 }
 
 - (nullable NSNumber<SDLBool> *)tirePressure {
-    return [parameters objectForKey:SDLNameTirePressure];
+    return [parameters sdl_objectForName:SDLNameTirePressure];
 }
 
 - (void)setOdometer:(nullable NSNumber<SDLBool> *)odometer {
-    if (odometer != nil) {
-        [parameters setObject:odometer forKey:SDLNameOdometer];
-    } else {
-        [parameters removeObjectForKey:SDLNameOdometer];
-    }
+    [parameters sdl_setObject:odometer forName:SDLNameOdometer];
 }
 
 - (nullable NSNumber<SDLBool> *)odometer {
-    return [parameters objectForKey:SDLNameOdometer];
+    return [parameters sdl_objectForName:SDLNameOdometer];
 }
 
 - (void)setBeltStatus:(nullable NSNumber<SDLBool> *)beltStatus {
-    if (beltStatus != nil) {
-        [parameters setObject:beltStatus forKey:SDLNameBeltStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameBeltStatus];
-    }
+    [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus];
 }
 
 - (nullable NSNumber<SDLBool> *)beltStatus {
-    return [parameters objectForKey:SDLNameBeltStatus];
+    return [parameters sdl_objectForName:SDLNameBeltStatus];
 }
 
 - (void)setBodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation {
-    if (bodyInformation != nil) {
-        [parameters setObject:bodyInformation forKey:SDLNameBodyInformation];
-    } else {
-        [parameters removeObjectForKey:SDLNameBodyInformation];
-    }
+    [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation];
 }
 
 - (nullable NSNumber<SDLBool> *)bodyInformation {
-    return [parameters objectForKey:SDLNameBodyInformation];
+    return [parameters sdl_objectForName:SDLNameBodyInformation];
 }
 
 - (void)setDeviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus {
-    if (deviceStatus != nil) {
-        [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameDeviceStatus];
-    }
+    [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus];
 }
 
 - (nullable NSNumber<SDLBool> *)deviceStatus {
-    return [parameters objectForKey:SDLNameDeviceStatus];
+    return [parameters sdl_objectForName:SDLNameDeviceStatus];
 }
 
 - (void)setDriverBraking:(nullable NSNumber<SDLBool> *)driverBraking {
-    if (driverBraking != nil) {
-        [parameters setObject:driverBraking forKey:SDLNameDriverBraking];
-    } else {
-        [parameters removeObjectForKey:SDLNameDriverBraking];
-    }
+    [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking];
 }
 
 - (nullable NSNumber<SDLBool> *)driverBraking {
-    return [parameters objectForKey:SDLNameDriverBraking];
+    return [parameters sdl_objectForName:SDLNameDriverBraking];
 }
 
 - (void)setWiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus {
-    if (wiperStatus != nil) {
-        [parameters setObject:wiperStatus forKey:SDLNameWiperStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameWiperStatus];
-    }
+    [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus];
 }
 
 - (nullable NSNumber<SDLBool> *)wiperStatus {
-    return [parameters objectForKey:SDLNameWiperStatus];
+    return [parameters sdl_objectForName:SDLNameWiperStatus];
 }
 
 - (void)setHeadLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus {
-    if (headLampStatus != nil) {
-        [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameHeadLampStatus];
-    }
+    [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus];
 }
 
 - (nullable NSNumber<SDLBool> *)headLampStatus {
-    return [parameters objectForKey:SDLNameHeadLampStatus];
+    return [parameters sdl_objectForName:SDLNameHeadLampStatus];
 }
 
 - (void)setEngineTorque:(nullable NSNumber<SDLBool> *)engineTorque {
-    if (engineTorque != nil) {
-        [parameters setObject:engineTorque forKey:SDLNameEngineTorque];
-    } else {
-        [parameters removeObjectForKey:SDLNameEngineTorque];
-    }
+    [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque];
 }
 
 - (nullable NSNumber<SDLBool> *)engineTorque {
-    return [parameters objectForKey:SDLNameEngineTorque];
+    return [parameters sdl_objectForName:SDLNameEngineTorque];
 }
 
 - (void)setAccPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition {
-    if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
-    } else {
-        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
-    }
+    [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
 }
 
 - (nullable NSNumber<SDLBool> *)accPedalPosition {
-    return [parameters objectForKey:SDLNameAccelerationPedalPosition];
+    return [parameters sdl_objectForName:SDLNameAccelerationPedalPosition];
 }
 
 - (void)setSteeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle {
-    if (steeringWheelAngle != nil) {
-        [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle];
-    } else {
-        [parameters removeObjectForKey:SDLNameSteeringWheelAngle];
-    }
+    [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
 }
 
 - (nullable NSNumber<SDLBool> *)steeringWheelAngle {
-    return [parameters objectForKey:SDLNameSteeringWheelAngle];
+    return [parameters sdl_objectForName:SDLNameSteeringWheelAngle];
 }
 
 - (void)setECallInfo:(nullable NSNumber<SDLBool> *)eCallInfo {
-    if (eCallInfo != nil) {
-        [parameters setObject:eCallInfo forKey:SDLNameECallInfo];
-    } else {
-        [parameters removeObjectForKey:SDLNameECallInfo];
-    }
+    [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo];
 }
 
 - (nullable NSNumber<SDLBool> *)eCallInfo {
-    return [parameters objectForKey:SDLNameECallInfo];
+    return [parameters sdl_objectForName:SDLNameECallInfo];
 }
 
 - (void)setAirbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus {
-    if (airbagStatus != nil) {
-        [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameAirbagStatus];
-    }
+    [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus];
 }
 
 - (nullable NSNumber<SDLBool> *)airbagStatus {
-    return [parameters objectForKey:SDLNameAirbagStatus];
+    return [parameters sdl_objectForName:SDLNameAirbagStatus];
 }
 
 - (void)setEmergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent {
-    if (emergencyEvent != nil) {
-        [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent];
-    } else {
-        [parameters removeObjectForKey:SDLNameEmergencyEvent];
-    }
+    [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent];
 }
 
 - (nullable NSNumber<SDLBool> *)emergencyEvent {
-    return [parameters objectForKey:SDLNameEmergencyEvent];
+    return [parameters sdl_objectForName:SDLNameEmergencyEvent];
 }
 
 - (void)setClusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus {
-    if (clusterModeStatus != nil) {
-        [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameClusterModeStatus];
-    }
+    [parameters sdl_setObject:clusterModeStatus forName:SDLNameClusterModeStatus];
 }
 
 - (nullable NSNumber<SDLBool> *)clusterModeStatus {
-    return [parameters objectForKey:SDLNameClusterModeStatus];
+    return [parameters sdl_objectForName:SDLNameClusterModeStatus];
 }
 
 - (void)setMyKey:(nullable NSNumber<SDLBool> *)myKey {
-    if (myKey != nil) {
-        [parameters setObject:myKey forKey:SDLNameMyKey];
-    } else {
-        [parameters removeObjectForKey:SDLNameMyKey];
-    }
+    [parameters sdl_setObject:myKey forName:SDLNameMyKey];
 }
 
 - (nullable NSNumber<SDLBool> *)myKey {
-    return [parameters objectForKey:SDLNameMyKey];
+    return [parameters sdl_objectForName:SDLNameMyKey];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
index 554dc7738..283002a3d 100644
--- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
+++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLSubscribeVehicleDataResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "SDLVehicleDataResult.h"
 
@@ -18,411 +19,195 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setGps:(nullable SDLVehicleDataResult *)gps {
-    if (gps != nil) {
-        [parameters setObject:gps forKey:SDLNameGPS];
-    } else {
-        [parameters removeObjectForKey:SDLNameGPS];
-    }
+    [parameters sdl_setObject:gps forName:SDLNameGPS];
 }
 
 - (nullable SDLVehicleDataResult *)gps {
-    NSObject *obj = [parameters objectForKey:SDLNameGPS];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameGPS ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setSpeed:(nullable SDLVehicleDataResult *)speed {
-    if (speed != nil) {
-        [parameters setObject:speed forKey:SDLNameSpeed];
-    } else {
-        [parameters removeObjectForKey:SDLNameSpeed];
-    }
+    [parameters sdl_setObject:speed forName:SDLNameSpeed];
 }
 
 - (nullable SDLVehicleDataResult *)speed {
-    NSObject *obj = [parameters objectForKey:SDLNameSpeed];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameSpeed ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setRpm:(nullable SDLVehicleDataResult *)rpm {
-    if (rpm != nil) {
-        [parameters setObject:rpm forKey:SDLNameRPM];
-    } else {
-        [parameters removeObjectForKey:SDLNameRPM];
-    }
+    [parameters sdl_setObject:rpm forName:SDLNameRPM];
 }
 
 - (nullable SDLVehicleDataResult *)rpm {
-    NSObject *obj = [parameters objectForKey:SDLNameRPM];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameRPM ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setFuelLevel:(nullable SDLVehicleDataResult *)fuelLevel {
-    if (fuelLevel != nil) {
-        [parameters setObject:fuelLevel forKey:SDLNameFuelLevel];
-    } else {
-        [parameters removeObjectForKey:SDLNameFuelLevel];
-    }
+    [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel];
 }
 
 - (nullable SDLVehicleDataResult *)fuelLevel {
-    NSObject *obj = [parameters objectForKey:SDLNameFuelLevel];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameFuelLevel ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setFuelLevel_State:(nullable SDLVehicleDataResult *)fuelLevel_State {
-    if (fuelLevel_State != nil) {
-        [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState];
-    } else {
-        [parameters removeObjectForKey:SDLNameFuelLevelState];
-    }
+    [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState];
 }
 
 - (nullable SDLVehicleDataResult *)fuelLevel_State {
-    NSObject *obj = [parameters objectForKey:SDLNameFuelLevelState];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameFuelLevelState ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setInstantFuelConsumption:(nullable SDLVehicleDataResult *)instantFuelConsumption {
-    if (instantFuelConsumption != nil) {
-        [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption];
-    } else {
-        [parameters removeObjectForKey:SDLNameInstantFuelConsumption];
-    }
+    [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
 }
 
 - (nullable SDLVehicleDataResult *)instantFuelConsumption {
-    NSObject *obj = [parameters objectForKey:SDLNameInstantFuelConsumption];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameInstantFuelConsumption ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setExternalTemperature:(nullable SDLVehicleDataResult *)externalTemperature {
-    if (externalTemperature != nil) {
-        [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature];
-    } else {
-        [parameters removeObjectForKey:SDLNameExternalTemperature];
-    }
+    [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature];
 }
 
 - (nullable SDLVehicleDataResult *)externalTemperature {
-    NSObject *obj = [parameters objectForKey:SDLNameExternalTemperature];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameExternalTemperature ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setPrndl:(nullable SDLVehicleDataResult *)prndl {
-    if (prndl != nil) {
-        [parameters setObject:prndl forKey:SDLNamePRNDL];
-    } else {
-        [parameters removeObjectForKey:SDLNamePRNDL];
-    }
+    [parameters sdl_setObject:prndl forName:SDLNamePRNDL];
 }
 
 - (nullable SDLVehicleDataResult *)prndl {
-    NSObject *obj = [parameters objectForKey:SDLNamePRNDL];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNamePRNDL ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setTirePressure:(nullable SDLVehicleDataResult *)tirePressure {
-    if (tirePressure != nil) {
-        [parameters setObject:tirePressure forKey:SDLNameTirePressure];
-    } else {
-        [parameters removeObjectForKey:SDLNameTirePressure];
-    }
+    [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure];
 }
 
 - (nullable SDLVehicleDataResult *)tirePressure {
-    NSObject *obj = [parameters objectForKey:SDLNameTirePressure];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameTirePressure ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setOdometer:(nullable SDLVehicleDataResult *)odometer {
-    if (odometer != nil) {
-        [parameters setObject:odometer forKey:SDLNameOdometer];
-    } else {
-        [parameters removeObjectForKey:SDLNameOdometer];
-    }
+    [parameters sdl_setObject:odometer forName:SDLNameOdometer];
 }
 
 - (nullable SDLVehicleDataResult *)odometer {
-    NSObject *obj = [parameters objectForKey:SDLNameOdometer];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameOdometer ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setBeltStatus:(nullable SDLVehicleDataResult *)beltStatus {
-    if (beltStatus != nil) {
-        [parameters setObject:beltStatus forKey:SDLNameBeltStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameBeltStatus];
-    }
+    [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus];
 }
 
 - (nullable SDLVehicleDataResult *)beltStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameBeltStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameBeltStatus ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setBodyInformation:(nullable SDLVehicleDataResult *)bodyInformation {
-    if (bodyInformation != nil) {
-        [parameters setObject:bodyInformation forKey:SDLNameBodyInformation];
-    } else {
-        [parameters removeObjectForKey:SDLNameBodyInformation];
-    }
+    [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation];
 }
 
 - (nullable SDLVehicleDataResult *)bodyInformation {
-    NSObject *obj = [parameters objectForKey:SDLNameBodyInformation];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameBodyInformation ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setDeviceStatus:(nullable SDLVehicleDataResult *)deviceStatus {
-    if (deviceStatus != nil) {
-        [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameDeviceStatus];
-    }
+    [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus];
 }
 
 - (nullable SDLVehicleDataResult *)deviceStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameDeviceStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameDeviceStatus ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setDriverBraking:(nullable SDLVehicleDataResult *)driverBraking {
-    if (driverBraking != nil) {
-        [parameters setObject:driverBraking forKey:SDLNameDriverBraking];
-    } else {
-        [parameters removeObjectForKey:SDLNameDriverBraking];
-    }
+    [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking];
 }
 
 - (nullable SDLVehicleDataResult *)driverBraking {
-    NSObject *obj = [parameters objectForKey:SDLNameDriverBraking];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameDriverBraking ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setWiperStatus:(nullable SDLVehicleDataResult *)wiperStatus {
-    if (wiperStatus != nil) {
-        [parameters setObject:wiperStatus forKey:SDLNameWiperStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameWiperStatus];
-    }
+    [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus];
 }
 
 - (nullable SDLVehicleDataResult *)wiperStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameWiperStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameWiperStatus ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setHeadLampStatus:(nullable SDLVehicleDataResult *)headLampStatus {
-    if (headLampStatus != nil) {
-        [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameHeadLampStatus];
-    }
+    [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus];
 }
 
 - (nullable SDLVehicleDataResult *)headLampStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameHeadLampStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameHeadLampStatus ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setEngineTorque:(nullable SDLVehicleDataResult *)engineTorque {
-    if (engineTorque != nil) {
-        [parameters setObject:engineTorque forKey:SDLNameEngineTorque];
-    } else {
-        [parameters removeObjectForKey:SDLNameEngineTorque];
-    }
+    [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque];
 }
 
 - (nullable SDLVehicleDataResult *)engineTorque {
-    NSObject *obj = [parameters objectForKey:SDLNameEngineTorque];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameEngineTorque ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setAccPedalPosition:(nullable SDLVehicleDataResult *)accPedalPosition {
-    if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
-    } else {
-        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
-    }
+    [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
 }
 
 - (nullable SDLVehicleDataResult *)accPedalPosition {
-    NSObject *obj = [parameters objectForKey:SDLNameAccelerationPedalPosition];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameAccelerationPedalPosition ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setSteeringWheelAngle:(nullable SDLVehicleDataResult *)steeringWheelAngle {
-    if (steeringWheelAngle != nil) {
-        [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle];
-    } else {
-        [parameters removeObjectForKey:SDLNameSteeringWheelAngle];
-    }
+    [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
 }
 
 - (nullable SDLVehicleDataResult *)steeringWheelAngle {
-    NSObject *obj = [parameters objectForKey:SDLNameSteeringWheelAngle];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameSteeringWheelAngle ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setECallInfo:(nullable SDLVehicleDataResult *)eCallInfo {
-    if (eCallInfo != nil) {
-        [parameters setObject:eCallInfo forKey:SDLNameECallInfo];
-    } else {
-        [parameters removeObjectForKey:SDLNameECallInfo];
-    }
+    [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo];
 }
 
 - (nullable SDLVehicleDataResult *)eCallInfo {
-    NSObject *obj = [parameters objectForKey:SDLNameECallInfo];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameECallInfo ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setAirbagStatus:(nullable SDLVehicleDataResult *)airbagStatus {
-    if (airbagStatus != nil) {
-        [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameAirbagStatus];
-    }
+    [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus];
 }
 
 - (nullable SDLVehicleDataResult *)airbagStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameAirbagStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameAirbagStatus ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setEmergencyEvent:(nullable SDLVehicleDataResult *)emergencyEvent {
-    if (emergencyEvent != nil) {
-        [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent];
-    } else {
-        [parameters removeObjectForKey:SDLNameEmergencyEvent];
-    }
+    [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent];
 }
 
 - (nullable SDLVehicleDataResult *)emergencyEvent {
-    NSObject *obj = [parameters objectForKey:SDLNameEmergencyEvent];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameEmergencyEvent ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setClusterModes:(nullable SDLVehicleDataResult *)clusterModes {
-    if (clusterModes != nil) {
-        [parameters setObject:clusterModes forKey:SDLNameClusterModes];
-    } else {
-        [parameters removeObjectForKey:SDLNameClusterModes];
-    }
+    [parameters sdl_setObject:clusterModes forName:SDLNameClusterModes];
 }
 
 - (nullable SDLVehicleDataResult *)clusterModes {
-    NSObject *obj = [parameters objectForKey:SDLNameClusterModes];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameClusterModes ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setMyKey:(nullable SDLVehicleDataResult *)myKey {
-    if (myKey != nil) {
-        [parameters setObject:myKey forKey:SDLNameMyKey];
-    } else {
-        [parameters removeObjectForKey:SDLNameMyKey];
-    }
+    [parameters sdl_setObject:myKey forName:SDLNameMyKey];
 }
 
 - (nullable SDLVehicleDataResult *)myKey {
-    NSObject *obj = [parameters objectForKey:SDLNameMyKey];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameMyKey ofClass:SDLVehicleDataResult.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSubscribeWaypoints.m b/SmartDeviceLink/SDLSubscribeWaypoints.m
index d3fff74af..65c13be5a 100644
--- a/SmartDeviceLink/SDLSubscribeWaypoints.m
+++ b/SmartDeviceLink/SDLSubscribeWaypoints.m
@@ -2,6 +2,8 @@
 //
 
 #import "SDLSubscribeWaypoints.h"
+
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLSubscribeWaypointsResponse.m b/SmartDeviceLink/SDLSubscribeWaypointsResponse.m
index 1c5b51cb1..28f5cfef4 100644
--- a/SmartDeviceLink/SDLSubscribeWaypointsResponse.m
+++ b/SmartDeviceLink/SDLSubscribeWaypointsResponse.m
@@ -3,6 +3,8 @@
 //
 
 #import "SDLSubscribeWaypointsResponse.h"
+
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 @implementation SDLSubscribeWayPointsResponse
diff --git a/SmartDeviceLink/SDLSyncMsgVersion.m b/SmartDeviceLink/SDLSyncMsgVersion.m
index 5bf3fd2a8..a7950ce3d 100644
--- a/SmartDeviceLink/SDLSyncMsgVersion.m
+++ b/SmartDeviceLink/SDLSyncMsgVersion.m
@@ -4,6 +4,7 @@
 
 #import "SDLSyncMsgVersion.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -23,27 +24,19 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setMajorVersion:(NSNumber<SDLInt> *)majorVersion {
-    if (majorVersion != nil) {
-        [store setObject:majorVersion forKey:SDLNameMajorVersion];
-    } else {
-        [store removeObjectForKey:SDLNameMajorVersion];
-    }
+    [store sdl_setObject:majorVersion forName:SDLNameMajorVersion];
 }
 
 - (NSNumber<SDLInt> *)majorVersion {
-    return [store objectForKey:SDLNameMajorVersion];
+    return [store sdl_objectForName:SDLNameMajorVersion];
 }
 
 - (void)setMinorVersion:(NSNumber<SDLInt> *)minorVersion {
-    if (minorVersion != nil) {
-        [store setObject:minorVersion forKey:SDLNameMinorVersion];
-    } else {
-        [store removeObjectForKey:SDLNameMinorVersion];
-    }
+    [store sdl_setObject:minorVersion forName:SDLNameMinorVersion];
 }
 
 - (NSNumber<SDLInt> *)minorVersion {
-    return [store objectForKey:SDLNameMinorVersion];
+    return [store sdl_objectForName:SDLNameMinorVersion];
 }
 
 - (NSString *)description {
diff --git a/SmartDeviceLink/SDLSyncPData.m b/SmartDeviceLink/SDLSyncPData.m
index dd6809520..0dceaf65d 100644
--- a/SmartDeviceLink/SDLSyncPData.m
+++ b/SmartDeviceLink/SDLSyncPData.m
@@ -4,6 +4,7 @@
 
 #import "SDLSyncPData.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLSyncPDataResponse.m b/SmartDeviceLink/SDLSyncPDataResponse.m
index f6faea873..2cb1c1164 100644
--- a/SmartDeviceLink/SDLSyncPDataResponse.m
+++ b/SmartDeviceLink/SDLSyncPDataResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLSyncPDataResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLSystemRequest.m b/SmartDeviceLink/SDLSystemRequest.m
index f4859ae51..5cb66258d 100644
--- a/SmartDeviceLink/SDLSystemRequest.m
+++ b/SmartDeviceLink/SDLSystemRequest.m
@@ -4,6 +4,7 @@
 
 #import "SDLSystemRequest.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -29,28 +30,19 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setRequestType:(SDLRequestType)requestType {
-    if (requestType != nil) {
-        [parameters setObject:requestType forKey:SDLNameRequestType];
-    } else {
-        [parameters removeObjectForKey:SDLNameRequestType];
-    }
+    [parameters sdl_setObject:requestType forName:SDLNameRequestType];
 }
 
 - (SDLRequestType)requestType {
-    NSObject *obj = [parameters objectForKey:SDLNameRequestType];
-    return (SDLRequestType)obj;
+    return [parameters sdl_objectForName:SDLNameRequestType];
 }
 
 - (void)setFileName:(nullable NSString *)fileName {
-    if (fileName != nil) {
-        [parameters setObject:fileName forKey:SDLNameFilename];
-    } else {
-        [parameters removeObjectForKey:SDLNameFilename];
-    }
+    [parameters sdl_setObject:fileName forName:SDLNameFilename];
 }
 
 - (nullable NSString *)fileName {
-    return [parameters objectForKey:SDLNameFilename];
+    return [parameters sdl_objectForName:SDLNameFilename];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSystemRequestResponse.m b/SmartDeviceLink/SDLSystemRequestResponse.m
index 25154c3ab..f202c544d 100644
--- a/SmartDeviceLink/SDLSystemRequestResponse.m
+++ b/SmartDeviceLink/SDLSystemRequestResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLSystemRequestResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLTTSChunk.m b/SmartDeviceLink/SDLTTSChunk.m
index 2cc70652d..6be3153fb 100644
--- a/SmartDeviceLink/SDLTTSChunk.m
+++ b/SmartDeviceLink/SDLTTSChunk.m
@@ -3,6 +3,7 @@
 
 #import "SDLTTSChunk.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -50,28 +51,19 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setText:(NSString *)text {
-    if (text != nil) {
-        [store setObject:text forKey:SDLNameText];
-    } else {
-        [store removeObjectForKey:SDLNameText];
-    }
+    [store sdl_setObject:text forName:SDLNameText];
 }
 
 - (NSString *)text {
-    return [store objectForKey:SDLNameText];
+    return [store sdl_objectForName:SDLNameText];
 }
 
 - (void)setType:(SDLSpeechCapabilities)type {
-    if (type != nil) {
-        [store setObject:type forKey:SDLNameType];
-    } else {
-        [store removeObjectForKey:SDLNameType];
-    }
+    [store sdl_setObject:type forName:SDLNameType];
 }
 
 - (SDLSpeechCapabilities)type {
-    NSObject *obj = [store objectForKey:SDLNameType];
-    return (SDLSpeechCapabilities)obj;
+    return [store sdl_objectForName:SDLNameType];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLTTSChunkFactory.h b/SmartDeviceLink/SDLTTSChunkFactory.h
deleted file mode 100644
index 0a0801e32..000000000
--- a/SmartDeviceLink/SDLTTSChunkFactory.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//  SDLTTSChunkFactory.h
-//
-
-#import <Foundation/Foundation.h>
-
-#import "SDLSpeechCapabilities.h"
-
-@class SDLTTSChunk;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface SDLTTSChunkFactory : NSObject
-
-+ (SDLTTSChunk *)buildTTSChunkForString:(NSString *)text type:(SDLSpeechCapabilities)type __deprecated_msg("use SDLTTSChunk's initWithText:type: instead");
-+ (NSMutableArray<SDLTTSChunk *> *)buildTTSChunksFromSimple:(NSString *)simple __deprecated_msg("use SDLTTSChunk's textChunksFromString: instead");
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLTTSChunkFactory.m b/SmartDeviceLink/SDLTTSChunkFactory.m
deleted file mode 100644
index e14bf4833..000000000
--- a/SmartDeviceLink/SDLTTSChunkFactory.m
+++ /dev/null
@@ -1,24 +0,0 @@
-//  SDLTTSChunkFactory.m
-//
-
-#import "SDLTTSChunkFactory.h"
-
-#import "SDLTTSChunk.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@implementation SDLTTSChunkFactory
-
-+ (SDLTTSChunk *)buildTTSChunkForString:(NSString *)text type:(SDLSpeechCapabilities)type {
-    SDLTTSChunk *ret = [[SDLTTSChunk alloc] initWithText:text type:type];
-
-    return ret;
-}
-
-+ (NSMutableArray<SDLTTSChunk *> *)buildTTSChunksFromSimple:(NSString *)simple {
-    return [NSMutableArray arrayWithObject:[SDLTTSChunkFactory buildTTSChunkForString:simple type:SDLSpeechCapabilitiesText]];
-}
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLTextField.m b/SmartDeviceLink/SDLTextField.m
index a54a32828..7e6293f58 100644
--- a/SmartDeviceLink/SDLTextField.m
+++ b/SmartDeviceLink/SDLTextField.m
@@ -3,6 +3,7 @@
 
 #import "SDLTextField.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLCharacterSet.h"
 #import "SDLNames.h"
 #import "SDLTextFieldName.h"
@@ -12,53 +13,35 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLTextField
 
 - (void)setName:(SDLTextFieldName)name {
-    if (name != nil) {
-        [store setObject:name forKey:SDLNameName];
-    } else {
-        [store removeObjectForKey:SDLNameName];
-    }
+    [store sdl_setObject:name forName:SDLNameName];
 }
 
 - (SDLTextFieldName)name {
-    NSObject *obj = [store objectForKey:SDLNameName];
-    return (SDLTextFieldName)obj;
+    return [store sdl_objectForName:SDLNameName];
 }
 
 - (void)setCharacterSet:(SDLCharacterSet)characterSet {
-    if (characterSet != nil) {
-        [store setObject:characterSet forKey:SDLNameCharacterSet];
-    } else {
-        [store removeObjectForKey:SDLNameCharacterSet];
-    }
+    [store sdl_setObject:characterSet forName:SDLNameCharacterSet];
 }
 
 - (SDLCharacterSet)characterSet {
-    NSObject *obj = [store objectForKey:SDLNameCharacterSet];
-    return (SDLCharacterSet)obj;
+    return [store sdl_objectForName:SDLNameCharacterSet];
 }
 
 - (void)setWidth:(NSNumber<SDLInt> *)width {
-    if (width != nil) {
-        [store setObject:width forKey:SDLNameWidth];
-    } else {
-        [store removeObjectForKey:SDLNameWidth];
-    }
+    [store sdl_setObject:width forName:SDLNameWidth];
 }
 
 - (NSNumber<SDLInt> *)width {
-    return [store objectForKey:SDLNameWidth];
+    return [store sdl_objectForName:SDLNameWidth];
 }
 
 - (void)setRows:(NSNumber<SDLInt> *)rows {
-    if (rows != nil) {
-        [store setObject:rows forKey:SDLNameRows];
-    } else {
-        [store removeObjectForKey:SDLNameRows];
-    }
+    [store sdl_setObject:rows forName:SDLNameRows];
 }
 
 - (NSNumber<SDLInt> *)rows {
-    return [store objectForKey:SDLNameRows];
+    return [store sdl_objectForName:SDLNameRows];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLTireStatus.m b/SmartDeviceLink/SDLTireStatus.m
index cdfa75548..aad17cdde 100644
--- a/SmartDeviceLink/SDLTireStatus.m
+++ b/SmartDeviceLink/SDLTireStatus.m
@@ -3,6 +3,7 @@
 
 #import "SDLTireStatus.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "SDLSingleTireStatus.h"
 
@@ -11,119 +12,59 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLTireStatus
 
 - (void)setPressureTelltale:(SDLWarningLightStatus)pressureTelltale {
-    if (pressureTelltale != nil) {
-        [store setObject:pressureTelltale forKey:SDLNamePressureTelltale];
-    } else {
-        [store removeObjectForKey:SDLNamePressureTelltale];
-    }
+    [store sdl_setObject:pressureTelltale forName:SDLNamePressureTelltale];
 }
 
 - (SDLWarningLightStatus)pressureTelltale {
-    NSObject *obj = [store objectForKey:SDLNamePressureTelltale];
-    return (SDLWarningLightStatus)obj;
+    return [store sdl_objectForName:SDLNamePressureTelltale];
 }
 
 - (void)setLeftFront:(SDLSingleTireStatus *)leftFront {
-    if (leftFront != nil) {
-        [store setObject:leftFront forKey:SDLNameLeftFront];
-    } else {
-        [store removeObjectForKey:SDLNameLeftFront];
-    }
+    [store sdl_setObject:leftFront forName:SDLNameLeftFront];
 }
 
 - (SDLSingleTireStatus *)leftFront {
-    NSObject *obj = [store objectForKey:SDLNameLeftFront];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLSingleTireStatus alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLSingleTireStatus*)obj;
-
+    return [store sdl_objectForName:SDLNameLeftFront ofClass:SDLSingleTireStatus.class];
 }
 
 - (void)setRightFront:(SDLSingleTireStatus *)rightFront {
-    if (rightFront != nil) {
-        [store setObject:rightFront forKey:SDLNameRightFront];
-    } else {
-        [store removeObjectForKey:SDLNameRightFront];
-    }
+    [store sdl_setObject:rightFront forName:SDLNameRightFront];
 }
 
 - (SDLSingleTireStatus *)rightFront {
-    NSObject *obj = [store objectForKey:SDLNameRightFront];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLSingleTireStatus alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLSingleTireStatus*)obj;
+    return [store sdl_objectForName:SDLNameRightFront ofClass:SDLSingleTireStatus.class];
 }
 
 - (void)setLeftRear:(SDLSingleTireStatus *)leftRear {
-    if (leftRear != nil) {
-        [store setObject:leftRear forKey:SDLNameLeftRear];
-    } else {
-        [store removeObjectForKey:SDLNameLeftRear];
-    }
+    [store sdl_setObject:leftRear forName:SDLNameLeftRear];
 }
 
 - (SDLSingleTireStatus *)leftRear {
-    NSObject *obj = [store objectForKey:SDLNameLeftRear];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLSingleTireStatus alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLSingleTireStatus*)obj;
+    return [store sdl_objectForName:SDLNameLeftRear ofClass:SDLSingleTireStatus.class];
 }
 
 - (void)setRightRear:(SDLSingleTireStatus *)rightRear {
-    if (rightRear != nil) {
-        [store setObject:rightRear forKey:SDLNameRightRear];
-    } else {
-        [store removeObjectForKey:SDLNameRightRear];
-    }
+    [store sdl_setObject:rightRear forName:SDLNameRightRear];
 }
 
 - (SDLSingleTireStatus *)rightRear {
-    NSObject *obj = [store objectForKey:SDLNameRightRear];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLSingleTireStatus alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLSingleTireStatus*)obj;
+    return [store sdl_objectForName:SDLNameRightRear ofClass:SDLSingleTireStatus.class];
 }
 
 - (void)setInnerLeftRear:(SDLSingleTireStatus *)innerLeftRear {
-    if (innerLeftRear != nil) {
-        [store setObject:innerLeftRear forKey:SDLNameInnerLeftRear];
-    } else {
-        [store removeObjectForKey:SDLNameInnerLeftRear];
-    }
+    [store sdl_setObject:innerLeftRear forName:SDLNameInnerLeftRear];
 }
 
 - (SDLSingleTireStatus *)innerLeftRear {
-    NSObject *obj = [store objectForKey:SDLNameInnerLeftRear];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLSingleTireStatus alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLSingleTireStatus*)obj;
+    return [store sdl_objectForName:SDLNameInnerLeftRear ofClass:SDLSingleTireStatus.class];
 }
 
 - (void)setInnerRightRear:(SDLSingleTireStatus *)innerRightRear {
-    if (innerRightRear != nil) {
-        [store setObject:innerRightRear forKey:SDLNameInnerRightRear];
-    } else {
-        [store removeObjectForKey:SDLNameInnerRightRear];
-    }
+    [store sdl_setObject:innerRightRear forName:SDLNameInnerRightRear];
 }
 
 - (SDLSingleTireStatus *)innerRightRear {
-    NSObject *obj = [store objectForKey:SDLNameInnerRightRear];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLSingleTireStatus alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLSingleTireStatus*)obj;
+    return [store sdl_objectForName:SDLNameInnerRightRear ofClass:SDLSingleTireStatus.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLTouchCoord.m b/SmartDeviceLink/SDLTouchCoord.m
index 247794737..bba5b593c 100644
--- a/SmartDeviceLink/SDLTouchCoord.m
+++ b/SmartDeviceLink/SDLTouchCoord.m
@@ -4,6 +4,7 @@
 
 #import "SDLTouchCoord.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -11,27 +12,19 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLTouchCoord
 
 - (void)setX:(NSNumber<SDLFloat> *)x {
-    if (x != nil) {
-        [store setObject:x forKey:SDLNameX];
-    } else {
-        [store removeObjectForKey:SDLNameX];
-    }
+    [store sdl_setObject:x forName:SDLNameX];
 }
 
 - (NSNumber<SDLFloat> *)x {
-    return [store objectForKey:SDLNameX];
+    return [store sdl_objectForName:SDLNameX];
 }
 
 - (void)setY:(NSNumber<SDLFloat> *)y {
-    if (y != nil) {
-        [store setObject:y forKey:SDLNameY];
-    } else {
-        [store removeObjectForKey:SDLNameY];
-    }
+    [store sdl_setObject:y forName:SDLNameY];
 }
 
 - (NSNumber<SDLFloat> *)y {
-    return [store objectForKey:SDLNameY];
+    return [store sdl_objectForName:SDLNameY];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLTouchEvent.m b/SmartDeviceLink/SDLTouchEvent.m
index db8062311..69616940b 100644
--- a/SmartDeviceLink/SDLTouchEvent.m
+++ b/SmartDeviceLink/SDLTouchEvent.m
@@ -4,6 +4,7 @@
 
 #import "SDLTouchEvent.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "SDLTouchCoord.h"
 
@@ -12,48 +13,27 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLTouchEvent
 
 - (void)setTouchEventId:(NSNumber<SDLInt> *)touchEventId {
-    if (touchEventId != nil) {
-        [store setObject:touchEventId forKey:SDLNameId];
-    } else {
-        [store removeObjectForKey:SDLNameId];
-    }
+    [store sdl_setObject:touchEventId forName:SDLNameId];
 }
 
 - (NSNumber<SDLInt> *)touchEventId {
-    return [store objectForKey:SDLNameId];
+    return [store sdl_objectForName:SDLNameId];
 }
 
 - (void)setTimeStamp:(NSMutableArray<NSNumber<SDLInt> *> *)timeStamp {
-    if (timeStamp != nil) {
-        [store setObject:timeStamp forKey:SDLNameTimestamp];
-    } else {
-        [store removeObjectForKey:SDLNameTimestamp];
-    }
+    [store sdl_setObject:timeStamp forName:SDLNameTimestamp];
 }
 
 - (NSMutableArray<NSNumber<SDLInt> *> *)timeStamp {
-    return [store objectForKey:SDLNameTimestamp];
+    return [store sdl_objectForName:SDLNameTimestamp];
 }
 
 - (void)setCoord:(NSMutableArray<SDLTouchCoord *> *)coord {
-    if (coord != nil) {
-        [store setObject:coord forKey:SDLNameCoordinate];
-    } else {
-        [store removeObjectForKey:SDLNameCoordinate];
-    }
+    [store sdl_setObject:coord forName:SDLNameCoordinate];
 }
 
 - (NSMutableArray<SDLTouchCoord *> *)coord {
-    NSMutableArray<SDLTouchCoord *> *array = [store objectForKey:SDLNameCoordinate];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTouchCoord.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLTouchCoord *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLTouchCoord alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [store sdl_objectsForName:SDLNameCoordinate ofClass:SDLTouchCoord.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLTouchEventCapabilities.m b/SmartDeviceLink/SDLTouchEventCapabilities.m
index 894e78c79..cf019dc22 100644
--- a/SmartDeviceLink/SDLTouchEventCapabilities.m
+++ b/SmartDeviceLink/SDLTouchEventCapabilities.m
@@ -4,6 +4,7 @@
 
 #import "SDLTouchEventCapabilities.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -11,39 +12,27 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLTouchEventCapabilities
 
 - (void)setPressAvailable:(NSNumber<SDLBool> *)pressAvailable {
-    if (pressAvailable != nil) {
-        [store setObject:pressAvailable forKey:SDLNamePressAvailable];
-    } else {
-        [store removeObjectForKey:SDLNamePressAvailable];
-    }
+    [store sdl_setObject:pressAvailable forName:SDLNamePressAvailable];
 }
 
 - (NSNumber<SDLBool> *)pressAvailable {
-    return [store objectForKey:SDLNamePressAvailable];
+    return [store sdl_objectForName:SDLNamePressAvailable];
 }
 
 - (void)setMultiTouchAvailable:(NSNumber<SDLBool> *)multiTouchAvailable {
-    if (multiTouchAvailable != nil) {
-        [store setObject:multiTouchAvailable forKey:SDLNameMultiTouchAvailable];
-    } else {
-        [store removeObjectForKey:SDLNameMultiTouchAvailable];
-    }
+    [store sdl_setObject:multiTouchAvailable forName:SDLNameMultiTouchAvailable];
 }
 
 - (NSNumber<SDLBool> *)multiTouchAvailable {
-    return [store objectForKey:SDLNameMultiTouchAvailable];
+    return [store sdl_objectForName:SDLNameMultiTouchAvailable];
 }
 
 - (void)setDoublePressAvailable:(NSNumber<SDLBool> *)doublePressAvailable {
-    if (doublePressAvailable != nil) {
-        [store setObject:doublePressAvailable forKey:SDLNameDoublePressAvailable];
-    } else {
-        [store removeObjectForKey:SDLNameDoublePressAvailable];
-    }
+    [store sdl_setObject:doublePressAvailable forName:SDLNameDoublePressAvailable];
 }
 
 - (NSNumber<SDLBool> *)doublePressAvailable {
-    return [store objectForKey:SDLNameDoublePressAvailable];
+    return [store sdl_objectForName:SDLNameDoublePressAvailable];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLTurn.m b/SmartDeviceLink/SDLTurn.m
index cd4dd78e4..335142782 100644
--- a/SmartDeviceLink/SDLTurn.m
+++ b/SmartDeviceLink/SDLTurn.m
@@ -3,6 +3,7 @@
 
 #import "SDLTurn.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLImage.h"
 #import "SDLNames.h"
 
@@ -23,32 +24,19 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setNavigationText:(nullable NSString *)navigationText {
-    if (navigationText != nil) {
-        [store setObject:navigationText forKey:SDLNameNavigationText];
-    } else {
-        [store removeObjectForKey:SDLNameNavigationText];
-    }
+    [store sdl_setObject:navigationText forName:SDLNameNavigationText];
 }
 
 - (nullable NSString *)navigationText {
-    return [store objectForKey:SDLNameNavigationText];
+    return [store sdl_objectForName:SDLNameNavigationText];
 }
 
 - (void)setTurnIcon:(nullable SDLImage *)turnIcon {
-    if (turnIcon != nil) {
-        [store setObject:turnIcon forKey:SDLNameTurnIcon];
-    } else {
-        [store removeObjectForKey:SDLNameTurnIcon];
-    }
+    [store sdl_setObject:turnIcon forName:SDLNameTurnIcon];
 }
 
 - (nullable SDLImage *)turnIcon {
-    NSObject *obj = [store objectForKey:SDLNameTurnIcon];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLImage*)obj;
+    return [store sdl_objectForName:SDLNameTurnIcon ofClass:SDLImage.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLUnregisterAppInterface.m b/SmartDeviceLink/SDLUnregisterAppInterface.m
index 148c2c0cd..95520fca0 100644
--- a/SmartDeviceLink/SDLUnregisterAppInterface.m
+++ b/SmartDeviceLink/SDLUnregisterAppInterface.m
@@ -4,6 +4,7 @@
 
 #import "SDLUnregisterAppInterface.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m
index dcc9d39bf..77e93858b 100644
--- a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m
+++ b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLUnregisterAppInterfaceResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLUnsubscribeButton.m b/SmartDeviceLink/SDLUnsubscribeButton.m
index 93cf6f4e6..1b1c18616 100644
--- a/SmartDeviceLink/SDLUnsubscribeButton.m
+++ b/SmartDeviceLink/SDLUnsubscribeButton.m
@@ -4,6 +4,7 @@
 
 #import "SDLUnsubscribeButton.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLButtonName.h"
 #import "SDLNames.h"
 
@@ -29,16 +30,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setButtonName:(SDLButtonName)buttonName {
-    if (buttonName != nil) {
-        [parameters setObject:buttonName forKey:SDLNameButtonName];
-    } else {
-        [parameters removeObjectForKey:SDLNameButtonName];
-    }
+    [parameters sdl_setObject:buttonName forName:SDLNameButtonName];
 }
 
 - (SDLButtonName)buttonName {
-    NSObject *obj = [parameters objectForKey:SDLNameButtonName];
-    return (SDLButtonName)obj;
+    return [parameters sdl_objectForName:SDLNameButtonName];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLUnsubscribeButtonResponse.m b/SmartDeviceLink/SDLUnsubscribeButtonResponse.m
index d85f149cb..e92565e58 100644
--- a/SmartDeviceLink/SDLUnsubscribeButtonResponse.m
+++ b/SmartDeviceLink/SDLUnsubscribeButtonResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLUnsubscribeButtonResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.m b/SmartDeviceLink/SDLUnsubscribeVehicleData.m
index 8d58dc73a..ec5312268 100644
--- a/SmartDeviceLink/SDLUnsubscribeVehicleData.m
+++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.m
@@ -4,6 +4,7 @@
 
 #import "SDLUnsubscribeVehicleData.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -51,291 +52,195 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setGps:(nullable NSNumber<SDLBool> *)gps {
-    if (gps != nil) {
-        [parameters setObject:gps forKey:SDLNameGPS];
-    } else {
-        [parameters removeObjectForKey:SDLNameGPS];
-    }
+    [parameters sdl_setObject:gps forName:SDLNameGPS];
 }
 
 - (nullable NSNumber<SDLBool> *)gps {
-    return [parameters objectForKey:SDLNameGPS];
+    return [parameters sdl_objectForName:SDLNameGPS];
 }
 
 - (void)setSpeed:(nullable NSNumber<SDLBool> *)speed {
-    if (speed != nil) {
-        [parameters setObject:speed forKey:SDLNameSpeed];
-    } else {
-        [parameters removeObjectForKey:SDLNameSpeed];
-    }
+    [parameters sdl_setObject:speed forName:SDLNameSpeed];
 }
 
 - (nullable NSNumber<SDLBool> *)speed {
-    return [parameters objectForKey:SDLNameSpeed];
+    return [parameters sdl_objectForName:SDLNameSpeed];
 }
 
 - (void)setRpm:(nullable NSNumber<SDLBool> *)rpm {
-    if (rpm != nil) {
-        [parameters setObject:rpm forKey:SDLNameRPM];
-    } else {
-        [parameters removeObjectForKey:SDLNameRPM];
-    }
+    [parameters sdl_setObject:rpm forName:SDLNameRPM];
 }
 
 - (nullable NSNumber<SDLBool> *)rpm {
-    return [parameters objectForKey:SDLNameRPM];
+    return [parameters sdl_objectForName:SDLNameRPM];
 }
 
 - (void)setFuelLevel:(nullable NSNumber<SDLBool> *)fuelLevel {
-    if (fuelLevel != nil) {
-        [parameters setObject:fuelLevel forKey:SDLNameFuelLevel];
-    } else {
-        [parameters removeObjectForKey:SDLNameFuelLevel];
-    }
+    [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel];
 }
 
 - (nullable NSNumber<SDLBool> *)fuelLevel {
-    return [parameters objectForKey:SDLNameFuelLevel];
+    return [parameters sdl_objectForName:SDLNameFuelLevel];
 }
 
 - (void)setFuelLevel_State:(nullable NSNumber<SDLBool> *)fuelLevel_State {
-    if (fuelLevel_State != nil) {
-        [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState];
-    } else {
-        [parameters removeObjectForKey:SDLNameFuelLevelState];
-    }
+    [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState];
 }
 
 - (nullable NSNumber<SDLBool> *)fuelLevel_State {
-    return [parameters objectForKey:SDLNameFuelLevelState];
+    return [parameters sdl_objectForName:SDLNameFuelLevelState];
 }
 
 - (void)setInstantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption {
-    if (instantFuelConsumption != nil) {
-        [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption];
-    } else {
-        [parameters removeObjectForKey:SDLNameInstantFuelConsumption];
-    }
+    [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
 }
 
 - (nullable NSNumber<SDLBool> *)instantFuelConsumption {
-    return [parameters objectForKey:SDLNameInstantFuelConsumption];
+    return [parameters sdl_objectForName:SDLNameInstantFuelConsumption];
 }
 
 - (void)setExternalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature {
-    if (externalTemperature != nil) {
-        [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature];
-    } else {
-        [parameters removeObjectForKey:SDLNameExternalTemperature];
-    }
+    [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature];
 }
 
 - (nullable NSNumber<SDLBool> *)externalTemperature {
-    return [parameters objectForKey:SDLNameExternalTemperature];
+    return [parameters sdl_objectForName:SDLNameExternalTemperature];
 }
 
 - (void)setPrndl:(nullable NSNumber<SDLBool> *)prndl {
-    if (prndl != nil) {
-        [parameters setObject:prndl forKey:SDLNamePRNDL];
-    } else {
-        [parameters removeObjectForKey:SDLNamePRNDL];
-    }
+    [parameters sdl_setObject:prndl forName:SDLNamePRNDL];
 }
 
 - (nullable NSNumber<SDLBool> *)prndl {
-    return [parameters objectForKey:SDLNamePRNDL];
+    return [parameters sdl_objectForName:SDLNamePRNDL];
 }
 
 - (void)setTirePressure:(nullable NSNumber<SDLBool> *)tirePressure {
-    if (tirePressure != nil) {
-        [parameters setObject:tirePressure forKey:SDLNameTirePressure];
-    } else {
-        [parameters removeObjectForKey:SDLNameTirePressure];
-    }
+    [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure];
 }
 
 - (nullable NSNumber<SDLBool> *)tirePressure {
-    return [parameters objectForKey:SDLNameTirePressure];
+    return [parameters sdl_objectForName:SDLNameTirePressure];
 }
 
 - (void)setOdometer:(nullable NSNumber<SDLBool> *)odometer {
-    if (odometer != nil) {
-        [parameters setObject:odometer forKey:SDLNameOdometer];
-    } else {
-        [parameters removeObjectForKey:SDLNameOdometer];
-    }
+    [parameters sdl_setObject:odometer forName:SDLNameOdometer];
 }
 
 - (nullable NSNumber<SDLBool> *)odometer {
-    return [parameters objectForKey:SDLNameOdometer];
+    return [parameters sdl_objectForName:SDLNameOdometer];
 }
 
 - (void)setBeltStatus:(nullable NSNumber<SDLBool> *)beltStatus {
-    if (beltStatus != nil) {
-        [parameters setObject:beltStatus forKey:SDLNameBeltStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameBeltStatus];
-    }
+    [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus];
 }
 
 - (nullable NSNumber<SDLBool> *)beltStatus {
-    return [parameters objectForKey:SDLNameBeltStatus];
+    return [parameters sdl_objectForName:SDLNameBeltStatus];
 }
 
 - (void)setBodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation {
-    if (bodyInformation != nil) {
-        [parameters setObject:bodyInformation forKey:SDLNameBodyInformation];
-    } else {
-        [parameters removeObjectForKey:SDLNameBodyInformation];
-    }
+    [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation];
 }
 
 - (nullable NSNumber<SDLBool> *)bodyInformation {
-    return [parameters objectForKey:SDLNameBodyInformation];
+    return [parameters sdl_objectForName:SDLNameBodyInformation];
 }
 
 - (void)setDeviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus {
-    if (deviceStatus != nil) {
-        [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameDeviceStatus];
-    }
+    [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus];
 }
 
 - (nullable NSNumber<SDLBool> *)deviceStatus {
-    return [parameters objectForKey:SDLNameDeviceStatus];
+    return [parameters sdl_objectForName:SDLNameDeviceStatus];
 }
 
 - (void)setDriverBraking:(nullable NSNumber<SDLBool> *)driverBraking {
-    if (driverBraking != nil) {
-        [parameters setObject:driverBraking forKey:SDLNameDriverBraking];
-    } else {
-        [parameters removeObjectForKey:SDLNameDriverBraking];
-    }
+    [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking];
 }
 
 - (nullable NSNumber<SDLBool> *)driverBraking {
-    return [parameters objectForKey:SDLNameDriverBraking];
+    return [parameters sdl_objectForName:SDLNameDriverBraking];
 }
 
 - (void)setWiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus {
-    if (wiperStatus != nil) {
-        [parameters setObject:wiperStatus forKey:SDLNameWiperStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameWiperStatus];
-    }
+    [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus];
 }
 
 - (nullable NSNumber<SDLBool> *)wiperStatus {
-    return [parameters objectForKey:SDLNameWiperStatus];
+    return [parameters sdl_objectForName:SDLNameWiperStatus];
 }
 
 - (void)setHeadLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus {
-    if (headLampStatus != nil) {
-        [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameHeadLampStatus];
-    }
+    [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus];
 }
 
 - (nullable NSNumber<SDLBool> *)headLampStatus {
-    return [parameters objectForKey:SDLNameHeadLampStatus];
+    return [parameters sdl_objectForName:SDLNameHeadLampStatus];
 }
 
 - (void)setEngineTorque:(nullable NSNumber<SDLBool> *)engineTorque {
-    if (engineTorque != nil) {
-        [parameters setObject:engineTorque forKey:SDLNameEngineTorque];
-    } else {
-        [parameters removeObjectForKey:SDLNameEngineTorque];
-    }
+    [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque];
 }
 
 - (nullable NSNumber<SDLBool> *)engineTorque {
-    return [parameters objectForKey:SDLNameEngineTorque];
+    return [parameters sdl_objectForName:SDLNameEngineTorque];
 }
 
 - (void)setAccPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition {
-    if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
-    } else {
-        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
-    }
+    [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
 }
 
 - (nullable NSNumber<SDLBool> *)accPedalPosition {
-    return [parameters objectForKey:SDLNameAccelerationPedalPosition];
+    return [parameters sdl_objectForName:SDLNameAccelerationPedalPosition];
 }
 
 - (void)setSteeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle {
-    if (steeringWheelAngle != nil) {
-        [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle];
-    } else {
-        [parameters removeObjectForKey:SDLNameSteeringWheelAngle];
-    }
+    [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
 }
 
 - (nullable NSNumber<SDLBool> *)steeringWheelAngle {
-    return [parameters objectForKey:SDLNameSteeringWheelAngle];
+    return [parameters sdl_objectForName:SDLNameSteeringWheelAngle];
 }
 
 - (void)setECallInfo:(nullable NSNumber<SDLBool> *)eCallInfo {
-    if (eCallInfo != nil) {
-        [parameters setObject:eCallInfo forKey:SDLNameECallInfo];
-    } else {
-        [parameters removeObjectForKey:SDLNameECallInfo];
-    }
+    [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo];
 }
 
 - (nullable NSNumber<SDLBool> *)eCallInfo {
-    return [parameters objectForKey:SDLNameECallInfo];
+    return [parameters sdl_objectForName:SDLNameECallInfo];
 }
 
 - (void)setAirbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus {
-    if (airbagStatus != nil) {
-        [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameAirbagStatus];
-    }
+    [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus];
 }
 
 - (nullable NSNumber<SDLBool> *)airbagStatus {
-    return [parameters objectForKey:SDLNameAirbagStatus];
+    return [parameters sdl_objectForName:SDLNameAirbagStatus];
 }
 
 - (void)setEmergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent {
-    if (emergencyEvent != nil) {
-        [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent];
-    } else {
-        [parameters removeObjectForKey:SDLNameEmergencyEvent];
-    }
+    [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent];
 }
 
 - (nullable NSNumber<SDLBool> *)emergencyEvent {
-    return [parameters objectForKey:SDLNameEmergencyEvent];
+    return [parameters sdl_objectForName:SDLNameEmergencyEvent];
 }
 
 - (void)setClusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus {
-    if (clusterModeStatus != nil) {
-        [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameClusterModeStatus];
-    }
+    [parameters sdl_setObject:clusterModeStatus forName:SDLNameClusterModeStatus];
 }
 
 - (nullable NSNumber<SDLBool> *)clusterModeStatus {
-    return [parameters objectForKey:SDLNameClusterModeStatus];
+    return [parameters sdl_objectForName:SDLNameClusterModeStatus];
 }
 
 - (void)setMyKey:(nullable NSNumber<SDLBool> *)myKey {
-    if (myKey != nil) {
-        [parameters setObject:myKey forKey:SDLNameMyKey];
-    } else {
-        [parameters removeObjectForKey:SDLNameMyKey];
-    }
+    [parameters sdl_setObject:myKey forName:SDLNameMyKey];
 }
 
 - (nullable NSNumber<SDLBool> *)myKey {
-    return [parameters objectForKey:SDLNameMyKey];
+    return [parameters sdl_objectForName:SDLNameMyKey];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
index fee065709..5eb911d42 100644
--- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
+++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
@@ -4,9 +4,12 @@
 
 #import "SDLUnsubscribeVehicleDataResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "SDLVehicleDataResult.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @implementation SDLUnsubscribeVehicleDataResponse
 
 - (instancetype)init {
@@ -16,411 +19,198 @@
 }
 
 - (void)setGps:(nullable SDLVehicleDataResult *)gps {
-    if (gps != nil) {
-        [parameters setObject:gps forKey:SDLNameGPS];
-    } else {
-        [parameters removeObjectForKey:SDLNameGPS];
-    }
+    [parameters sdl_setObject:gps forName:SDLNameGPS];
 }
 
 - (nullable SDLVehicleDataResult *)gps {
-    NSObject *obj = [parameters objectForKey:SDLNameGPS];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameGPS ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setSpeed:(nullable SDLVehicleDataResult *)speed {
-    if (speed != nil) {
-        [parameters setObject:speed forKey:SDLNameSpeed];
-    } else {
-        [parameters removeObjectForKey:SDLNameSpeed];
-    }
+    [parameters sdl_setObject:speed forName:SDLNameSpeed];
 }
 
 - (nullable SDLVehicleDataResult *)speed {
-    NSObject *obj = [parameters objectForKey:SDLNameSpeed];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameSpeed ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setRpm:(nullable SDLVehicleDataResult *)rpm {
-    if (rpm != nil) {
-        [parameters setObject:rpm forKey:SDLNameRPM];
-    } else {
-        [parameters removeObjectForKey:SDLNameRPM];
-    }
+    [parameters sdl_setObject:rpm forName:SDLNameRPM];
 }
 
 - (nullable SDLVehicleDataResult *)rpm {
-    NSObject *obj = [parameters objectForKey:SDLNameRPM];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameRPM ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setFuelLevel:(nullable SDLVehicleDataResult *)fuelLevel {
-    if (fuelLevel != nil) {
-        [parameters setObject:fuelLevel forKey:SDLNameFuelLevel];
-    } else {
-        [parameters removeObjectForKey:SDLNameFuelLevel];
-    }
+    [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel];
 }
 
 - (nullable SDLVehicleDataResult *)fuelLevel {
-    NSObject *obj = [parameters objectForKey:SDLNameFuelLevel];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameFuelLevel ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setFuelLevel_State:(nullable SDLVehicleDataResult *)fuelLevel_State {
-    if (fuelLevel_State != nil) {
-        [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState];
-    } else {
-        [parameters removeObjectForKey:SDLNameFuelLevelState];
-    }
+    [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState];
 }
 
 - (nullable SDLVehicleDataResult *)fuelLevel_State {
-    NSObject *obj = [parameters objectForKey:SDLNameFuelLevelState];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameFuelLevelState ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setInstantFuelConsumption:(nullable SDLVehicleDataResult *)instantFuelConsumption {
-    if (instantFuelConsumption != nil) {
-        [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption];
-    } else {
-        [parameters removeObjectForKey:SDLNameInstantFuelConsumption];
-    }
+    [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
 }
 
 - (nullable SDLVehicleDataResult *)instantFuelConsumption {
-    NSObject *obj = [parameters objectForKey:SDLNameInstantFuelConsumption];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameInstantFuelConsumption ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setExternalTemperature:(nullable SDLVehicleDataResult *)externalTemperature {
-    if (externalTemperature != nil) {
-        [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature];
-    } else {
-        [parameters removeObjectForKey:SDLNameExternalTemperature];
-    }
+    [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature];
 }
 
 - (nullable SDLVehicleDataResult *)externalTemperature {
-    NSObject *obj = [parameters objectForKey:SDLNameExternalTemperature];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameExternalTemperature ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setPrndl:(nullable SDLVehicleDataResult *)prndl {
-    if (prndl != nil) {
-        [parameters setObject:prndl forKey:SDLNamePRNDL];
-    } else {
-        [parameters removeObjectForKey:SDLNamePRNDL];
-    }
+    [parameters sdl_setObject:prndl forName:SDLNamePRNDL];
 }
 
 - (nullable SDLVehicleDataResult *)prndl {
-    NSObject *obj = [parameters objectForKey:SDLNamePRNDL];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNamePRNDL ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setTirePressure:(nullable SDLVehicleDataResult *)tirePressure {
-    if (tirePressure != nil) {
-        [parameters setObject:tirePressure forKey:SDLNameTirePressure];
-    } else {
-        [parameters removeObjectForKey:SDLNameTirePressure];
-    }
+    [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure];
 }
 
 - (nullable SDLVehicleDataResult *)tirePressure {
-    NSObject *obj = [parameters objectForKey:SDLNameTirePressure];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameTirePressure ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setOdometer:(nullable SDLVehicleDataResult *)odometer {
-    if (odometer != nil) {
-        [parameters setObject:odometer forKey:SDLNameOdometer];
-    } else {
-        [parameters removeObjectForKey:SDLNameOdometer];
-    }
+    [parameters sdl_setObject:odometer forName:SDLNameOdometer];
 }
 
 - (nullable SDLVehicleDataResult *)odometer {
-    NSObject *obj = [parameters objectForKey:SDLNameOdometer];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameOdometer ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setBeltStatus:(nullable SDLVehicleDataResult *)beltStatus {
-    if (beltStatus != nil) {
-        [parameters setObject:beltStatus forKey:SDLNameBeltStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameBeltStatus];
-    }
+    [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus];
 }
 
 - (nullable SDLVehicleDataResult *)beltStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameBeltStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameBeltStatus ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setBodyInformation:(nullable SDLVehicleDataResult *)bodyInformation {
-    if (bodyInformation != nil) {
-        [parameters setObject:bodyInformation forKey:SDLNameBodyInformation];
-    } else {
-        [parameters removeObjectForKey:SDLNameBodyInformation];
-    }
+    [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation];
 }
 
 - (nullable SDLVehicleDataResult *)bodyInformation {
-    NSObject *obj = [parameters objectForKey:SDLNameBodyInformation];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameBodyInformation ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setDeviceStatus:(nullable SDLVehicleDataResult *)deviceStatus {
-    if (deviceStatus != nil) {
-        [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameDeviceStatus];
-    }
+    [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus];
 }
 
 - (nullable SDLVehicleDataResult *)deviceStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameDeviceStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameDeviceStatus ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setDriverBraking:(nullable SDLVehicleDataResult *)driverBraking {
-    if (driverBraking != nil) {
-        [parameters setObject:driverBraking forKey:SDLNameDriverBraking];
-    } else {
-        [parameters removeObjectForKey:SDLNameDriverBraking];
-    }
+    [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking];
 }
 
 - (nullable SDLVehicleDataResult *)driverBraking {
-    NSObject *obj = [parameters objectForKey:SDLNameDriverBraking];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameDriverBraking ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setWiperStatus:(nullable SDLVehicleDataResult *)wiperStatus {
-    if (wiperStatus != nil) {
-        [parameters setObject:wiperStatus forKey:SDLNameWiperStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameWiperStatus];
-    }
+    [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus];
 }
 
 - (nullable SDLVehicleDataResult *)wiperStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameWiperStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameWiperStatus ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setHeadLampStatus:(nullable SDLVehicleDataResult *)headLampStatus {
-    if (headLampStatus != nil) {
-        [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameHeadLampStatus];
-    }
+    [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus];
 }
 
 - (nullable SDLVehicleDataResult *)headLampStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameHeadLampStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameHeadLampStatus ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setEngineTorque:(nullable SDLVehicleDataResult *)engineTorque {
-    if (engineTorque != nil) {
-        [parameters setObject:engineTorque forKey:SDLNameEngineTorque];
-    } else {
-        [parameters removeObjectForKey:SDLNameEngineTorque];
-    }
+    [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque];
 }
 
 - (nullable SDLVehicleDataResult *)engineTorque {
-    NSObject *obj = [parameters objectForKey:SDLNameEngineTorque];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameEngineTorque ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setAccPedalPosition:(nullable SDLVehicleDataResult *)accPedalPosition {
-    if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition];
-    } else {
-        [parameters removeObjectForKey:SDLNameAccelerationPedalPosition];
-    }
+    [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
 }
 
 - (nullable SDLVehicleDataResult *)accPedalPosition {
-    NSObject *obj = [parameters objectForKey:SDLNameAccelerationPedalPosition];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameAccelerationPedalPosition ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setSteeringWheelAngle:(nullable SDLVehicleDataResult *)steeringWheelAngle {
-    if (steeringWheelAngle != nil) {
-        [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle];
-    } else {
-        [parameters removeObjectForKey:SDLNameSteeringWheelAngle];
-    }
+    [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
 }
 
 - (nullable SDLVehicleDataResult *)steeringWheelAngle {
-    NSObject *obj = [parameters objectForKey:SDLNameSteeringWheelAngle];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameSteeringWheelAngle ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setECallInfo:(nullable SDLVehicleDataResult *)eCallInfo {
-    if (eCallInfo != nil) {
-        [parameters setObject:eCallInfo forKey:SDLNameECallInfo];
-    } else {
-        [parameters removeObjectForKey:SDLNameECallInfo];
-    }
+    [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo];
 }
 
 - (nullable SDLVehicleDataResult *)eCallInfo {
-    NSObject *obj = [parameters objectForKey:SDLNameECallInfo];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameECallInfo ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setAirbagStatus:(nullable SDLVehicleDataResult *)airbagStatus {
-    if (airbagStatus != nil) {
-        [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus];
-    } else {
-        [parameters removeObjectForKey:SDLNameAirbagStatus];
-    }
+    [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus];
 }
 
 - (nullable SDLVehicleDataResult *)airbagStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameAirbagStatus];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameAirbagStatus ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setEmergencyEvent:(nullable SDLVehicleDataResult *)emergencyEvent {
-    if (emergencyEvent != nil) {
-        [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent];
-    } else {
-        [parameters removeObjectForKey:SDLNameEmergencyEvent];
-    }
+    [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent];
 }
 
 - (nullable SDLVehicleDataResult *)emergencyEvent {
-    NSObject *obj = [parameters objectForKey:SDLNameEmergencyEvent];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameEmergencyEvent ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setClusterModes:(nullable SDLVehicleDataResult *)clusterModes {
-    if (clusterModes != nil) {
-        [parameters setObject:clusterModes forKey:SDLNameClusterModes];
-    } else {
-        [parameters removeObjectForKey:SDLNameClusterModes];
-    }
+    [parameters sdl_setObject:clusterModes forName:SDLNameClusterModes];
 }
 
 - (nullable SDLVehicleDataResult *)clusterModes {
-    NSObject *obj = [parameters objectForKey:SDLNameClusterModes];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameClusterModes ofClass:SDLVehicleDataResult.class];
 }
 
 - (void)setMyKey:(nullable SDLVehicleDataResult *)myKey {
-    if (myKey != nil) {
-        [parameters setObject:myKey forKey:SDLNameMyKey];
-    } else {
-        [parameters removeObjectForKey:SDLNameMyKey];
-    }
+    [parameters sdl_setObject:myKey forName:SDLNameMyKey];
 }
 
 - (nullable SDLVehicleDataResult *)myKey {
-    NSObject *obj = [parameters objectForKey:SDLNameMyKey];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLVehicleDataResult*)obj;
+    return [parameters sdl_objectForName:SDLNameMyKey ofClass:SDLVehicleDataResult.class];
 }
 
+
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLUnsubscribeWaypoints.m b/SmartDeviceLink/SDLUnsubscribeWaypoints.m
index b4b2278bc..74ba51f9a 100644
--- a/SmartDeviceLink/SDLUnsubscribeWaypoints.m
+++ b/SmartDeviceLink/SDLUnsubscribeWaypoints.m
@@ -2,6 +2,8 @@
 //
 
 #import "SDLUnsubscribeWaypoints.h"
+
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.m b/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.m
index 3488500b8..77d5fcebf 100644
--- a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.m
+++ b/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.m
@@ -2,6 +2,8 @@
 //
 
 #import "SDLUnsubscribeWaypointsResponse.h"
+
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLUpdateTurnList.m b/SmartDeviceLink/SDLUpdateTurnList.m
index 62d62e4a0..59b332505 100644
--- a/SmartDeviceLink/SDLUpdateTurnList.m
+++ b/SmartDeviceLink/SDLUpdateTurnList.m
@@ -4,6 +4,7 @@
 
 #import "SDLUpdateTurnList.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 #import "SDLSoftButton.h"
 #import "SDLTurn.h"
@@ -31,45 +32,19 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setTurnList:(nullable NSMutableArray<SDLTurn *> *)turnList {
-    if (turnList != nil) {
-        [parameters setObject:turnList forKey:SDLNameTurnList];
-    } else {
-        [parameters removeObjectForKey:SDLNameTurnList];
-    }
+    [parameters sdl_setObject:turnList forName:SDLNameTurnList];
 }
 
 - (nullable NSMutableArray<SDLTurn *> *)turnList {
-    NSMutableArray<SDLTurn *> *array = [parameters objectForKey:SDLNameTurnList];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTurn.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLTurn *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLTurn alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameTurnList ofClass:SDLTurn.class];
 }
 
 - (void)setSoftButtons:(nullable NSMutableArray<SDLSoftButton *> *)softButtons {
-    if (softButtons != nil) {
-        [parameters setObject:softButtons forKey:SDLNameSoftButtons];
-    } else {
-        [parameters removeObjectForKey:SDLNameSoftButtons];
-    }
+    [parameters sdl_setObject:softButtons forName:SDLNameSoftButtons];
 }
 
 - (nullable NSMutableArray<SDLSoftButton *> *)softButtons {
-    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:SDLNameSoftButtons];
-    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
-        return array;
-    } else {
-        NSMutableArray<SDLSoftButton *> *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (NSDictionary<NSString *, id> *dict in array) {
-            [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]];
-        }
-        return newList;
-    }
+    return [parameters sdl_objectsForName:SDLNameSoftButtons ofClass:SDLSoftButton.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLUpdateTurnListResponse.m b/SmartDeviceLink/SDLUpdateTurnListResponse.m
index 95047fd66..d77ded773 100644
--- a/SmartDeviceLink/SDLUpdateTurnListResponse.m
+++ b/SmartDeviceLink/SDLUpdateTurnListResponse.m
@@ -4,6 +4,7 @@
 
 #import "SDLUpdateTurnListResponse.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SmartDeviceLink/SDLUploadFileOperation.m b/SmartDeviceLink/SDLUploadFileOperation.m
index aaba69fc0..b1648bd4c 100644
--- a/SmartDeviceLink/SDLUploadFileOperation.m
+++ b/SmartDeviceLink/SDLUploadFileOperation.m
@@ -146,7 +146,7 @@ NS_ASSUME_NONNULL_BEGIN
             currentOffset = mtuSize;
         } else {
             putFile.bulkData = [fileData subdataWithRange:NSMakeRange(currentOffset, [putFile.length unsignedIntegerValue])];
-            currentOffset = [putFile.length unsignedIntegerValue];
+            currentOffset += [putFile.length unsignedIntegerValue];
         }
 
         [putFiles addObject:putFile];
diff --git a/SmartDeviceLink/SDLVehicleDataResult.m b/SmartDeviceLink/SDLVehicleDataResult.m
index 4fc333b97..3f4585076 100644
--- a/SmartDeviceLink/SDLVehicleDataResult.m
+++ b/SmartDeviceLink/SDLVehicleDataResult.m
@@ -3,6 +3,7 @@
 
 #import "SDLVehicleDataResult.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -10,29 +11,19 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLVehicleDataResult
 
 - (void)setDataType:(SDLVehicleDataType)dataType {
-    if (dataType != nil) {
-        [store setObject:dataType forKey:SDLNameDataType];
-    } else {
-        [store removeObjectForKey:SDLNameDataType];
-    }
+    [store sdl_setObject:dataType forName:SDLNameDataType];
 }
 
 - (SDLVehicleDataType)dataType {
-    NSObject *obj = [store objectForKey:SDLNameDataType];
-    return (SDLVehicleDataType)obj;
+    return [store sdl_objectForName:SDLNameDataType];
 }
 
 - (void)setResultCode:(SDLVehicleDataResultCode)resultCode {
-    if (resultCode != nil) {
-        [store setObject:resultCode forKey:SDLNameResultCode];
-    } else {
-        [store removeObjectForKey:SDLNameResultCode];
-    }
+    [store sdl_setObject:resultCode forName:SDLNameResultCode];
 }
 
 - (SDLVehicleDataResultCode)resultCode {
-    NSObject *obj = [store objectForKey:SDLNameResultCode];
-    return (SDLVehicleDataResultCode)obj;
+    return [store sdl_objectForName:SDLNameResultCode];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLVehicleType.m b/SmartDeviceLink/SDLVehicleType.m
index c02a7e8f4..73e98aa20 100644
--- a/SmartDeviceLink/SDLVehicleType.m
+++ b/SmartDeviceLink/SDLVehicleType.m
@@ -4,6 +4,7 @@
 
 #import "SDLVehicleType.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -11,51 +12,35 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLVehicleType
 
 - (void)setMake:(nullable NSString *)make {
-    if (make != nil) {
-        [store setObject:make forKey:SDLNameMake];
-    } else {
-        [store removeObjectForKey:SDLNameMake];
-    }
+    [store sdl_setObject:make forName:SDLNameMake];
 }
 
 - (nullable NSString *)make {
-    return [store objectForKey:SDLNameMake];
+    return [store sdl_objectForName:SDLNameMake];
 }
 
 - (void)setModel:(nullable NSString *)model {
-    if (model != nil) {
-        [store setObject:model forKey:SDLNameModel];
-    } else {
-        [store removeObjectForKey:SDLNameModel];
-    }
+    [store sdl_setObject:model forName:SDLNameModel];
 }
 
 - (nullable NSString *)model {
-    return [store objectForKey:SDLNameModel];
+    return [store sdl_objectForName:SDLNameModel];
 }
 
 - (void)setModelYear:(nullable NSString *)modelYear {
-    if (modelYear != nil) {
-        [store setObject:modelYear forKey:SDLNameModelYear];
-    } else {
-        [store removeObjectForKey:SDLNameModelYear];
-    }
+    [store sdl_setObject:modelYear forName:SDLNameModelYear];
 }
 
 - (nullable NSString *)modelYear {
-    return [store objectForKey:SDLNameModelYear];
+    return [store sdl_objectForName:SDLNameModelYear];
 }
 
 - (void)setTrim:(nullable NSString *)trim {
-    if (trim != nil) {
-        [store setObject:trim forKey:SDLNameTrim];
-    } else {
-        [store removeObjectForKey:SDLNameTrim];
-    }
+    [store sdl_setObject:trim forName:SDLNameTrim];
 }
 
 - (nullable NSString *)trim {
-    return [store objectForKey:SDLNameTrim];
+    return [store sdl_objectForName:SDLNameTrim];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLVrHelpItem.m b/SmartDeviceLink/SDLVrHelpItem.m
index 0b9a387a5..7a8b1d1e5 100644
--- a/SmartDeviceLink/SDLVrHelpItem.m
+++ b/SmartDeviceLink/SDLVrHelpItem.m
@@ -4,6 +4,7 @@
 
 #import "SDLVRHelpItem.h"
 
+#import "NSMutableDictionary+Store.h"
 #import "SDLImage.h"
 #import "SDLNames.h"
 
@@ -35,44 +36,27 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setText:(NSString *)text {
-    if (text != nil) {
-        [store setObject:text forKey:SDLNameText];
-    } else {
-        [store removeObjectForKey:SDLNameText];
-    }
+    [store sdl_setObject:text forName:SDLNameText];
 }
 
 - (NSString *)text {
-    return [store objectForKey:SDLNameText];
+    return [store sdl_objectForName:SDLNameText];
 }
 
 - (void)setImage:(nullable SDLImage *)image {
-    if (image != nil) {
-        [store setObject:image forKey:SDLNameImage];
-    } else {
-        [store removeObjectForKey:SDLNameImage];
-    }
+    [store sdl_setObject:image forName:SDLNameImage];
 }
 
 - (nullable SDLImage *)image {
-    NSObject *obj = [store objectForKey:SDLNameImage];
-    if ([obj isKindOfClass:NSDictionary.class]) {
-        return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-    
-    return (SDLImage*)obj;
+    return [store sdl_objectForName:SDLNameImage ofClass:SDLImage.class];
 }
 
 - (void)setPosition:(NSNumber<SDLInt> *)position {
-    if (position != nil) {
-        [store setObject:position forKey:SDLNamePosition];
-    } else {
-        [store removeObjectForKey:SDLNamePosition];
-    }
+    [store sdl_setObject:position forName:SDLNamePosition];
 }
 
 - (NSNumber<SDLInt> *)position {
-    return [store objectForKey:SDLNamePosition];
+    return [store sdl_objectForName:SDLNamePosition];
 }
 
 @end
diff --git a/SmartDeviceLink/SmartDeviceLink.h b/SmartDeviceLink/SmartDeviceLink.h
index 9ca9975b4..9a9f7f0f2 100644
--- a/SmartDeviceLink/SmartDeviceLink.h
+++ b/SmartDeviceLink/SmartDeviceLink.h
@@ -306,6 +306,7 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[];
 #import "SDLPermissionManager.h"
 
 // Utilities
+#import "NSMutableDictionary+Store.h"
 #import "NSNumber+NumberType.h"
 #import "SDLErrorConstants.h"
 #import "SDLNotificationConstants.h"
diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLUploadFileOperationSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLUploadFileOperationSpec.m
index a1bbc6baf..0861a6bf8 100644
--- a/SmartDeviceLinkTests/DevAPISpecs/SDLUploadFileOperationSpec.m
+++ b/SmartDeviceLinkTests/DevAPISpecs/SDLUploadFileOperationSpec.m
@@ -144,15 +144,28 @@ describe(@"Upload File Operation", ^{
             NSArray<SDLPutFile *> *putFiles = testConnectionManager.receivedRequests;
             SDLPutFile *firstPutFile = putFiles.firstObject;
             
-            // First putfile
-            expect(firstPutFile.bulkData).to(equal([testFileData subdataWithRange:NSMakeRange(0, [SDLGlobals sharedGlobals].maxMTUSize)]));
-            expect(firstPutFile.length).to(equal(@(testFileData.length)));
-            expect(firstPutFile.offset).to(equal(@0));
-            expect(firstPutFile.persistentFile).to(equal(@NO));
-            expect(firstPutFile.syncFileName).to(equal(testFileName));
-            
-            NSUInteger numberOfPutFiles = (((testFileData.length - 1) / [SDLGlobals sharedGlobals].maxMTUSize) + 1);
+            NSUInteger numberOfPutFiles = (((testFileData.length - 1) / [SDLGlobals globals].maxMTUSize) + 1);
             expect(@(putFiles.count)).to(equal(@(numberOfPutFiles)));
+
+            // Test all PutFiles pieces for offset & length.
+            for (NSUInteger index = 0; index < numberOfPutFiles; index++) {
+                SDLPutFile *putFile = putFiles[index];
+                
+                expect(putFile.offset).to(equal(@(index * [SDLGlobals globals].maxMTUSize)));
+                expect(putFile.persistentFile).to(equal(@NO));
+                expect(putFile.syncFileName).to(equal(testFileName));
+                expect(putFile.bulkData).to(equal([testFileData subdataWithRange:NSMakeRange((index * [SDLGlobals globals].maxMTUSize), MIN(putFile.length.unsignedIntegerValue, [SDLGlobals globals].maxMTUSize))]));
+
+                // First Putfile has some differences due to informing core of the total incoming packet size.
+                if (index == 0) {
+                    expect(putFile.length).to(equal(@(testFileData.length)));
+                } else if (index == numberOfPutFiles - 1) {
+                    expect(putFile.length).to(equal(@(testFileData.length - (index * [SDLGlobals globals].maxMTUSize))));
+                } else {
+                    expect(putFile.length).to(equal(@([SDLGlobals globals].maxMTUSize)));
+                }
+            }
+            
         });
     });
 });
author	Muller, Alexander (A.) <amulle19@ford.com>	2017-01-19 13:06:09 -0800
committer	Muller, Alexander (A.) <amulle19@ford.com>	2017-01-19 13:06:09 -0800
commit	60598db369fc814e92b448c549653edc57cf57b2 (patch)
tree	e4129f2d1ee07f6303bde12d6eaf160289a44a19
parent	64bc1cd9db9f1cab94a0786cf4f09120b0aa4816 (diff)
parent	69638e102c3f769a18145c0029a34f9b5f32f10b (diff)
download	sdl_ios-60598db369fc814e92b448c549653edc57cf57b2.tar.gz