Migrated to using a category instead of adding the classes to the subclass of SDLRPCStruct.

125 files changed, 1162 insertions, 1172 deletions

diff --git a/SmartDeviceLink/NSMutableDictionary+Store.h b/SmartDeviceLink/NSMutableDictionary+Store.h
new file mode 100644
index 000000000..67962da19
--- /dev/null
+++ b/SmartDeviceLink/NSMutableDictionary+Store.h
@@ -0,0 +1,20 @@
+//
+//  NSMutableDictionary+Store.h
+//  SmartDeviceLink-iOS
+//
+//  Created by Muller, Alexander (A.) on 11/7/16.
+//  Copyright © 2016 smartdevicelink. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+typedef NSString* SDLName;
+
+@interface NSMutableDictionary (Store)
+
+- (void)sdl_setObject:(NSObject *)object forName:(SDLName)name;
+- (id)sdl_objectForName:(SDLName)name;
+- (id)sdl_objectForName:(SDLName)name ofClass:(Class)classType;
+- (NSMutableArray *)sdl_objectsForName:(SDLName)name ofClass:(Class)classType;
+
+@end
diff --git a/SmartDeviceLink/NSMutableDictionary+Store.m b/SmartDeviceLink/NSMutableDictionary+Store.m
new file mode 100644
index 000000000..c75aa27d8
--- /dev/null
+++ b/SmartDeviceLink/NSMutableDictionary+Store.m
@@ -0,0 +1,48 @@
+//
+//  NSMutableDictionary+Store.m
+//  SmartDeviceLink-iOS
+//
+//  Created by Muller, Alexander (A.) on 11/7/16.
+//  Copyright © 2016 smartdevicelink. All rights reserved.
+//
+
+#import "NSMutableDictionary+Store.h"
+
+@implementation NSMutableDictionary (Store)
+
+- (void)sdl_setObject:(NSObject *)object forName:(SDLName)name {
+    if (object != nil) {
+        self[name] = object;
+    } else {
+        [self removeObjectForKey:name];
+    }
+}
+
+- (id)sdl_objectForName:(SDLName)name {
+    return self[name];
+}
+
+- (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;
+    }
+}
+
+
+@end
diff --git a/SmartDeviceLink/SDLAddCommand.m b/SmartDeviceLink/SDLAddCommand.m
index 32deb7fc1..bc2601422 100644
--- a/SmartDeviceLink/SDLAddCommand.m
+++ b/SmartDeviceLink/SDLAddCommand.m
@@ -66,35 +66,35 @@
 }
 
 - (void)setCmdID:(NSNumber<SDLInt> *)cmdID {
-    [self setObject:cmdID forName:SDLNameCommandId];
+    [parameters sdl_setObject:cmdID forName:SDLNameCommandId];
 }
 
 - (NSNumber<SDLInt> *)cmdID {
-    return [parameters objectForKey:SDLNameCommandId];
+    return [parameters sdl_objectForName:SDLNameCommandId];
 }
 
 - (void)setMenuParams:(SDLMenuParams *)menuParams {
-    [self setObject:menuParams forName:SDLNameMenuParams];
+    [parameters sdl_setObject:menuParams forName:SDLNameMenuParams];
 }
 
 - (SDLMenuParams *)menuParams {
-    return [self objectForName:SDLNameMenuParams ofClass:SDLMenuParams.class];
+    return [parameters sdl_objectForName:SDLNameMenuParams ofClass:SDLMenuParams.class];
 }
 
 - (void)setVrCommands:(NSMutableArray<NSString *> *)vrCommands {
-    [self setObject:vrCommands forName:SDLNameVRCommands];
+    [parameters sdl_setObject:vrCommands forName:SDLNameVRCommands];
 }
 
 - (NSMutableArray<NSString *> *)vrCommands {
-    return [parameters objectForKey:SDLNameVRCommands];
+    return [parameters sdl_objectForName:SDLNameVRCommands];
 }
 
 - (void)setCmdIcon:(SDLImage *)cmdIcon {
-    [self setObject:cmdIcon forName:SDLNameCommandIcon];
+    [parameters sdl_setObject:cmdIcon forName:SDLNameCommandIcon];
 }
 
 - (SDLImage *)cmdIcon {
-    return [self objectForName:SDLNameCommandIcon ofClass:SDLImage.class];
+    return [parameters sdl_objectForName:SDLNameCommandIcon ofClass:SDLImage.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLAddSubMenu.m b/SmartDeviceLink/SDLAddSubMenu.m
index 139773533..6b00814a8 100644
--- a/SmartDeviceLink/SDLAddSubMenu.m
+++ b/SmartDeviceLink/SDLAddSubMenu.m
@@ -37,27 +37,27 @@
 }
 
 - (void)setMenuID:(NSNumber<SDLInt> *)menuID {
-    [self setObject:menuID forName:SDLNameMenuId];
+    [parameters sdl_setObject:menuID forName:SDLNameMenuId];
 }
 
 - (NSNumber<SDLInt> *)menuID {
-    return [parameters objectForKey:SDLNameMenuId];
+    return [parameters sdl_objectForName:SDLNameMenuId];
 }
 
 - (void)setPosition:(NSNumber<SDLInt> *)position {
-    [self setObject:position forName:SDLNamePosition];
+    [parameters sdl_setObject:position forName:SDLNamePosition];
 }
 
 - (NSNumber<SDLInt> *)position {
-    return [parameters objectForKey:SDLNamePosition];
+    return [parameters sdl_objectForName:SDLNamePosition];
 }
 
 - (void)setMenuName:(NSString *)menuName {
-    [self setObject:menuName forName:SDLNameMenuName];
+    [parameters sdl_setObject:menuName forName:SDLNameMenuName];
 }
 
 - (NSString *)menuName {
-    return [parameters objectForKey:SDLNameMenuName];
+    return [parameters sdl_objectForName:SDLNameMenuName];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLAirbagStatus.m b/SmartDeviceLink/SDLAirbagStatus.m
index 08fa83546..a4f7068e1 100644
--- a/SmartDeviceLink/SDLAirbagStatus.m
+++ b/SmartDeviceLink/SDLAirbagStatus.m
@@ -7,66 +7,66 @@
 @implementation SDLAirbagStatus
 
 - (void)setDriverAirbagDeployed:(SDLVehicleDataEventStatus)driverAirbagDeployed {
-    [self setObject:driverAirbagDeployed forName:SDLNameDriverAirbagDeployed];
+    [store sdl_setObject:driverAirbagDeployed forName:SDLNameDriverAirbagDeployed];
 }
 
 - (SDLVehicleDataEventStatus)driverAirbagDeployed {
-    return [self objectForName:SDLNameDriverAirbagDeployed];
+    return [store sdl_objectForName:SDLNameDriverAirbagDeployed];
 }
 
 - (void)setDriverSideAirbagDeployed:(SDLVehicleDataEventStatus)driverSideAirbagDeployed {
-    [self setObject:driverSideAirbagDeployed forName:SDLNameDriverSideAirbagDeployed];
+    [store sdl_setObject:driverSideAirbagDeployed forName:SDLNameDriverSideAirbagDeployed];
 }
 
 - (SDLVehicleDataEventStatus)driverSideAirbagDeployed {
-    return [self objectForName:SDLNameDriverSideAirbagDeployed];
+    return [store sdl_objectForName:SDLNameDriverSideAirbagDeployed];
 }
 
 - (void)setDriverCurtainAirbagDeployed:(SDLVehicleDataEventStatus)driverCurtainAirbagDeployed {
-    [self setObject:driverCurtainAirbagDeployed forName:SDLNameDriverCurtainAirbagDeployed];
+    [store sdl_setObject:driverCurtainAirbagDeployed forName:SDLNameDriverCurtainAirbagDeployed];
 }
 
 - (SDLVehicleDataEventStatus)driverCurtainAirbagDeployed {
-    return [self objectForName:SDLNameDriverCurtainAirbagDeployed];
+    return [store sdl_objectForName:SDLNameDriverCurtainAirbagDeployed];
 }
 
 - (void)setPassengerAirbagDeployed:(SDLVehicleDataEventStatus)passengerAirbagDeployed {
-    [self setObject:passengerAirbagDeployed forName:SDLNamePassengerAirbagDeployed];}
+    [store sdl_setObject:passengerAirbagDeployed forName:SDLNamePassengerAirbagDeployed];}
 
 - (SDLVehicleDataEventStatus)passengerAirbagDeployed {
-    return [self objectForName:SDLNamePassengerAirbagDeployed];
+    return [store sdl_objectForName:SDLNamePassengerAirbagDeployed];
 }
 
 - (void)setPassengerCurtainAirbagDeployed:(SDLVehicleDataEventStatus)passengerCurtainAirbagDeployed {
-    [self setObject:passengerCurtainAirbagDeployed forName:SDLNamePassengerCurtainAirbagDeployed];
+    [store sdl_setObject:passengerCurtainAirbagDeployed forName:SDLNamePassengerCurtainAirbagDeployed];
 }
 
 - (SDLVehicleDataEventStatus)passengerCurtainAirbagDeployed {
-    return [self objectForName:SDLNamePassengerCurtainAirbagDeployed];
+    return [store sdl_objectForName:SDLNamePassengerCurtainAirbagDeployed];
 }
 
 - (void)setDriverKneeAirbagDeployed:(SDLVehicleDataEventStatus)driverKneeAirbagDeployed {
-    [self setObject:driverKneeAirbagDeployed forName:SDLNameDriverKneeAirbagDeployed];
+    [store sdl_setObject:driverKneeAirbagDeployed forName:SDLNameDriverKneeAirbagDeployed];
 }
 
 - (SDLVehicleDataEventStatus)driverKneeAirbagDeployed {
-    return [self objectForName:SDLNameDriverKneeAirbagDeployed];
+    return [store sdl_objectForName:SDLNameDriverKneeAirbagDeployed];
 }
 
 - (void)setPassengerSideAirbagDeployed:(SDLVehicleDataEventStatus)passengerSideAirbagDeployed {
-    [self setObject:passengerSideAirbagDeployed forName:SDLNamePassengerSideAirbagDeployed];
+    [store sdl_setObject:passengerSideAirbagDeployed forName:SDLNamePassengerSideAirbagDeployed];
 }
 
 - (SDLVehicleDataEventStatus)passengerSideAirbagDeployed {
-    return [self objectForName:SDLNamePassengerSideAirbagDeployed];
+    return [store sdl_objectForName:SDLNamePassengerSideAirbagDeployed];
 }
 
 - (void)setPassengerKneeAirbagDeployed:(SDLVehicleDataEventStatus)passengerKneeAirbagDeployed {
-    [self setObject:passengerKneeAirbagDeployed forName:SDLNamePassengerKneeAirbagDeployed];
+    [store sdl_setObject:passengerKneeAirbagDeployed forName:SDLNamePassengerKneeAirbagDeployed];
 }
 
 - (SDLVehicleDataEventStatus)passengerKneeAirbagDeployed {
-    return [self objectForName:SDLNamePassengerKneeAirbagDeployed];
+    return [store sdl_objectForName:SDLNamePassengerKneeAirbagDeployed];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLAlert.m b/SmartDeviceLink/SDLAlert.m
index a68878193..db5c1ed9f 100644
--- a/SmartDeviceLink/SDLAlert.m
+++ b/SmartDeviceLink/SDLAlert.m
@@ -72,67 +72,67 @@ static UInt16 const SDLDefaultDuration = 5000;
 }
 
 - (void)setAlertText1:(NSString *)alertText1 {
-    [self setObject:alertText1 forName:SDLNameAlertText1];
+    [parameters sdl_setObject:alertText1 forName:SDLNameAlertText1];
 }
 
 - (NSString *)alertText1 {
-    return [parameters objectForKey:SDLNameAlertText1];
+    return [parameters sdl_objectForName:SDLNameAlertText1];
 }
 
 - (void)setAlertText2:(NSString *)alertText2 {
-    [self setObject:alertText2 forName:SDLNameAlertText2];
+    [parameters sdl_setObject:alertText2 forName:SDLNameAlertText2];
 }
 
 - (NSString *)alertText2 {
-    return [parameters objectForKey:SDLNameAlertText2];
+    return [parameters sdl_objectForName:SDLNameAlertText2];
 }
 
 - (void)setAlertText3:(NSString *)alertText3 {
-    [self setObject:alertText3 forName:SDLNameAlertText3];
+    [parameters sdl_setObject:alertText3 forName:SDLNameAlertText3];
 }
 
 - (NSString *)alertText3 {
-    return [parameters objectForKey:SDLNameAlertText3];
+    return [parameters sdl_objectForName:SDLNameAlertText3];
 }
 
 - (void)setTtsChunks:(NSMutableArray<SDLTTSChunk *> *)ttsChunks {
-    [self setObject:ttsChunks forName:SDLNameTTSChunks];
+    [parameters sdl_setObject:ttsChunks forName:SDLNameTTSChunks];
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)ttsChunks {
-    return [self objectsForName:SDLNameTTSChunks ofClass:SDLTTSChunk.class];
+    return [parameters sdl_objectsForName:SDLNameTTSChunks ofClass:SDLTTSChunk.class];
 }
 
 - (void)setDuration:(NSNumber<SDLInt> *)duration {
-    [self setObject:duration forName:SDLNameDuration];
+    [parameters sdl_setObject:duration forName:SDLNameDuration];
 }
 
 - (NSNumber<SDLInt> *)duration {
-    return [parameters objectForKey:SDLNameDuration];
+    return [parameters sdl_objectForName:SDLNameDuration];
 }
 
 - (void)setPlayTone:(NSNumber<SDLBool> *)playTone {
-    [self setObject:playTone forName:SDLNamePlayTone];
+    [parameters sdl_setObject:playTone forName:SDLNamePlayTone];
 }
 
 - (NSNumber<SDLBool> *)playTone {
-    return [parameters objectForKey:SDLNamePlayTone];
+    return [parameters sdl_objectForName:SDLNamePlayTone];
 }
 
 - (void)setProgressIndicator:(NSNumber<SDLBool> *)progressIndicator {
-    [self setObject:progressIndicator forName:SDLNameProgressIndicator];
+    [parameters sdl_setObject:progressIndicator forName:SDLNameProgressIndicator];
 }
 
 - (NSNumber<SDLBool> *)progressIndicator {
-    return [parameters objectForKey:SDLNameProgressIndicator];
+    return [parameters sdl_objectForName:SDLNameProgressIndicator];
 }
 
 - (void)setSoftButtons:(NSMutableArray<SDLSoftButton *> *)softButtons {
-    [self setObject:softButtons forName:SDLNameSoftButtons];
+    [parameters sdl_setObject:softButtons forName:SDLNameSoftButtons];
 }
 
 - (NSMutableArray<SDLSoftButton *> *)softButtons {
-    return [self objectsForName:SDLNameSoftButtons ofClass:SDLSoftButton.class];
+    return [parameters sdl_objectsForName:SDLNameSoftButtons ofClass:SDLSoftButton.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLAlertManeuver.m b/SmartDeviceLink/SDLAlertManeuver.m
index b472f3529..c5c94b0a1 100644
--- a/SmartDeviceLink/SDLAlertManeuver.m
+++ b/SmartDeviceLink/SDLAlertManeuver.m
@@ -35,19 +35,19 @@
 }
 
 - (void)setTtsChunks:(NSMutableArray<SDLTTSChunk *> *)ttsChunks {
-    [self setObject:ttsChunks forName:SDLNameTTSChunks];
+    [parameters sdl_setObject:ttsChunks forName:SDLNameTTSChunks];
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)ttsChunks {
-    return [self objectsForName:SDLNameTTSChunks ofClass:SDLTTSChunk.class];
+    return [parameters sdl_objectsForName:SDLNameTTSChunks ofClass:SDLTTSChunk.class];
 }
 
 - (void)setSoftButtons:(NSMutableArray<SDLSoftButton *> *)softButtons {
-    [self setObject:softButtons forName:SDLNameSoftButtons];
+    [parameters sdl_setObject:softButtons forName:SDLNameSoftButtons];
 }
 
 - (NSMutableArray<SDLSoftButton *> *)softButtons {
-    return [self objectsForName:SDLNameSoftButtons ofClass:SDLSoftButton.class];
+    return [parameters sdl_objectsForName:SDLNameSoftButtons ofClass:SDLSoftButton.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLAlertResponse.m b/SmartDeviceLink/SDLAlertResponse.m
index 9008c53e5..d350a1c77 100644
--- a/SmartDeviceLink/SDLAlertResponse.m
+++ b/SmartDeviceLink/SDLAlertResponse.m
@@ -14,7 +14,7 @@
 }
 
 - (void)setTryAgainTime:(NSNumber<SDLInt> *)tryAgainTime {
-    [self setObject:tryAgainTime forName:SDLNameTryAgainTime];}
+    [parameters sdl_setObject:tryAgainTime forName:SDLNameTryAgainTime];}
 
 - (NSNumber<SDLInt> *)tryAgainTime {
     return [parameters objectForKey:SDLNameTryAgainTime];
diff --git a/SmartDeviceLink/SDLAppInfo.m b/SmartDeviceLink/SDLAppInfo.m
index b1786c1e9..7163a7f78 100644
--- a/SmartDeviceLink/SDLAppInfo.m
+++ b/SmartDeviceLink/SDLAppInfo.m
@@ -24,27 +24,27 @@ static NSString *const SDLBundleAppNameKey = @"CFBundleName";
 }
 
 - (void)setAppDisplayName:(NSString *)appDisplayName {
-    [self setObject:appDisplayName forName:SDLNameAppDisplayName];
+    [store sdl_setObject:appDisplayName forName:SDLNameAppDisplayName];
 }
 
 - (NSString *)appDisplayName {
-    return [self objectForName:SDLNameAppDisplayName];
+    return [store sdl_objectForName:SDLNameAppDisplayName];
 }
 
 - (void)setAppBundleID:(NSString *)appBundleID {
-    [self setObject:appBundleID forName:SDLNameAppBundleId];
+    [store sdl_setObject:appBundleID forName:SDLNameAppBundleId];
 }
 
 - (NSString *)appBundleID {
-    return [self objectForName:SDLNameAppBundleId];
+    return [store sdl_objectForName:SDLNameAppBundleId];
 }
 
 - (void)setAppVersion:(NSString *)appVersion {
-    [self setObject:appVersion forName:SDLNameAppVersion];
+    [store sdl_setObject:appVersion forName:SDLNameAppVersion];
 }
 
 - (NSString *)appVersion {
-    return [self objectForName:SDLNameAppVersion];
+    return [store sdl_objectForName:SDLNameAppVersion];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLAudioPassThruCapabilities.m b/SmartDeviceLink/SDLAudioPassThruCapabilities.m
index 20f467ebe..ae590c2ac 100644
--- a/SmartDeviceLink/SDLAudioPassThruCapabilities.m
+++ b/SmartDeviceLink/SDLAudioPassThruCapabilities.m
@@ -10,27 +10,27 @@
 @implementation SDLAudioPassThruCapabilities
 
 - (void)setSamplingRate:(SDLSamplingRate)samplingRate {
-    [self setObject:samplingRate forName:SDLNameSamplingRate];
+    [store sdl_setObject:samplingRate forName:SDLNameSamplingRate];
 }
 
 - (SDLSamplingRate)samplingRate {
-    return [self objectForName:SDLNameSamplingRate];
+    return [store sdl_objectForName:SDLNameSamplingRate];
 }
 
 - (void)setBitsPerSample:(SDLBitsPerSample)bitsPerSample {
-    [self setObject:bitsPerSample forName:SDLNameBitsPerSample];
+    [store sdl_setObject:bitsPerSample forName:SDLNameBitsPerSample];
 }
 
 - (SDLBitsPerSample)bitsPerSample {
-    return [self objectForName:SDLNameBitsPerSample];
+    return [store sdl_objectForName:SDLNameBitsPerSample];
 }
 
 - (void)setAudioType:(SDLAudioType)audioType {
-    [self setObject:audioType forName:SDLNameAudioType];
+    [store sdl_setObject:audioType forName:SDLNameAudioType];
 }
 
 - (SDLAudioType)audioType {
-    return [self objectForName:SDLNameAudioType];
+    return [store sdl_objectForName:SDLNameAudioType];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLBeltStatus.m b/SmartDeviceLink/SDLBeltStatus.m
index 73f71ed8d..604c68b4d 100644
--- a/SmartDeviceLink/SDLBeltStatus.m
+++ b/SmartDeviceLink/SDLBeltStatus.m
@@ -9,123 +9,123 @@
 @implementation SDLBeltStatus
 
 - (void)setDriverBeltDeployed:(SDLVehicleDataEventStatus)driverBeltDeployed {
-    [self setObject:driverBeltDeployed forName:SDLNameDriverBeltDeployed];
+    [store sdl_setObject:driverBeltDeployed forName:SDLNameDriverBeltDeployed];
 }
 
 - (SDLVehicleDataEventStatus)driverBeltDeployed {
-    return [self objectForName:SDLNameDriverBeltDeployed];
+    return [store sdl_objectForName:SDLNameDriverBeltDeployed];
 }
 
 - (void)setPassengerBeltDeployed:(SDLVehicleDataEventStatus)passengerBeltDeployed {
-    [self setObject:passengerBeltDeployed forName:SDLNamePassengerBeltDeployed];
+    [store sdl_setObject:passengerBeltDeployed forName:SDLNamePassengerBeltDeployed];
 }
 
 - (SDLVehicleDataEventStatus)passengerBeltDeployed {
-    return [self objectForName:SDLNamePassengerBeltDeployed];
+    return [store sdl_objectForName:SDLNamePassengerBeltDeployed];
 }
 
 - (void)setPassengerBuckleBelted:(SDLVehicleDataEventStatus)passengerBuckleBelted {
-    [self setObject:passengerBuckleBelted forName:SDLNamePassengerBuckleBelted];
+    [store sdl_setObject:passengerBuckleBelted forName:SDLNamePassengerBuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)passengerBuckleBelted {
-    return [self objectForName:SDLNamePassengerBuckleBelted];
+    return [store sdl_objectForName:SDLNamePassengerBuckleBelted];
 }
 
 - (void)setDriverBuckleBelted:(SDLVehicleDataEventStatus)driverBuckleBelted {
-    [self setObject:driverBuckleBelted forName:SDLNameDriverBuckleBelted];
+    [store sdl_setObject:driverBuckleBelted forName:SDLNameDriverBuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)driverBuckleBelted {
-    return [self objectForName:SDLNameDriverBuckleBelted];
+    return [store sdl_objectForName:SDLNameDriverBuckleBelted];
 }
 
 - (void)setLeftRow2BuckleBelted:(SDLVehicleDataEventStatus)leftRow2BuckleBelted {
-    [self setObject:leftRow2BuckleBelted forName:SDLNameLeftRow2BuckleBelted];
+    [store sdl_setObject:leftRow2BuckleBelted forName:SDLNameLeftRow2BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)leftRow2BuckleBelted {
-    return [self objectForName:SDLNameLeftRow2BuckleBelted];
+    return [store sdl_objectForName:SDLNameLeftRow2BuckleBelted];
 }
 
 - (void)setPassengerChildDetected:(SDLVehicleDataEventStatus)passengerChildDetected {
-    [self setObject:passengerChildDetected forName:SDLNamePassengerChildDetected];
+    [store sdl_setObject:passengerChildDetected forName:SDLNamePassengerChildDetected];
 }
 
 - (SDLVehicleDataEventStatus)passengerChildDetected {
-    return [self objectForName:SDLNamePassengerChildDetected];
+    return [store sdl_objectForName:SDLNamePassengerChildDetected];
 }
 
 - (void)setRightRow2BuckleBelted:(SDLVehicleDataEventStatus)rightRow2BuckleBelted {
-    [self setObject:rightRow2BuckleBelted forName:SDLNameRightRow2BuckleBelted];
+    [store sdl_setObject:rightRow2BuckleBelted forName:SDLNameRightRow2BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)rightRow2BuckleBelted {
-    return [self objectForName:SDLNameRightRow2BuckleBelted];
+    return [store sdl_objectForName:SDLNameRightRow2BuckleBelted];
 }
 
 - (void)setMiddleRow2BuckleBelted:(SDLVehicleDataEventStatus)middleRow2BuckleBelted {
-    [self setObject:middleRow2BuckleBelted forName:SDLNameMiddleRow2BuckleBelted];
+    [store sdl_setObject:middleRow2BuckleBelted forName:SDLNameMiddleRow2BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)middleRow2BuckleBelted {
-    return [self objectForName:SDLNameMiddleRow2BuckleBelted];
+    return [store sdl_objectForName:SDLNameMiddleRow2BuckleBelted];
 }
 
 - (void)setMiddleRow3BuckleBelted:(SDLVehicleDataEventStatus)middleRow3BuckleBelted {
-    [self setObject:middleRow3BuckleBelted forName:SDLNameMiddleRow3BuckleBelted];
+    [store sdl_setObject:middleRow3BuckleBelted forName:SDLNameMiddleRow3BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)middleRow3BuckleBelted {
-    return [self objectForName:SDLNameMiddleRow3BuckleBelted];
+    return [store sdl_objectForName:SDLNameMiddleRow3BuckleBelted];
 }
 
 - (void)setLeftRow3BuckleBelted:(SDLVehicleDataEventStatus)leftRow3BuckleBelted {
-    [self setObject:leftRow3BuckleBelted forName:SDLNameLeftRow3BuckleBelted];
+    [store sdl_setObject:leftRow3BuckleBelted forName:SDLNameLeftRow3BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)leftRow3BuckleBelted {
-    return [self objectForName:SDLNameLeftRow3BuckleBelted];
+    return [store sdl_objectForName:SDLNameLeftRow3BuckleBelted];
 }
 
 - (void)setRightRow3BuckleBelted:(SDLVehicleDataEventStatus)rightRow3BuckleBelted {
-    [self setObject:rightRow3BuckleBelted forName:SDLNameRightRow3BuckleBelted];
+    [store sdl_setObject:rightRow3BuckleBelted forName:SDLNameRightRow3BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)rightRow3BuckleBelted {
-    return [self objectForName:SDLNameRightRow3BuckleBelted];
+    return [store sdl_objectForName:SDLNameRightRow3BuckleBelted];
 }
 
 - (void)setLeftRearInflatableBelted:(SDLVehicleDataEventStatus)leftRearInflatableBelted {
-    [self setObject:leftRearInflatableBelted forName:SDLNameLeftRearInflatableBelted];
+    [store sdl_setObject:leftRearInflatableBelted forName:SDLNameLeftRearInflatableBelted];
 }
 
 - (SDLVehicleDataEventStatus)leftRearInflatableBelted {
-    return [self objectForName:SDLNameLeftRearInflatableBelted];
+    return [store sdl_objectForName:SDLNameLeftRearInflatableBelted];
 }
 
 - (void)setRightRearInflatableBelted:(SDLVehicleDataEventStatus)rightRearInflatableBelted {
-    [self setObject:rightRearInflatableBelted forName:SDLNameRightRearInflatableBelted];
+    [store sdl_setObject:rightRearInflatableBelted forName:SDLNameRightRearInflatableBelted];
 }
 
 - (SDLVehicleDataEventStatus)rightRearInflatableBelted {
-    return [self objectForName:SDLNameRightRearInflatableBelted];
+    return [store sdl_objectForName:SDLNameRightRearInflatableBelted];
 }
 
 - (void)setMiddleRow1BeltDeployed:(SDLVehicleDataEventStatus)middleRow1BeltDeployed {
-    [self setObject:middleRow1BeltDeployed forName:SDLNameMiddleRow1BeltDeployed];
+    [store sdl_setObject:middleRow1BeltDeployed forName:SDLNameMiddleRow1BeltDeployed];
 }
 
 - (SDLVehicleDataEventStatus)middleRow1BeltDeployed {
-    return [self objectForName:SDLNameMiddleRow1BeltDeployed];
+    return [store sdl_objectForName:SDLNameMiddleRow1BeltDeployed];
 }
 
 - (void)setMiddleRow1BuckleBelted:(SDLVehicleDataEventStatus)middleRow1BuckleBelted {
-    [self setObject:middleRow1BuckleBelted forName:SDLNameMiddleRow1BuckleBelted];
+    [store sdl_setObject:middleRow1BuckleBelted forName:SDLNameMiddleRow1BuckleBelted];
 }
 
 - (SDLVehicleDataEventStatus)middleRow1BuckleBelted {
-    return [self objectForName:SDLNameMiddleRow1BuckleBelted];
+    return [store sdl_objectForName:SDLNameMiddleRow1BuckleBelted];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLBodyInformation.m b/SmartDeviceLink/SDLBodyInformation.m
index d7c860325..3cdee6db7 100644
--- a/SmartDeviceLink/SDLBodyInformation.m
+++ b/SmartDeviceLink/SDLBodyInformation.m
@@ -11,59 +11,59 @@
 @implementation SDLBodyInformation
 
 - (void)setParkBrakeActive:(NSNumber<SDLBool> *)parkBrakeActive {
-    [self setObject:parkBrakeActive forName:SDLNameParkBrakeActive];
+    [store sdl_setObject:parkBrakeActive forName:SDLNameParkBrakeActive];
 }
 
 - (NSNumber<SDLBool> *)parkBrakeActive {
-    return [self objectForName:SDLNameParkBrakeActive];
+    return [store sdl_objectForName:SDLNameParkBrakeActive];
 }
 
 - (void)setIgnitionStableStatus:(SDLIgnitionStableStatus)ignitionStableStatus {
-    [self setObject:ignitionStableStatus forName:SDLNameIgnitionStableStatus];
+    [store sdl_setObject:ignitionStableStatus forName:SDLNameIgnitionStableStatus];
 }
 
 - (SDLIgnitionStableStatus)ignitionStableStatus {
-    return [self objectForName:SDLNameIgnitionStableStatus];
+    return [store sdl_objectForName:SDLNameIgnitionStableStatus];
 }
 
 - (void)setIgnitionStatus:(SDLIgnitionStatus)ignitionStatus {
-    [self setObject:ignitionStatus forName:SDLNameIgnitionStatus];
+    [store sdl_setObject:ignitionStatus forName:SDLNameIgnitionStatus];
 }
 
 - (SDLIgnitionStatus)ignitionStatus {
-    return [self objectForName:SDLNameIgnitionStatus];
+    return [store sdl_objectForName:SDLNameIgnitionStatus];
 }
 
 - (void)setDriverDoorAjar:(NSNumber<SDLBool> *)driverDoorAjar {
-    [self setObject:driverDoorAjar forName:SDLNameDriverDoorAjar];
+    [store sdl_setObject:driverDoorAjar forName:SDLNameDriverDoorAjar];
 }
 
 - (NSNumber<SDLBool> *)driverDoorAjar {
-    return [self objectForName:SDLNameDriverDoorAjar];
+    return [store sdl_objectForName:SDLNameDriverDoorAjar];
 }
 
 - (void)setPassengerDoorAjar:(NSNumber<SDLBool> *)passengerDoorAjar {
-    [self setObject:passengerDoorAjar forName:SDLNamePassengerDoorAjar];
+    [store sdl_setObject:passengerDoorAjar forName:SDLNamePassengerDoorAjar];
 }
 
 - (NSNumber<SDLBool> *)passengerDoorAjar {
-    return [self objectForName:SDLNamePassengerDoorAjar];
+    return [store sdl_objectForName:SDLNamePassengerDoorAjar];
 }
 
 - (void)setRearLeftDoorAjar:(NSNumber<SDLBool> *)rearLeftDoorAjar {
-    [self setObject:rearLeftDoorAjar forName:SDLNameRearLeftDoorAjar];
+    [store sdl_setObject:rearLeftDoorAjar forName:SDLNameRearLeftDoorAjar];
 }
 
 - (NSNumber<SDLBool> *)rearLeftDoorAjar {
-    return [self objectForName:SDLNameRearLeftDoorAjar];
+    return [store sdl_objectForName:SDLNameRearLeftDoorAjar];
 }
 
 - (void)setRearRightDoorAjar:(NSNumber<SDLBool> *)rearRightDoorAjar {
-    [self setObject:rearRightDoorAjar forName:SDLNameRearRightDoorAjar];
+    [store sdl_setObject:rearRightDoorAjar forName:SDLNameRearRightDoorAjar];
 }
 
 - (NSNumber<SDLBool> *)rearRightDoorAjar {
-    return [self objectForName:SDLNameRearRightDoorAjar];
+    return [store sdl_objectForName:SDLNameRearRightDoorAjar];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLButtonCapabilities.m b/SmartDeviceLink/SDLButtonCapabilities.m
index 4c80d204b..91f651731 100644
--- a/SmartDeviceLink/SDLButtonCapabilities.m
+++ b/SmartDeviceLink/SDLButtonCapabilities.m
@@ -8,35 +8,35 @@
 @implementation SDLButtonCapabilities
 
 - (void)setName:(SDLButtonName)name {
-    [self setObject:name forName:SDLNameName];
+    [store sdl_setObject:name forName:SDLNameName];
 }
 
 - (SDLButtonName)name {
-    return [self objectForName:SDLNameName];
+    return [store sdl_objectForName:SDLNameName];
 }
 
 - (void)setShortPressAvailable:(NSNumber<SDLBool> *)shortPressAvailable {
-    [self setObject:shortPressAvailable forName:SDLNameShortPressAvailable];
+    [store sdl_setObject:shortPressAvailable forName:SDLNameShortPressAvailable];
 }
 
 - (NSNumber<SDLBool> *)shortPressAvailable {
-    return [self objectForName:SDLNameShortPressAvailable];
+    return [store sdl_objectForName:SDLNameShortPressAvailable];
 }
 
 - (void)setLongPressAvailable:(NSNumber<SDLBool> *)longPressAvailable {
-    [self setObject:longPressAvailable forName:SDLNameLongPressAvailable];
+    [store sdl_setObject:longPressAvailable forName:SDLNameLongPressAvailable];
 }
 
 - (NSNumber<SDLBool> *)longPressAvailable {
-    return [self objectForName:SDLNameLongPressAvailable];
+    return [store sdl_objectForName:SDLNameLongPressAvailable];
 }
 
 - (void)setUpDownAvailable:(NSNumber<SDLBool> *)upDownAvailable {
-    [self setObject:upDownAvailable forName:SDLNameUpDownAvailable];
+    [store sdl_setObject:upDownAvailable forName:SDLNameUpDownAvailable];
 }
 
 - (NSNumber<SDLBool> *)upDownAvailable {
-    return [self objectForName:SDLNameUpDownAvailable];
+    return [store sdl_objectForName:SDLNameUpDownAvailable];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLChangeRegistration.m b/SmartDeviceLink/SDLChangeRegistration.m
index 91bfec4bf..0561ed003 100644
--- a/SmartDeviceLink/SDLChangeRegistration.m
+++ b/SmartDeviceLink/SDLChangeRegistration.m
@@ -40,51 +40,51 @@
 }
 
 - (void)setLanguage:(SDLLanguage)language {
-    [self setObject:language forName:SDLNameLanguage];
+    [parameters sdl_setObject:language forName:SDLNameLanguage];
 }
 
 - (SDLLanguage)language {
-    return [self objectForName:SDLNameLanguage];
+    return [parameters sdl_objectForName:SDLNameLanguage];
 }
 
 - (void)setHmiDisplayLanguage:(SDLLanguage )hmiDisplayLanguage {
-    [self setObject:hmiDisplayLanguage forName:SDLNameHMIDisplayLanguage];
+    [parameters sdl_setObject:hmiDisplayLanguage forName:SDLNameHMIDisplayLanguage];
 }
 
 - (SDLLanguage )hmiDisplayLanguage {
-    return [self objectForName:SDLNameHMIDisplayLanguage];
+    return [parameters sdl_objectForName:SDLNameHMIDisplayLanguage];
 }
 
 - (void)setAppName:(NSString *)appName {
-    [self setObject:appName forName:SDLNameAppName];
+    [parameters sdl_setObject:appName forName:SDLNameAppName];
 }
 
 - (NSString *)appName {
-    return [[self objectForName:SDLNameAppName] copy];
+    return [[parameters sdl_objectForName:SDLNameAppName] copy];
 }
 
 - (void)setTtsName:(NSArray<SDLTTSChunk *> *)ttsName {
-    [self setObject:ttsName forName:SDLNameTTSName];
+    [parameters sdl_setObject:ttsName forName:SDLNameTTSName];
 }
 
 - (NSArray<SDLTTSChunk *> *)ttsName {
-    return [[self objectForName:SDLNameTTSName] copy];
+    return [[parameters sdl_objectForName:SDLNameTTSName] copy];
 }
 
 - (void)setNgnMediaScreenAppName:(NSString *)ngnMediaScreenAppName {
-    [self setObject:ngnMediaScreenAppName forName:SDLNameNGNMediaScreenAppName];
+    [parameters sdl_setObject:ngnMediaScreenAppName forName:SDLNameNGNMediaScreenAppName];
 }
 
 - (NSString *)ngnMediaScreenAppName {
-    return [[self objectForName:SDLNameNGNMediaScreenAppName] copy];
+    return [[parameters sdl_objectForName:SDLNameNGNMediaScreenAppName] copy];
 }
 
 - (void)setVrSynonyms:(NSArray<NSString *> *)vrSynonyms {
-    [self setObject:vrSynonyms forName:SDLNameVRSynonyms];
+    [parameters sdl_setObject:vrSynonyms forName:SDLNameVRSynonyms];
 }
 
 - (NSArray<NSString *> *)vrSynonyms {
-    return [[self objectForName:SDLNameVRSynonyms] copy];
+    return [[parameters sdl_objectForName:SDLNameVRSynonyms] copy];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLChoice.m b/SmartDeviceLink/SDLChoice.m
index 16cb238b5..eb8fb94b5 100644
--- a/SmartDeviceLink/SDLChoice.m
+++ b/SmartDeviceLink/SDLChoice.m
@@ -36,59 +36,59 @@
 }
 
 - (void)setChoiceID:(NSNumber<SDLInt> *)choiceID {
-    [self setObject:choiceID forName:SDLNameChoiceId];
+    [store sdl_setObject:choiceID forName:SDLNameChoiceId];
 }
 
 - (NSNumber<SDLInt> *)choiceID {
-    return [self objectForName:SDLNameChoiceId];
+    return [store sdl_objectForName:SDLNameChoiceId];
 }
 
 - (void)setMenuName:(NSString *)menuName {
-    [self setObject:menuName forName:SDLNameMenuName];
+    [store sdl_setObject:menuName forName:SDLNameMenuName];
 }
 
 - (NSString *)menuName {
-    return [self objectForName:SDLNameMenuName];
+    return [store sdl_objectForName:SDLNameMenuName];
 }
 
 - (void)setVrCommands:(NSMutableArray<NSString *> *)vrCommands {
-    [self setObject:vrCommands forName:SDLNameVRCommands];
+    [store sdl_setObject:vrCommands forName:SDLNameVRCommands];
 }
 
 - (NSMutableArray<NSString *> *)vrCommands {
-    return [self objectForName:SDLNameVRCommands];
+    return [store sdl_objectForName:SDLNameVRCommands];
 }
 
 - (void)setImage:(SDLImage *)image {
-    [self setObject:image forName:SDLNameImage];
+    [store sdl_setObject:image forName:SDLNameImage];
 }
 
 - (SDLImage *)image {
-    return [self objectForName:SDLNameImage ofClass:SDLImage.class];
+    return [store sdl_objectForName:SDLNameImage ofClass:SDLImage.class];
 }
 
 - (void)setSecondaryText:(NSString *)secondaryText {
-    [self setObject:secondaryText forName:SDLNameSecondaryText];
+    [store sdl_setObject:secondaryText forName:SDLNameSecondaryText];
 }
 
 - (NSString *)secondaryText {
-    return [self objectForName:SDLNameSecondaryText];
+    return [store sdl_objectForName:SDLNameSecondaryText];
 }
 
 - (void)setTertiaryText:(NSString *)tertiaryText {
-    [self setObject:tertiaryText forName:SDLNameTertiaryText];
+    [store sdl_setObject:tertiaryText forName:SDLNameTertiaryText];
 }
 
 - (NSString *)tertiaryText {
-    return [self objectForName:SDLNameTertiaryText];
+    return [store sdl_objectForName:SDLNameTertiaryText];
 }
 
 - (void)setSecondaryImage:(SDLImage *)secondaryImage {
-    [self setObject:secondaryImage forName:SDLNameSecondaryImage];
+    [store sdl_setObject:secondaryImage forName:SDLNameSecondaryImage];
 }
 
 - (SDLImage *)secondaryImage {
-    return [self objectForName:SDLNameSecondaryImage ofClass:SDLImage.class];
+    return [store sdl_objectForName:SDLNameSecondaryImage ofClass:SDLImage.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLClusterModeStatus.m b/SmartDeviceLink/SDLClusterModeStatus.m
index ebefab22a..fba5e8114 100644
--- a/SmartDeviceLink/SDLClusterModeStatus.m
+++ b/SmartDeviceLink/SDLClusterModeStatus.m
@@ -8,35 +8,35 @@
 @implementation SDLClusterModeStatus
 
 - (void)setPowerModeActive:(NSNumber<SDLBool> *)powerModeActive {
-    [self setObject:powerModeActive forName:SDLNamePowerModeActive];
+    [store sdl_setObject:powerModeActive forName:SDLNamePowerModeActive];
 }
 
 - (NSNumber<SDLBool> *)powerModeActive {
-    return [self objectForName:SDLNamePowerModeActive];
+    return [store sdl_objectForName:SDLNamePowerModeActive];
 }
 
 - (void)setPowerModeQualificationStatus:(SDLPowerModeQualificationStatus)powerModeQualificationStatus {
-    [self setObject:powerModeQualificationStatus forName:SDLNamePowerModeQualificationStatus];
+    [store sdl_setObject:powerModeQualificationStatus forName:SDLNamePowerModeQualificationStatus];
 }
 
 - (SDLPowerModeQualificationStatus)powerModeQualificationStatus {
-    return [self objectForName:SDLNamePowerModeQualificationStatus];
+    return [store sdl_objectForName:SDLNamePowerModeQualificationStatus];
 }
 
 - (void)setCarModeStatus:(SDLCarModeStatus)carModeStatus {
-    [self setObject:carModeStatus forName:SDLNameCarModeStatus];
+    [store sdl_setObject:carModeStatus forName:SDLNameCarModeStatus];
 }
 
 - (SDLCarModeStatus)carModeStatus {
-    return [self objectForName:SDLNameCarModeStatus];
+    return [store sdl_objectForName:SDLNameCarModeStatus];
 }
 
 - (void)setPowerModeStatus:(SDLPowerModeStatus)powerModeStatus {
-    [self setObject:powerModeStatus forName:SDLNamePowerModeStatus];
+    [store sdl_setObject:powerModeStatus forName:SDLNamePowerModeStatus];
 }
 
 - (SDLPowerModeStatus)powerModeStatus {
-    return [self objectForName:SDLNamePowerModeStatus];
+    return [store sdl_objectForName:SDLNamePowerModeStatus];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
index 1e8504b25..94be7e956 100644
--- a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
+++ b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
@@ -27,19 +27,19 @@
 }
 
 - (void)setInteractionChoiceSetID:(NSNumber<SDLInt> *)interactionChoiceSetID {
-    [self setObject:interactionChoiceSetID forName:SDLNameInteractionChoiceSetId];
+    [parameters sdl_setObject:interactionChoiceSetID forName:SDLNameInteractionChoiceSetId];
 }
 
 - (NSNumber<SDLInt> *)interactionChoiceSetID {
-    return [parameters objectForKey:SDLNameInteractionChoiceSetId];
+    return [parameters sdl_objectForName:SDLNameInteractionChoiceSetId];
 }
 
 - (void)setChoiceSet:(NSMutableArray<SDLChoice *> *)choiceSet {
-    [self setObject:choiceSet forName:SDLNameChoiceSet];
+    [parameters sdl_setObject:choiceSet forName:SDLNameChoiceSet];
 }
 
 - (NSMutableArray<SDLChoice *> *)choiceSet {
-    return [self objectsForName:SDLNameChoiceSet ofClass:SDLChoice.class];
+    return [parameters sdl_objectsForName:SDLNameChoiceSet ofClass:SDLChoice.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDIDResult.m b/SmartDeviceLink/SDLDIDResult.m
index 9681dbaa8..8c1da777d 100644
--- a/SmartDeviceLink/SDLDIDResult.m
+++ b/SmartDeviceLink/SDLDIDResult.m
@@ -8,27 +8,27 @@
 @implementation SDLDIDResult
 
 - (void)setResultCode:(SDLVehicleDataResultCode)resultCode {
-    [self setObject:resultCode forName:SDLNameResultCode];
+    [store sdl_setObject:resultCode forName:SDLNameResultCode];
 }
 
 - (SDLVehicleDataResultCode)resultCode {
-    return [self objectForName:SDLNameResultCode];
+    return [store sdl_objectForName:SDLNameResultCode];
 }
 
 - (void)setDidLocation:(NSNumber<SDLInt> *)didLocation {
-    [self setObject:didLocation forName:SDLNameDIDLocation];
+    [store sdl_setObject:didLocation forName:SDLNameDIDLocation];
 }
 
 - (NSNumber<SDLInt> *)didLocation {
-    return [self objectForName:SDLNameDIDLocation];
+    return [store sdl_objectForName:SDLNameDIDLocation];
 }
 
 - (void)setData:(NSString *)data {
-    [self setObject:data forName:SDLNameData];
+    [store sdl_setObject:data forName:SDLNameData];
 }
 
 - (NSString *)data {
-    return [self objectForName:SDLNameData];
+    return [store sdl_objectForName:SDLNameData];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDateTime.m b/SmartDeviceLink/SDLDateTime.m
index f931dfde7..2b0e4fddd 100644
--- a/SmartDeviceLink/SDLDateTime.m
+++ b/SmartDeviceLink/SDLDateTime.m
@@ -57,75 +57,75 @@
 }
 
 - (void)setMillisecond:(NSNumber<SDLInt> *)millisecond {
-    [self setObject:millisecond forName:SDLNameMillisecond];
+    [store sdl_setObject:millisecond forName:SDLNameMillisecond];
 }
 
 - (NSNumber<SDLInt> *)millisecond {
-    return [self objectForName:SDLNameMillisecond];
+    return [store sdl_objectForName:SDLNameMillisecond];
 }
 
 - (void)setSecond:(NSNumber<SDLInt> *)second {
-    [self setObject:second forName:SDLNameSecond];
+    [store sdl_setObject:second forName:SDLNameSecond];
 }
 
 - (NSNumber<SDLInt> *)second {
-    return [self objectForName:SDLNameSecond];
+    return [store sdl_objectForName:SDLNameSecond];
 }
 
 - (void)setMinute:(NSNumber<SDLInt> *)minute {
-    [self setObject:minute forName:SDLNameMinute];
+    [store sdl_setObject:minute forName:SDLNameMinute];
 }
 
 - (NSNumber<SDLInt> *)minute {
-    return [self objectForName:SDLNameMinute];
+    return [store sdl_objectForName:SDLNameMinute];
 }
 
 - (void)setHour:(NSNumber<SDLInt> *)hour {
-    [self setObject:hour forName:SDLNameHour];
+    [store sdl_setObject:hour forName:SDLNameHour];
 }
 
 - (NSNumber<SDLInt> *)hour {
-    return [self objectForName:SDLNameHour];
+    return [store sdl_objectForName:SDLNameHour];
 }
 
 - (void)setDay:(NSNumber<SDLInt> *)day {
-    [self setObject:day forName:SDLNameDay];
+    [store sdl_setObject:day forName:SDLNameDay];
 }
 
 - (NSNumber<SDLInt> *)day {
-    return [self objectForName:SDLNameDay];
+    return [store sdl_objectForName:SDLNameDay];
 }
 
 - (void)setMonth:(NSNumber<SDLInt> *)month {
-    [self setObject:month forName:SDLNameMonth];
+    [store sdl_setObject:month forName:SDLNameMonth];
 }
 
 - (NSNumber<SDLInt> *)month {
-    return [self objectForName:SDLNameMonth];
+    return [store sdl_objectForName:SDLNameMonth];
 }
 
 - (void)setYear:(NSNumber<SDLInt> *)year {
-    [self setObject:year forName:SDLNameYear];
+    [store sdl_setObject:year forName:SDLNameYear];
 }
 
 - (NSNumber<SDLInt> *)year {
-    return [self objectForName:SDLNameYear];
+    return [store sdl_objectForName:SDLNameYear];
 }
 
 - (void)setTimezoneMinuteOffset:(NSNumber<SDLInt> *)timezoneMinuteOffset {
-    [self setObject:timezoneMinuteOffset forName:SDLNameTimezoneMinuteOffset];
+    [store sdl_setObject:timezoneMinuteOffset forName:SDLNameTimezoneMinuteOffset];
 }
 
 - (NSNumber<SDLInt> *)timezoneMinuteOffset {
-    return [self objectForName:SDLNameTimezoneMinuteOffset];
+    return [store sdl_objectForName:SDLNameTimezoneMinuteOffset];
 }
 
 - (void)setTimezoneHourOffset:(NSNumber<SDLInt> *)timezoneHourOffset {
-    [self setObject:timezoneHourOffset forName:SDLNameTimezoneHourOffset];
+    [store sdl_setObject:timezoneHourOffset forName:SDLNameTimezoneHourOffset];
 }
 
 - (NSNumber<SDLInt> *)timezoneHourOffset {
-    return [self objectForName:SDLNameTimezoneHourOffset];
+    return [store sdl_objectForName:SDLNameTimezoneHourOffset];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDeleteCommand.m b/SmartDeviceLink/SDLDeleteCommand.m
index 32564a124..834605661 100644
--- a/SmartDeviceLink/SDLDeleteCommand.m
+++ b/SmartDeviceLink/SDLDeleteCommand.m
@@ -26,11 +26,11 @@
 }
 
 - (void)setCmdID:(NSNumber<SDLInt> *)cmdID {
-    [self setObject:cmdID forName:SDLNameCommandId];
+    [parameters sdl_setObject:cmdID forName:SDLNameCommandId];
 }
 
 - (NSNumber<SDLInt> *)cmdID {
-    return [parameters objectForKey:SDLNameCommandId];
+    return [parameters sdl_objectForName:SDLNameCommandId];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDeleteFile.m b/SmartDeviceLink/SDLDeleteFile.m
index 1fd46a859..c284f20fe 100644
--- a/SmartDeviceLink/SDLDeleteFile.m
+++ b/SmartDeviceLink/SDLDeleteFile.m
@@ -26,11 +26,11 @@
 }
 
 - (void)setSyncFileName:(NSString *)syncFileName {
-    [self setObject:syncFileName forName: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 2e7eb3235..ac1346fd4 100644
--- a/SmartDeviceLink/SDLDeleteFileResponse.m
+++ b/SmartDeviceLink/SDLDeleteFileResponse.m
@@ -15,7 +15,7 @@
 }
 
 - (void)setSpaceAvailable:(NSNumber<SDLInt> *)spaceAvailable {
-    [self setObject:spaceAvailable forName:SDLNameSpaceAvailable];
+    [parameters sdl_setObject:spaceAvailable forName:SDLNameSpaceAvailable];
 }
 
 - (NSNumber<SDLInt> *)spaceAvailable {
diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
index 7cc8554ef..14b69718e 100644
--- a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
+++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
@@ -26,11 +26,11 @@
 }
 
 - (void)setInteractionChoiceSetID:(NSNumber<SDLInt> *)interactionChoiceSetID {
-    [self setObject:interactionChoiceSetID forName:SDLNameInteractionChoiceSetId];
+    [parameters sdl_setObject:interactionChoiceSetID forName:SDLNameInteractionChoiceSetId];
 }
 
 - (NSNumber<SDLInt> *)interactionChoiceSetID {
-    return [parameters objectForKey:SDLNameInteractionChoiceSetId];
+    return [parameters sdl_objectForName:SDLNameInteractionChoiceSetId];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDeleteSubMenu.m b/SmartDeviceLink/SDLDeleteSubMenu.m
index eed5a3e7a..e4832baba 100644
--- a/SmartDeviceLink/SDLDeleteSubMenu.m
+++ b/SmartDeviceLink/SDLDeleteSubMenu.m
@@ -26,11 +26,11 @@
 }
 
 - (void)setMenuID:(NSNumber<SDLInt> *)menuID {
-    [self setObject:menuID forName:SDLNameMenuId];
+    [parameters sdl_setObject:menuID forName:SDLNameMenuId];
 }
 
 - (NSNumber<SDLInt> *)menuID {
-    return [parameters objectForKey:SDLNameMenuId];
+    return [parameters sdl_objectForName:SDLNameMenuId];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDeviceInfo.m b/SmartDeviceLink/SDLDeviceInfo.m
index a3e8fe14b..907cfd3fc 100644
--- a/SmartDeviceLink/SDLDeviceInfo.m
+++ b/SmartDeviceLink/SDLDeviceInfo.m
@@ -27,51 +27,51 @@
 }
 
 - (void)setHardware:(NSString *)hardware {
-    [self setObject:hardware forName:SDLNameHardware];
+    [store sdl_setObject:hardware forName:SDLNameHardware];
 }
 
 - (NSString *)hardware {
-    return [self objectForName:SDLNameHardware];
+    return [store sdl_objectForName:SDLNameHardware];
 }
 
 - (void)setFirmwareRev:(NSString *)firmwareRev {
-    [self setObject:firmwareRev forName:SDLNameFirmwareRevision];
+    [store sdl_setObject:firmwareRev forName:SDLNameFirmwareRevision];
 }
 
 - (NSString *)firmwareRev {
-    return [self objectForName:SDLNameFirmwareRevision];
+    return [store sdl_objectForName:SDLNameFirmwareRevision];
 }
 
 - (void)setOs:(NSString *)os {
-    [self setObject:os forName:SDLNameOS];
+    [store sdl_setObject:os forName:SDLNameOS];
 }
 
 - (NSString *)os {
-    return [self objectForName:SDLNameOS];
+    return [store sdl_objectForName:SDLNameOS];
 }
 
 - (void)setOsVersion:(NSString *)osVersion {
-    [self setObject:osVersion forName:SDLNameOSVersion];
+    [store sdl_setObject:osVersion forName:SDLNameOSVersion];
 }
 
 - (NSString *)osVersion {
-    return [self objectForName:SDLNameOSVersion];
+    return [store sdl_objectForName:SDLNameOSVersion];
 }
 
 - (void)setCarrier:(NSString *)carrier {
-    [self setObject:carrier forName:SDLNameCarrier];
+    [store sdl_setObject:carrier forName:SDLNameCarrier];
 }
 
 - (NSString *)carrier {
-    return [self objectForName:SDLNameCarrier];
+    return [store sdl_objectForName:SDLNameCarrier];
 }
 
 - (void)setMaxNumberRFCOMMPorts:(NSNumber<SDLInt> *)maxNumberRFCOMMPorts {
-    [self setObject:maxNumberRFCOMMPorts forName:SDLNameMaxNumberRFCOMMPorts];
+    [store sdl_setObject:maxNumberRFCOMMPorts forName:SDLNameMaxNumberRFCOMMPorts];
 }
 
 - (NSNumber<SDLInt> *)maxNumberRFCOMMPorts {
-    return [self objectForName:SDLNameMaxNumberRFCOMMPorts];
+    return [store sdl_objectForName:SDLNameMaxNumberRFCOMMPorts];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDeviceStatus.m b/SmartDeviceLink/SDLDeviceStatus.m
index 0c5963d2d..60e22259e 100644
--- a/SmartDeviceLink/SDLDeviceStatus.m
+++ b/SmartDeviceLink/SDLDeviceStatus.m
@@ -10,91 +10,91 @@
 @implementation SDLDeviceStatus
 
 - (void)setVoiceRecOn:(NSNumber<SDLBool> *)voiceRecOn {
-    [self setObject:voiceRecOn forName:SDLNameVoiceRecognitionOn];
+    [store sdl_setObject:voiceRecOn forName:SDLNameVoiceRecognitionOn];
 }
 
 - (NSNumber<SDLBool> *)voiceRecOn {
-    return [self objectForName:SDLNameVoiceRecognitionOn];
+    return [store sdl_objectForName:SDLNameVoiceRecognitionOn];
 }
 
 - (void)setBtIconOn:(NSNumber<SDLBool> *)btIconOn {
-    [self setObject:btIconOn forName:SDLNameBluetoothIconOn];
+    [store sdl_setObject:btIconOn forName:SDLNameBluetoothIconOn];
 }
 
 - (NSNumber<SDLBool> *)btIconOn {
-    return [self objectForName:SDLNameBluetoothIconOn];
+    return [store sdl_objectForName:SDLNameBluetoothIconOn];
 }
 
 - (void)setCallActive:(NSNumber<SDLBool> *)callActive {
-    [self setObject:callActive forName:SDLNameCallActive];
+    [store sdl_setObject:callActive forName:SDLNameCallActive];
 }
 
 - (NSNumber<SDLBool> *)callActive {
-    return [self objectForName:SDLNameCallActive];
+    return [store sdl_objectForName:SDLNameCallActive];
 }
 
 - (void)setPhoneRoaming:(NSNumber<SDLBool> *)phoneRoaming {
-    [self setObject:phoneRoaming forName:SDLNamePhoneRoaming];
+    [store sdl_setObject:phoneRoaming forName:SDLNamePhoneRoaming];
 }
 
 - (NSNumber<SDLBool> *)phoneRoaming {
-    return [self objectForName:SDLNamePhoneRoaming];
+    return [store sdl_objectForName:SDLNamePhoneRoaming];
 }
 
 - (void)setTextMsgAvailable:(NSNumber<SDLBool> *)textMsgAvailable {
-    [self setObject:textMsgAvailable forName:SDLNameTextMessageAvailable];
+    [store sdl_setObject:textMsgAvailable forName:SDLNameTextMessageAvailable];
 }
 
 - (NSNumber<SDLBool> *)textMsgAvailable {
-    return [self objectForName:SDLNameTextMessageAvailable];
+    return [store sdl_objectForName:SDLNameTextMessageAvailable];
 }
 
 - (void)setBattLevelStatus:(SDLDeviceLevelStatus )battLevelStatus {
-    [self setObject:battLevelStatus forName:SDLNameBatteryLevelStatus];
+    [store sdl_setObject:battLevelStatus forName:SDLNameBatteryLevelStatus];
 }
 
 - (SDLDeviceLevelStatus)battLevelStatus {
-    return [self objectForName:SDLNameBatteryLevelStatus];
+    return [store sdl_objectForName:SDLNameBatteryLevelStatus];
 }
 
 - (void)setStereoAudioOutputMuted:(NSNumber<SDLBool> *)stereoAudioOutputMuted {
-    [self setObject:stereoAudioOutputMuted forName:SDLNameStereoAudioOutputMuted];
+    [store sdl_setObject:stereoAudioOutputMuted forName:SDLNameStereoAudioOutputMuted];
 }
 
 - (NSNumber<SDLBool> *)stereoAudioOutputMuted {
-    return [self objectForName:SDLNameStereoAudioOutputMuted];
+    return [store sdl_objectForName:SDLNameStereoAudioOutputMuted];
 }
 
 - (void)setMonoAudioOutputMuted:(NSNumber<SDLBool> *)monoAudioOutputMuted {
-    [self setObject:monoAudioOutputMuted forName:SDLNameMonoAudioOutputMuted];
+    [store sdl_setObject:monoAudioOutputMuted forName:SDLNameMonoAudioOutputMuted];
 }
 
 - (NSNumber<SDLBool> *)monoAudioOutputMuted {
-    return [self objectForName:SDLNameMonoAudioOutputMuted];
+    return [store sdl_objectForName:SDLNameMonoAudioOutputMuted];
 }
 
 - (void)setSignalLevelStatus:(SDLDeviceLevelStatus)signalLevelStatus {
-    [self setObject:signalLevelStatus forName:SDLNameSignalLevelStatus];
+    [store sdl_setObject:signalLevelStatus forName:SDLNameSignalLevelStatus];
 }
 
 - (SDLDeviceLevelStatus)signalLevelStatus {
-    return [self objectForName:SDLNameSignalLevelStatus];
+    return [store sdl_objectForName:SDLNameSignalLevelStatus];
 }
 
 - (void)setPrimaryAudioSource:(SDLPrimaryAudioSource)primaryAudioSource {
-    [self setObject:primaryAudioSource forName:SDLNamePrimaryAudioSource];
+    [store sdl_setObject:primaryAudioSource forName:SDLNamePrimaryAudioSource];
 }
 
 - (SDLPrimaryAudioSource)primaryAudioSource {
-    return [self objectForName:SDLNamePrimaryAudioSource];
+    return [store sdl_objectForName:SDLNamePrimaryAudioSource];
 }
 
 - (void)setECallEventActive:(NSNumber<SDLBool> *)eCallEventActive {
-    [self setObject:eCallEventActive forName:SDLNameECallEventActive];
+    [store sdl_setObject:eCallEventActive forName:SDLNameECallEventActive];
 }
 
 - (NSNumber<SDLBool> *)eCallEventActive {
-    return [self objectForName:SDLNameECallEventActive];
+    return [store sdl_objectForName:SDLNameECallEventActive];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDiagnosticMessage.m b/SmartDeviceLink/SDLDiagnosticMessage.m
index 115c82afe..4c8373cc4 100644
--- a/SmartDeviceLink/SDLDiagnosticMessage.m
+++ b/SmartDeviceLink/SDLDiagnosticMessage.m
@@ -28,27 +28,27 @@
 }
 
 - (void)setTargetID:(NSNumber<SDLInt> *)targetID {
-    [self setObject:targetID forName:SDLNameTargetId];
+    [parameters sdl_setObject:targetID forName:SDLNameTargetId];
 }
 
 - (NSNumber<SDLInt> *)targetID {
-    return [parameters objectForKey:SDLNameTargetId];
+    return [parameters sdl_objectForName:SDLNameTargetId];
 }
 
 - (void)setMessageLength:(NSNumber<SDLInt> *)messageLength {
-    [self setObject:messageLength forName: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 {
-    [self setObject:messageData forName: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 dd96539c7..43255f646 100644
--- a/SmartDeviceLink/SDLDiagnosticMessageResponse.m
+++ b/SmartDeviceLink/SDLDiagnosticMessageResponse.m
@@ -14,7 +14,7 @@
 }
 
 - (void)setMessageDataResult:(NSMutableArray<NSNumber<SDLInt> *> *)messageDataResult {
-    [self setObject:messageDataResult forName:SDLNameMessageDataResult];
+    [parameters sdl_setObject:messageDataResult forName:SDLNameMessageDataResult];
 }
 
 - (NSMutableArray<NSNumber<SDLInt> *> *)messageDataResult {
diff --git a/SmartDeviceLink/SDLDialNumber.m b/SmartDeviceLink/SDLDialNumber.m
index b46b8579e..3351c9aae 100644
--- a/SmartDeviceLink/SDLDialNumber.m
+++ b/SmartDeviceLink/SDLDialNumber.m
@@ -26,11 +26,11 @@
 }
 
 - (void)setNumber:(NSString *)number {
-    [self setObject:number forName:SDLNameNumber];
+    [parameters sdl_setObject:number forName:SDLNameNumber];
 }
 
 - (NSString *)number {
-    return [self objectForName:SDLNameNumber];
+    return [parameters sdl_objectForName:SDLNameNumber];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLDisplayCapabilities.m b/SmartDeviceLink/SDLDisplayCapabilities.m
index a2f0282ae..f1334962f 100644
--- a/SmartDeviceLink/SDLDisplayCapabilities.m
+++ b/SmartDeviceLink/SDLDisplayCapabilities.m
@@ -11,31 +11,31 @@
 @implementation SDLDisplayCapabilities
 
 - (void)setDisplayType:(SDLDisplayType)displayType {
-    [self setObject:displayType forName:SDLNameDisplayType];
+    [store sdl_setObject:displayType forName:SDLNameDisplayType];
 }
 
 - (SDLDisplayType)displayType {
-    return [self objectForName:SDLNameDisplayType];
+    return [store sdl_objectForName:SDLNameDisplayType];
 }
 
 - (void)setTextFields:(NSMutableArray<SDLTextField *> *)textFields {
-    [self setObject:textFields forName:SDLNameTextFields];
+    [store sdl_setObject:textFields forName:SDLNameTextFields];
 }
 
 - (NSMutableArray<SDLTextField *> *)textFields {
-    return [self objectsForName:SDLNameTextFields ofClass:SDLTextField.class];
+    return [store sdl_objectsForName:SDLNameTextFields ofClass:SDLTextField.class];
 }
 
 - (void)setImageFields:(NSMutableArray<SDLImageField *> *)imageFields {
-    [self setObject:imageFields forName:SDLNameImageFields];
+    [store sdl_setObject:imageFields forName:SDLNameImageFields];
 }
 
 - (NSMutableArray<SDLImageField *> *)imageFields {
-    return [self objectsForName:SDLNameImageFields ofClass:SDLImageField.class];
+    return [store sdl_objectsForName:SDLNameImageFields ofClass:SDLImageField.class];
 }
 
 - (void)setMediaClockFormats:(NSMutableArray<SDLMediaClockFormat> *)mediaClockFormats {
-    [self setObject:mediaClockFormats forName:SDLNameMediaClockFormats];
+    [store sdl_setObject:mediaClockFormats forName:SDLNameMediaClockFormats];
 }
 
 - (NSMutableArray<SDLMediaClockFormat> *)mediaClockFormats {
@@ -52,35 +52,35 @@
 }
 
 - (void)setGraphicSupported:(NSNumber<SDLBool> *)graphicSupported {
-    [self setObject:graphicSupported forName:SDLNameGraphicSupported];
+    [store sdl_setObject:graphicSupported forName:SDLNameGraphicSupported];
 }
 
 - (NSNumber<SDLBool> *)graphicSupported {
-    return [self objectForName:SDLNameGraphicSupported];
+    return [store sdl_objectForName:SDLNameGraphicSupported];
 }
 
 - (void)setTemplatesAvailable:(NSMutableArray<NSString *> *)templatesAvailable {
-    [self setObject:templatesAvailable forName:SDLNameTemplatesAvailable];
+    [store sdl_setObject:templatesAvailable forName:SDLNameTemplatesAvailable];
 }
 
 - (NSMutableArray<NSString *> *)templatesAvailable {
-    return [self objectForName:SDLNameTemplatesAvailable];
+    return [store sdl_objectForName:SDLNameTemplatesAvailable];
 }
 
 - (void)setScreenParams:(SDLScreenParams *)screenParams {
-    [self setObject:screenParams forName:SDLNameScreenParams];
+    [store sdl_setObject:screenParams forName:SDLNameScreenParams];
 }
 
 - (SDLScreenParams *)screenParams {
-    return [self objectForName:SDLNameScreenParams ofClass:SDLScreenParams.class];
+    return [store sdl_objectForName:SDLNameScreenParams ofClass:SDLScreenParams.class];
 }
 
 - (void)setNumCustomPresetsAvailable:(NSNumber<SDLInt> *)numCustomPresetsAvailable {
-    [self setObject:numCustomPresetsAvailable forName:SDLNameNumberCustomPresetsAvailable];
+    [store sdl_setObject:numCustomPresetsAvailable forName:SDLNameNumberCustomPresetsAvailable];
 }
 
 - (NSNumber<SDLInt> *)numCustomPresetsAvailable {
-    return [self objectForName:SDLNameNumberCustomPresetsAvailable];
+    return [store sdl_objectForName:SDLNameNumberCustomPresetsAvailable];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLECallInfo.m b/SmartDeviceLink/SDLECallInfo.m
index a959c0982..e7833b77d 100644
--- a/SmartDeviceLink/SDLECallInfo.m
+++ b/SmartDeviceLink/SDLECallInfo.m
@@ -9,27 +9,27 @@
 @implementation SDLECallInfo
 
 - (void)setECallNotificationStatus:(SDLVehicleDataNotificationStatus)eCallNotificationStatus {
-    [self setObject:eCallNotificationStatus forName:SDLNameECallNotificationStatus];
+    [store sdl_setObject:eCallNotificationStatus forName:SDLNameECallNotificationStatus];
 }
 
 - (SDLVehicleDataNotificationStatus)eCallNotificationStatus {
-    return [self objectForName:SDLNameECallNotificationStatus];
+    return [store sdl_objectForName:SDLNameECallNotificationStatus];
 }
 
 - (void)setAuxECallNotificationStatus:(SDLVehicleDataNotificationStatus)auxECallNotificationStatus {
-    [self setObject:auxECallNotificationStatus forName:SDLNameAuxECallNotificationStatus];
+    [store sdl_setObject:auxECallNotificationStatus forName:SDLNameAuxECallNotificationStatus];
 }
 
 - (SDLVehicleDataNotificationStatus)auxECallNotificationStatus {
-    return [self objectForName:SDLNameAuxECallNotificationStatus];
+    return [store sdl_objectForName:SDLNameAuxECallNotificationStatus];
 }
 
 - (void)setECallConfirmationStatus:(SDLECallConfirmationStatus)eCallConfirmationStatus {
-    [self setObject:eCallConfirmationStatus forName:SDLNameECallConfirmationStatus];
+    [store sdl_setObject:eCallConfirmationStatus forName:SDLNameECallConfirmationStatus];
 }
 
 - (SDLECallConfirmationStatus)eCallConfirmationStatus {
-    return [self objectForName:SDLNameECallConfirmationStatus];
+    return [store sdl_objectForName:SDLNameECallConfirmationStatus];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLEmergencyEvent.m b/SmartDeviceLink/SDLEmergencyEvent.m
index 88cb101d7..0e28963dc 100644
--- a/SmartDeviceLink/SDLEmergencyEvent.m
+++ b/SmartDeviceLink/SDLEmergencyEvent.m
@@ -8,43 +8,43 @@
 @implementation SDLEmergencyEvent
 
 - (void)setEmergencyEventType:(SDLEmergencyEventType)emergencyEventType {
-    [self setObject:emergencyEventType forName:SDLNameEmergencyEventType];
+    [store sdl_setObject:emergencyEventType forName:SDLNameEmergencyEventType];
 }
 
 - (SDLEmergencyEventType)emergencyEventType {
-    return [self objectForName:SDLNameEmergencyEventType];
+    return [store sdl_objectForName:SDLNameEmergencyEventType];
 }
 
 - (void)setFuelCutoffStatus:(SDLFuelCutoffStatus)fuelCutoffStatus {
-    [self setObject:fuelCutoffStatus forName:SDLNameFuelCutoffStatus];
+    [store sdl_setObject:fuelCutoffStatus forName:SDLNameFuelCutoffStatus];
 }
 
 - (SDLFuelCutoffStatus)fuelCutoffStatus {
-    return [self objectForName:SDLNameFuelCutoffStatus];
+    return [store sdl_objectForName:SDLNameFuelCutoffStatus];
 }
 
 - (void)setRolloverEvent:(SDLVehicleDataEventStatus)rolloverEvent {
-    [self setObject:rolloverEvent forName:SDLNameRolloverEvent];
+    [store sdl_setObject:rolloverEvent forName:SDLNameRolloverEvent];
 }
 
 - (SDLVehicleDataEventStatus)rolloverEvent {
-    return [self objectForName:SDLNameRolloverEvent];
+    return [store sdl_objectForName:SDLNameRolloverEvent];
 }
 
 - (void)setMaximumChangeVelocity:(NSNumber<SDLInt> *)maximumChangeVelocity {
-    [self setObject:maximumChangeVelocity forName:SDLNameMaximumChangeVelocity];
+    [store sdl_setObject:maximumChangeVelocity forName:SDLNameMaximumChangeVelocity];
 }
 
 - (NSNumber<SDLInt> *)maximumChangeVelocity {
-    return [self objectForName:SDLNameMaximumChangeVelocity];
+    return [store sdl_objectForName:SDLNameMaximumChangeVelocity];
 }
 
 - (void)setMultipleEvents:(SDLVehicleDataEventStatus)multipleEvents {
-    [self setObject:multipleEvents forName:SDLNameMultipleEvents];
+    [store sdl_setObject:multipleEvents forName:SDLNameMultipleEvents];
 }
 
 - (SDLVehicleDataEventStatus)multipleEvents {
-    return [self objectForName:SDLNameMultipleEvents];
+    return [store sdl_objectForName:SDLNameMultipleEvents];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLEncodedSyncPData.m b/SmartDeviceLink/SDLEncodedSyncPData.m
index eaa9f9f5d..d25401914 100644
--- a/SmartDeviceLink/SDLEncodedSyncPData.m
+++ b/SmartDeviceLink/SDLEncodedSyncPData.m
@@ -15,11 +15,11 @@
 }
 
 - (void)setData:(NSMutableArray<NSString *> *)data {
-    [self setObject:data forName:SDLNameData];
+    [parameters sdl_setObject:data forName:SDLNameData];
 }
 
 - (NSMutableArray<NSString *> *)data {
-    return [parameters objectForKey:SDLNameData];
+    return [parameters sdl_objectForName:SDLNameData];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLGPSData.m b/SmartDeviceLink/SDLGPSData.m
index 6ac244b4d..4b2762854 100644
--- a/SmartDeviceLink/SDLGPSData.m
+++ b/SmartDeviceLink/SDLGPSData.m
@@ -8,147 +8,147 @@
 @implementation SDLGPSData
 
 - (void)setLongitudeDegrees:(NSNumber<SDLFloat> *)longitudeDegrees {
-    [self setObject:longitudeDegrees forName:SDLNameLongitudeDegrees];
+    [store sdl_setObject:longitudeDegrees forName:SDLNameLongitudeDegrees];
 }
 
 - (NSNumber<SDLFloat> *)longitudeDegrees {
-    return [self objectForName:SDLNameLongitudeDegrees];
+    return [store sdl_objectForName:SDLNameLongitudeDegrees];
 }
 
 - (void)setLatitudeDegrees:(NSNumber<SDLFloat> *)latitudeDegrees {
-    [self setObject:latitudeDegrees forName:SDLNameLatitudeDegrees];
+    [store sdl_setObject:latitudeDegrees forName:SDLNameLatitudeDegrees];
 }
 
 - (NSNumber<SDLFloat> *)latitudeDegrees {
-    return [self objectForName:SDLNameLatitudeDegrees];
+    return [store sdl_objectForName:SDLNameLatitudeDegrees];
 }
 
 - (void)setUtcYear:(NSNumber<SDLInt> *)utcYear {
-    [self setObject:utcYear forName:SDLNameUTCYear];
+    [store sdl_setObject:utcYear forName:SDLNameUTCYear];
 }
 
 - (NSNumber<SDLInt> *)utcYear {
-    return [self objectForName:SDLNameUTCYear];
+    return [store sdl_objectForName:SDLNameUTCYear];
 }
 
 - (void)setUtcMonth:(NSNumber<SDLInt> *)utcMonth {
-    [self setObject:utcMonth forName:SDLNameUTCMonth];
+    [store sdl_setObject:utcMonth forName:SDLNameUTCMonth];
 }
 
 - (NSNumber<SDLInt> *)utcMonth {
-    return [self objectForName:SDLNameUTCMonth];
+    return [store sdl_objectForName:SDLNameUTCMonth];
 }
 
 - (void)setUtcDay:(NSNumber<SDLInt> *)utcDay {
-    [self setObject:utcDay forName:SDLNameUTCDay];
+    [store sdl_setObject:utcDay forName:SDLNameUTCDay];
 }
 
 - (NSNumber<SDLInt> *)utcDay {
-    return [self objectForName:SDLNameUTCDay];
+    return [store sdl_objectForName:SDLNameUTCDay];
 }
 
 - (void)setUtcHours:(NSNumber<SDLInt> *)utcHours {
-    [self setObject:utcHours forName:SDLNameUTCHours];
+    [store sdl_setObject:utcHours forName:SDLNameUTCHours];
 }
 
 - (NSNumber<SDLInt> *)utcHours {
-    return [self objectForName:SDLNameUTCHours];
+    return [store sdl_objectForName:SDLNameUTCHours];
 }
 
 - (void)setUtcMinutes:(NSNumber<SDLInt> *)utcMinutes {
-    [self setObject:utcMinutes forName:SDLNameUTCMinutes];
+    [store sdl_setObject:utcMinutes forName:SDLNameUTCMinutes];
 }
 
 - (NSNumber<SDLInt> *)utcMinutes {
-    return [self objectForName:SDLNameUTCMinutes];
+    return [store sdl_objectForName:SDLNameUTCMinutes];
 }
 
 - (void)setUtcSeconds:(NSNumber<SDLInt> *)utcSeconds {
-    [self setObject:utcSeconds forName:SDLNameUTCSeconds];
+    [store sdl_setObject:utcSeconds forName:SDLNameUTCSeconds];
 }
 
 - (NSNumber<SDLInt> *)utcSeconds {
-    return [self objectForName:SDLNameUTCSeconds];
+    return [store sdl_objectForName:SDLNameUTCSeconds];
 }
 
 - (void)setCompassDirection:(SDLCompassDirection)compassDirection {
-    [self setObject:compassDirection forName:SDLNameCompassDirection];
+    [store sdl_setObject:compassDirection forName:SDLNameCompassDirection];
 }
 
 - (SDLCompassDirection)compassDirection {
-    return [self objectForName:SDLNameCompassDirection];
+    return [store sdl_objectForName:SDLNameCompassDirection];
 }
 
 - (void)setPdop:(NSNumber<SDLFloat> *)pdop {
-    [self setObject:pdop forName:SDLNamePDOP];
+    [store sdl_setObject:pdop forName:SDLNamePDOP];
 }
 
 - (NSNumber<SDLFloat> *)pdop {
-    return [self objectForName:SDLNamePDOP];
+    return [store sdl_objectForName:SDLNamePDOP];
 }
 
 - (void)setHdop:(NSNumber<SDLFloat> *)hdop {
-    [self setObject:hdop forName:SDLNameHDOP];
+    [store sdl_setObject:hdop forName:SDLNameHDOP];
 }
 
 - (NSNumber<SDLFloat> *)hdop {
-    return [self objectForName:SDLNameHDOP];
+    return [store sdl_objectForName:SDLNameHDOP];
 }
 
 - (void)setVdop:(NSNumber<SDLFloat> *)vdop {
-    [self setObject:vdop forName:SDLNameVDOP];
+    [store sdl_setObject:vdop forName:SDLNameVDOP];
 }
 
 - (NSNumber<SDLFloat> *)vdop {
-    return [self objectForName:SDLNameVDOP];
+    return [store sdl_objectForName:SDLNameVDOP];
 }
 
 - (void)setActual:(NSNumber<SDLBool> *)actual {
-    [self setObject:actual forName:SDLNameActual];
+    [store sdl_setObject:actual forName:SDLNameActual];
 }
 
 - (NSNumber<SDLBool> *)actual {
-    return [self objectForName:SDLNameActual];
+    return [store sdl_objectForName:SDLNameActual];
 }
 
 - (void)setSatellites:(NSNumber<SDLInt> *)satellites {
-    [self setObject:satellites forName:SDLNameSatellites];
+    [store sdl_setObject:satellites forName:SDLNameSatellites];
 }
 
 - (NSNumber<SDLInt> *)satellites {
-    return [self objectForName:SDLNameSatellites];
+    return [store sdl_objectForName:SDLNameSatellites];
 }
 
 - (void)setDimension:(SDLDimension)dimension {
-    [self setObject:dimension forName:SDLNameDimension];
+    [store sdl_setObject:dimension forName:SDLNameDimension];
 }
 
 - (SDLDimension)dimension {
-    return [self objectForName:SDLNameDimension];
+    return [store sdl_objectForName:SDLNameDimension];
 }
 
 - (void)setAltitude:(NSNumber<SDLFloat> *)altitude {
-    [self setObject:altitude forName:SDLNameAltitude];
+    [store sdl_setObject:altitude forName:SDLNameAltitude];
 }
 
 - (NSNumber<SDLFloat> *)altitude {
-    return [self objectForName:SDLNameAltitude];
+    return [store sdl_objectForName:SDLNameAltitude];
 }
 
 - (void)setHeading:(NSNumber<SDLFloat> *)heading {
-    [self setObject:heading forName:SDLNameHeading];
+    [store sdl_setObject:heading forName:SDLNameHeading];
 }
 
 - (NSNumber<SDLFloat> *)heading {
-    return [self objectForName:SDLNameHeading];
+    return [store sdl_objectForName:SDLNameHeading];
 }
 
 - (void)setSpeed:(NSNumber<SDLFloat> *)speed {
-    [self setObject:speed forName:SDLNameSpeed];
+    [store sdl_setObject:speed forName:SDLNameSpeed];
 }
 
 - (NSNumber<SDLFloat> *)speed {
-    return [self objectForName:SDLNameSpeed];
+    return [store sdl_objectForName:SDLNameSpeed];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLGetDTCs.m b/SmartDeviceLink/SDLGetDTCs.m
index 45c516c45..a756e6447 100644
--- a/SmartDeviceLink/SDLGetDTCs.m
+++ b/SmartDeviceLink/SDLGetDTCs.m
@@ -37,19 +37,19 @@
 }
 
 - (void)setEcuName:(NSNumber<SDLInt> *)ecuName {
-    [self setObject:ecuName forName:SDLNameECUName];
+    [parameters sdl_setObject:ecuName forName:SDLNameECUName];
 }
 
 - (NSNumber<SDLInt> *)ecuName {
-    return [parameters objectForKey:SDLNameECUName];
+    return [parameters sdl_objectForName:SDLNameECUName];
 }
 
 - (void)setDtcMask:(NSNumber<SDLInt> *)dtcMask {
-    [self setObject:dtcMask forName:SDLNameDTCMask];
+    [parameters sdl_setObject:dtcMask forName:SDLNameDTCMask];
 }
 
 - (NSNumber<SDLInt> *)dtcMask {
-    return [parameters objectForKey:SDLNameDTCMask];
+    return [parameters sdl_objectForName:SDLNameDTCMask];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLGetDTCsResponse.m b/SmartDeviceLink/SDLGetDTCsResponse.m
index b0f3aafa1..99d4a7c0c 100644
--- a/SmartDeviceLink/SDLGetDTCsResponse.m
+++ b/SmartDeviceLink/SDLGetDTCsResponse.m
@@ -15,7 +15,7 @@
 }
 
 - (void)setEcuHeader:(NSNumber<SDLInt> *)ecuHeader {
-    [self setObject:ecuHeader forName:SDLNameECUHeader];
+    [parameters sdl_setObject:ecuHeader forName:SDLNameECUHeader];
 }
 
 - (NSNumber<SDLInt> *)ecuHeader {
@@ -23,7 +23,7 @@
 }
 
 - (void)setDtc:(NSMutableArray<NSString *> *)dtc {
-    [self setObject:dtc forName:SDLNameDTC];
+    [parameters sdl_setObject:dtc forName:SDLNameDTC];
 }
 
 - (NSMutableArray<NSString *> *)dtc {
diff --git a/SmartDeviceLink/SDLGetVehicleData.m b/SmartDeviceLink/SDLGetVehicleData.m
index ae8b44a0a..9f04d7a0e 100644
--- a/SmartDeviceLink/SDLGetVehicleData.m
+++ b/SmartDeviceLink/SDLGetVehicleData.m
@@ -50,203 +50,203 @@
 }
 
 - (void)setGps:(NSNumber<SDLBool> *)gps {
-    [self setObject:gps forName:SDLNameGPS];
+    [parameters sdl_setObject:gps forName:SDLNameGPS];
 }
 
 - (NSNumber<SDLBool> *)gps {
-    return [parameters objectForKey:SDLNameGPS];
+    return [parameters sdl_objectForName:SDLNameGPS];
 }
 
 - (void)setSpeed:(NSNumber<SDLBool> *)speed {
-    [self setObject:speed forName:SDLNameSpeed];
+    [parameters sdl_setObject:speed forName:SDLNameSpeed];
 }
 
 - (NSNumber<SDLBool> *)speed {
-    return [parameters objectForKey:SDLNameSpeed];
+    return [parameters sdl_objectForName:SDLNameSpeed];
 }
 
 - (void)setRpm:(NSNumber<SDLBool> *)rpm {
-    [self setObject:rpm forName:SDLNameRPM];
+    [parameters sdl_setObject:rpm forName:SDLNameRPM];
 }
 
 - (NSNumber<SDLBool> *)rpm {
-    return [parameters objectForKey:SDLNameRPM];
+    return [parameters sdl_objectForName:SDLNameRPM];
 }
 
 - (void)setFuelLevel:(NSNumber<SDLBool> *)fuelLevel {
-    [self setObject:fuelLevel forName:SDLNameFuelLevel];
+    [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel];
 }
 
 - (NSNumber<SDLBool> *)fuelLevel {
-    return [parameters objectForKey:SDLNameFuelLevel];
+    return [parameters sdl_objectForName:SDLNameFuelLevel];
 }
 
 - (void)setFuelLevel_State:(NSNumber<SDLBool> *)fuelLevel_State {
-    [self setObject:fuelLevel_State forName:SDLNameFuelLevelState];
+    [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState];
 }
 
 - (NSNumber<SDLBool> *)fuelLevel_State {
-    return [parameters objectForKey:SDLNameFuelLevelState];
+    return [parameters sdl_objectForName:SDLNameFuelLevelState];
 }
 
 - (void)setInstantFuelConsumption:(NSNumber<SDLBool> *)instantFuelConsumption {
-    [self setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
+    [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
 }
 
 - (NSNumber<SDLBool> *)instantFuelConsumption {
-    return [parameters objectForKey:SDLNameInstantFuelConsumption];
+    return [parameters sdl_objectForName:SDLNameInstantFuelConsumption];
 }
 
 - (void)setExternalTemperature:(NSNumber<SDLBool> *)externalTemperature {
-    [self setObject:externalTemperature forName:SDLNameExternalTemperature];
+    [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature];
 }
 
 - (NSNumber<SDLBool> *)externalTemperature {
-    return [parameters objectForKey:SDLNameExternalTemperature];
+    return [parameters sdl_objectForName:SDLNameExternalTemperature];
 }
 
 - (void)setVin:(NSNumber<SDLBool> *)vin {
-    [self setObject:vin forName:SDLNameVIN];
+    [parameters sdl_setObject:vin forName:SDLNameVIN];
 }
 
 - (NSNumber<SDLBool> *)vin {
-    return [parameters objectForKey:SDLNameVIN];
+    return [parameters sdl_objectForName:SDLNameVIN];
 }
 
 - (void)setPrndl:(NSNumber<SDLBool> *)prndl {
-    [self setObject:prndl forName:SDLNamePRNDL];
+    [parameters sdl_setObject:prndl forName:SDLNamePRNDL];
 }
 
 - (NSNumber<SDLBool> *)prndl {
-    return [parameters objectForKey:SDLNamePRNDL];
+    return [parameters sdl_objectForName:SDLNamePRNDL];
 }
 
 - (void)setTirePressure:(NSNumber<SDLBool> *)tirePressure {
-    [self setObject:tirePressure forName:SDLNameTirePressure];
+    [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure];
 }
 
 - (NSNumber<SDLBool> *)tirePressure {
-    return [parameters objectForKey:SDLNameTirePressure];
+    return [parameters sdl_objectForName:SDLNameTirePressure];
 }
 
 - (void)setOdometer:(NSNumber<SDLBool> *)odometer {
-    [self setObject:odometer forName:SDLNameOdometer];
+    [parameters sdl_setObject:odometer forName:SDLNameOdometer];
 }
 
 - (NSNumber<SDLBool> *)odometer {
-    return [parameters objectForKey:SDLNameOdometer];
+    return [parameters sdl_objectForName:SDLNameOdometer];
 }
 
 - (void)setBeltStatus:(NSNumber<SDLBool> *)beltStatus {
-    [self setObject:beltStatus forName:SDLNameBeltStatus];
+    [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus];
 }
 
 - (NSNumber<SDLBool> *)beltStatus {
-    return [parameters objectForKey:SDLNameBeltStatus];
+    return [parameters sdl_objectForName:SDLNameBeltStatus];
 }
 
 - (void)setBodyInformation:(NSNumber<SDLBool> *)bodyInformation {
-    [self setObject:bodyInformation forName:SDLNameBodyInformation];
+    [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation];
 }
 
 - (NSNumber<SDLBool> *)bodyInformation {
-    return [parameters objectForKey:SDLNameBodyInformation];
+    return [parameters sdl_objectForName:SDLNameBodyInformation];
 }
 
 - (void)setDeviceStatus:(NSNumber<SDLBool> *)deviceStatus {
-    [self setObject:deviceStatus forName:SDLNameDeviceStatus];
+    [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus];
 }
 
 - (NSNumber<SDLBool> *)deviceStatus {
-    return [parameters objectForKey:SDLNameDeviceStatus];
+    return [parameters sdl_objectForName:SDLNameDeviceStatus];
 }
 
 - (void)setDriverBraking:(NSNumber<SDLBool> *)driverBraking {
-    [self setObject:driverBraking forName:SDLNameDriverBraking];
+    [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking];
 }
 
 - (NSNumber<SDLBool> *)driverBraking {
-    return [parameters objectForKey:SDLNameDriverBraking];
+    return [parameters sdl_objectForName:SDLNameDriverBraking];
 }
 
 - (void)setWiperStatus:(NSNumber<SDLBool> *)wiperStatus {
-    [self setObject:wiperStatus forName:SDLNameWiperStatus];
+    [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus];
 }
 
 - (NSNumber<SDLBool> *)wiperStatus {
-    return [parameters objectForKey:SDLNameWiperStatus];
+    return [parameters sdl_objectForName:SDLNameWiperStatus];
 }
 
 - (void)setHeadLampStatus:(NSNumber<SDLBool> *)headLampStatus {
-    [self setObject:headLampStatus forName:SDLNameHeadLampStatus];
+    [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus];
 }
 
 - (NSNumber<SDLBool> *)headLampStatus {
-    return [parameters objectForKey:SDLNameHeadLampStatus];
+    return [parameters sdl_objectForName:SDLNameHeadLampStatus];
 }
 
 - (void)setEngineTorque:(NSNumber<SDLBool> *)engineTorque {
-    [self setObject:engineTorque forName:SDLNameEngineTorque];
+    [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque];
 }
 
 - (NSNumber<SDLBool> *)engineTorque {
-    return [parameters objectForKey:SDLNameEngineTorque];
+    return [parameters sdl_objectForName:SDLNameEngineTorque];
 }
 
 - (void)setAccPedalPosition:(NSNumber<SDLBool> *)accPedalPosition {
-    [self setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
+    [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
 }
 
 - (NSNumber<SDLBool> *)accPedalPosition {
-    return [parameters objectForKey:SDLNameAccelerationPedalPosition];
+    return [parameters sdl_objectForName:SDLNameAccelerationPedalPosition];
 }
 
 - (void)setSteeringWheelAngle:(NSNumber<SDLBool> *)steeringWheelAngle {
-    [self setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
+    [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
 }
 
 - (NSNumber<SDLBool> *)steeringWheelAngle {
-    return [parameters objectForKey:SDLNameSteeringWheelAngle];
+    return [parameters sdl_objectForName:SDLNameSteeringWheelAngle];
 }
 
 - (void)setECallInfo:(NSNumber<SDLBool> *)eCallInfo {
-    [self setObject:eCallInfo forName:SDLNameECallInfo];
+    [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo];
 }
 
 - (NSNumber<SDLBool> *)eCallInfo {
-    return [parameters objectForKey:SDLNameECallInfo];
+    return [parameters sdl_objectForName:SDLNameECallInfo];
 }
 
 - (void)setAirbagStatus:(NSNumber<SDLBool> *)airbagStatus {
-    [self setObject:airbagStatus forName:SDLNameAirbagStatus];
+    [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus];
 }
 
 - (NSNumber<SDLBool> *)airbagStatus {
-    return [parameters objectForKey:SDLNameAirbagStatus];
+    return [parameters sdl_objectForName:SDLNameAirbagStatus];
 }
 
 - (void)setEmergencyEvent:(NSNumber<SDLBool> *)emergencyEvent {
-    [self setObject:emergencyEvent forName:SDLNameEmergencyEvent];
+    [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent];
 }
 
 - (NSNumber<SDLBool> *)emergencyEvent {
-    return [parameters objectForKey:SDLNameEmergencyEvent];
+    return [parameters sdl_objectForName:SDLNameEmergencyEvent];
 }
 
 - (void)setClusterModeStatus:(NSNumber<SDLBool> *)clusterModeStatus {
-    [self setObject:clusterModeStatus forName:SDLNameClusterModeStatus];
+    [parameters sdl_setObject:clusterModeStatus forName:SDLNameClusterModeStatus];
 }
 
 - (NSNumber<SDLBool> *)clusterModeStatus {
-    return [parameters objectForKey:SDLNameClusterModeStatus];
+    return [parameters sdl_objectForName:SDLNameClusterModeStatus];
 }
 
 - (void)setMyKey:(NSNumber<SDLBool> *)myKey {
-    [self setObject:myKey forName:SDLNameMyKey];
+    [parameters sdl_setObject:myKey forName:SDLNameMyKey];
 }
 
 - (NSNumber<SDLBool> *)myKey {
-    return [parameters objectForKey:SDLNameMyKey];
+    return [parameters sdl_objectForName:SDLNameMyKey];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink/SDLGetVehicleDataResponse.m
index 4b626f545..5b27744b2 100644
--- a/SmartDeviceLink/SDLGetVehicleDataResponse.m
+++ b/SmartDeviceLink/SDLGetVehicleDataResponse.m
@@ -27,7 +27,7 @@
 }
 
 - (void)setGps:(SDLGPSData *)gps {
-    [self setObject:gps forName:SDLNameGPS];
+    [parameters sdl_setObject:gps forName:SDLNameGPS];
 }
 
 - (SDLGPSData *)gps {
@@ -40,7 +40,7 @@
 }
 
 - (void)setSpeed:(NSNumber<SDLFloat> *)speed {
-    [self setObject:speed forName:SDLNameSpeed];
+    [parameters sdl_setObject:speed forName:SDLNameSpeed];
 }
 
 - (NSNumber<SDLFloat> *)speed {
@@ -48,7 +48,7 @@
 }
 
 - (void)setRpm:(NSNumber<SDLInt> *)rpm {
-    [self setObject:rpm forName:SDLNameRPM];
+    [parameters sdl_setObject:rpm forName:SDLNameRPM];
 }
 
 - (NSNumber<SDLInt> *)rpm {
@@ -56,7 +56,7 @@
 }
 
 - (void)setFuelLevel:(NSNumber<SDLFloat> *)fuelLevel {
-    [self setObject:fuelLevel forName:SDLNameFuelLevel];
+    [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel];
 }
 
 - (NSNumber<SDLFloat> *)fuelLevel {
@@ -64,7 +64,7 @@
 }
 
 - (void)setFuelLevel_State:(SDLComponentVolumeStatus)fuelLevel_State {
-    [self setObject:fuelLevel_State forName:SDLNameFuelLevelState];
+    [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState];
 }
 
 - (SDLComponentVolumeStatus)fuelLevel_State {
@@ -73,7 +73,7 @@
 }
 
 - (void)setInstantFuelConsumption:(NSNumber<SDLFloat> *)instantFuelConsumption {
-    [self setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
+    [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
 }
 
 - (NSNumber<SDLFloat> *)instantFuelConsumption {
@@ -81,7 +81,7 @@
 }
 
 - (void)setExternalTemperature:(NSNumber<SDLFloat> *)externalTemperature {
-    [self setObject:externalTemperature forName:SDLNameExternalTemperature];
+    [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature];
 }
 
 - (NSNumber<SDLFloat> *)externalTemperature {
@@ -89,7 +89,7 @@
 }
 
 - (void)setVin:(NSString *)vin {
-    [self setObject:vin forName:SDLNameVIN];
+    [parameters sdl_setObject:vin forName:SDLNameVIN];
 }
 
 - (NSString *)vin {
@@ -97,7 +97,7 @@
 }
 
 - (void)setPrndl:(SDLPRNDL)prndl {
-    [self setObject:prndl forName:SDLNamePRNDL];
+    [parameters sdl_setObject:prndl forName:SDLNamePRNDL];
 }
 
 - (SDLPRNDL)prndl {
@@ -106,7 +106,7 @@
 }
 
 - (void)setTirePressure:(SDLTireStatus *)tirePressure {
-    [self setObject:tirePressure forName:SDLNameTirePressure];
+    [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure];
 }
 
 - (SDLTireStatus *)tirePressure {
@@ -119,7 +119,7 @@
 }
 
 - (void)setOdometer:(NSNumber<SDLInt> *)odometer {
-    [self setObject:odometer forName:SDLNameOdometer];
+    [parameters sdl_setObject:odometer forName:SDLNameOdometer];
 }
 
 - (NSNumber<SDLInt> *)odometer {
@@ -127,7 +127,7 @@
 }
 
 - (void)setBeltStatus:(SDLBeltStatus *)beltStatus {
-    [self setObject:beltStatus forName:SDLNameBeltStatus];
+    [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus];
 }
 
 - (SDLBeltStatus *)beltStatus {
@@ -140,7 +140,7 @@
 }
 
 - (void)setBodyInformation:(SDLBodyInformation *)bodyInformation {
-    [self setObject:bodyInformation forName:SDLNameBodyInformation];
+    [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation];
 }
 
 - (SDLBodyInformation *)bodyInformation {
@@ -153,7 +153,7 @@
 }
 
 - (void)setDeviceStatus:(SDLDeviceStatus *)deviceStatus {
-    [self setObject:deviceStatus forName:SDLNameDeviceStatus];
+    [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus];
 }
 
 - (SDLDeviceStatus *)deviceStatus {
@@ -166,7 +166,7 @@
 }
 
 - (void)setDriverBraking:(SDLVehicleDataEventStatus)driverBraking {
-    [self setObject:driverBraking forName:SDLNameDriverBraking];
+    [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking];
 }
 
 - (SDLVehicleDataEventStatus)driverBraking {
@@ -175,7 +175,7 @@
 }
 
 - (void)setWiperStatus:(SDLWiperStatus)wiperStatus {
-    [self setObject:wiperStatus forName:SDLNameWiperStatus];
+    [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus];
 }
 
 - (SDLWiperStatus)wiperStatus {
@@ -184,7 +184,7 @@
 }
 
 - (void)setHeadLampStatus:(SDLHeadLampStatus *)headLampStatus {
-    [self setObject:headLampStatus forName:SDLNameHeadLampStatus];
+    [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus];
 }
 
 - (SDLHeadLampStatus *)headLampStatus {
@@ -197,7 +197,7 @@
 }
 
 - (void)setEngineTorque:(NSNumber<SDLFloat> *)engineTorque {
-    [self setObject:engineTorque forName:SDLNameEngineTorque];
+    [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque];
 }
 
 - (NSNumber<SDLFloat> *)engineTorque {
@@ -205,7 +205,7 @@
 }
 
 - (void)setAccPedalPosition:(NSNumber<SDLFloat> *)accPedalPosition {
-    [self setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
+    [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
 }
 
 - (NSNumber<SDLFloat> *)accPedalPosition {
@@ -213,7 +213,7 @@
 }
 
 - (void)setSteeringWheelAngle:(NSNumber<SDLFloat> *)steeringWheelAngle {
-    [self setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
+    [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
 }
 
 - (NSNumber<SDLFloat> *)steeringWheelAngle {
@@ -221,7 +221,7 @@
 }
 
 - (void)setECallInfo:(SDLECallInfo *)eCallInfo {
-    [self setObject:eCallInfo forName:SDLNameECallInfo];
+    [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo];
 }
 
 - (SDLECallInfo *)eCallInfo {
@@ -234,7 +234,7 @@
 }
 
 - (void)setAirbagStatus:(SDLAirbagStatus *)airbagStatus {
-    [self setObject:airbagStatus forName:SDLNameAirbagStatus];
+    [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus];
 }
 
 - (SDLAirbagStatus *)airbagStatus {
@@ -247,7 +247,7 @@
 }
 
 - (void)setEmergencyEvent:(SDLEmergencyEvent *)emergencyEvent {
-    [self setObject:emergencyEvent forName:SDLNameEmergencyEvent];
+    [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent];
 }
 
 - (SDLEmergencyEvent *)emergencyEvent {
@@ -260,7 +260,7 @@
 }
 
 - (void)setClusterModeStatus:(SDLClusterModeStatus *)clusterModeStatus {
-    [self setObject:clusterModeStatus forName:SDLNameClusterModeStatus];
+    [parameters sdl_setObject:clusterModeStatus forName:SDLNameClusterModeStatus];
 }
 
 - (SDLClusterModeStatus *)clusterModeStatus {
@@ -273,7 +273,7 @@
 }
 
 - (void)setMyKey:(SDLMyKey *)myKey {
-    [self setObject:myKey forName:SDLNameMyKey];
+    [parameters sdl_setObject:myKey forName:SDLNameMyKey];
 }
 
 - (SDLMyKey *)myKey {
diff --git a/SmartDeviceLink/SDLGetWaypoints.m b/SmartDeviceLink/SDLGetWaypoints.m
index 4091002b0..08272ce9f 100644
--- a/SmartDeviceLink/SDLGetWaypoints.m
+++ b/SmartDeviceLink/SDLGetWaypoints.m
@@ -26,11 +26,11 @@
 }
 
 - (void)setWaypointType:(SDLWaypointType)waypointType {
-    [self setObject:waypointType forName:SDLNameWaypointType];
+    [parameters sdl_setObject:waypointType forName:SDLNameWaypointType];
 }
 
 - (SDLWaypointType)waypointType {
-    return [self objectForName:SDLNameWaypointType];
+    return [parameters sdl_objectForName:SDLNameWaypointType];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLGetWaypointsResponse.m b/SmartDeviceLink/SDLGetWaypointsResponse.m
index 105e41c72..908b52c81 100644
--- a/SmartDeviceLink/SDLGetWaypointsResponse.m
+++ b/SmartDeviceLink/SDLGetWaypointsResponse.m
@@ -13,11 +13,11 @@
 }
 
 - (void)setWaypoints:(NSArray<SDLLocationDetails *> *)waypoints {
-    [self setObject:waypoints forName:SDLNameWaypoints];
+    [parameters sdl_setObject:waypoints forName:SDLNameWaypoints];
 }
 
 - (NSArray<SDLLocationDetails *> *)waypoints {
-    return [self objectForName:SDLNameWaypoints];
+    return [parameters sdl_objectForName:SDLNameWaypoints];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLHMICapabilities.m b/SmartDeviceLink/SDLHMICapabilities.m
index 5f01bf87c..5bffa6ebd 100644
--- a/SmartDeviceLink/SDLHMICapabilities.m
+++ b/SmartDeviceLink/SDLHMICapabilities.m
@@ -9,19 +9,19 @@
 @implementation SDLHMICapabilities
 
 - (void)setNavigation:(NSNumber<SDLBool> *)navigation {
-    [self setObject:navigation forName:SDLNameNavigation];
+    [store sdl_setObject:navigation forName:SDLNameNavigation];
 }
 
 - (NSNumber<SDLBool> *)navigation {
-    return [self objectForName:SDLNameNavigation];
+    return [store sdl_objectForName:SDLNameNavigation];
 }
 
 - (void)setPhoneCall:(NSNumber<SDLBool> *)phoneCall {
-    [self setObject:phoneCall forName:SDLNamePhoneCall];
+    [store sdl_setObject:phoneCall forName:SDLNamePhoneCall];
 }
 
 - (NSNumber<SDLBool> *)phoneCall {
-    return [self objectForName:SDLNamePhoneCall];
+    return [store sdl_objectForName:SDLNamePhoneCall];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLHMIPermissions.m b/SmartDeviceLink/SDLHMIPermissions.m
index 3be730ec8..0f720cfec 100644
--- a/SmartDeviceLink/SDLHMIPermissions.m
+++ b/SmartDeviceLink/SDLHMIPermissions.m
@@ -9,7 +9,7 @@
 @implementation SDLHMIPermissions
 
 - (void)setAllowed:(NSMutableArray<SDLHMILevel> *)allowed {
-    [self setObject:allowed forName:SDLNameAllowed];
+    [store sdl_setObject:allowed forName:SDLNameAllowed];
 }
 
 - (NSMutableArray<SDLHMILevel> *)allowed {
@@ -26,7 +26,7 @@
 }
 
 - (void)setUserDisallowed:(NSMutableArray<SDLHMILevel> *)userDisallowed {
-    [self setObject:userDisallowed forName:SDLNameUserDisallowed];
+    [store sdl_setObject:userDisallowed forName:SDLNameUserDisallowed];
 }
 
 - (NSMutableArray<SDLHMILevel> *)userDisallowed {
diff --git a/SmartDeviceLink/SDLHeadLampStatus.m b/SmartDeviceLink/SDLHeadLampStatus.m
index cfc11d508..0193fa17a 100644
--- a/SmartDeviceLink/SDLHeadLampStatus.m
+++ b/SmartDeviceLink/SDLHeadLampStatus.m
@@ -9,27 +9,27 @@
 @implementation SDLHeadLampStatus
 
 - (void)setLowBeamsOn:(NSNumber<SDLBool> *)lowBeamsOn {
-    [self setObject:lowBeamsOn forName:SDLNameLowBeamsOn];
+    [store sdl_setObject:lowBeamsOn forName:SDLNameLowBeamsOn];
 }
 
 - (NSNumber<SDLBool> *)lowBeamsOn {
-    return [self objectForName:SDLNameLowBeamsOn];
+    return [store sdl_objectForName:SDLNameLowBeamsOn];
 }
 
 - (void)setHighBeamsOn:(NSNumber<SDLBool> *)highBeamsOn {
-    [self setObject:highBeamsOn forName:SDLNameHighBeamsOn];
+    [store sdl_setObject:highBeamsOn forName:SDLNameHighBeamsOn];
 }
 
 - (NSNumber<SDLBool> *)highBeamsOn {
-    return [self objectForName:SDLNameHighBeamsOn];
+    return [store sdl_objectForName:SDLNameHighBeamsOn];
 }
 
 - (void)setAmbientLightSensorStatus:(SDLAmbientLightStatus)ambientLightSensorStatus {
-    [self setObject:ambientLightSensorStatus forName:SDLNameAmbientLightSensorStatus];
+    [store sdl_setObject:ambientLightSensorStatus forName:SDLNameAmbientLightSensorStatus];
 }
 
 - (SDLAmbientLightStatus)ambientLightSensorStatus {
-    return [self objectForName:SDLNameAmbientLightSensorStatus];
+    return [store sdl_objectForName:SDLNameAmbientLightSensorStatus];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLImage.m b/SmartDeviceLink/SDLImage.m
index c89267e3e..b9b643a60 100644
--- a/SmartDeviceLink/SDLImage.m
+++ b/SmartDeviceLink/SDLImage.m
@@ -20,19 +20,19 @@
 }
 
 - (void)setValue:(NSString *)value {
-    [self setObject:value forName:SDLNameValue];
+    [store sdl_setObject:value forName:SDLNameValue];
 }
 
 - (NSString *)value {
-    return [self objectForName:SDLNameValue];
+    return [store sdl_objectForName:SDLNameValue];
 }
 
 - (void)setImageType:(SDLImageType)imageType {
-    [self setObject:imageType forName:SDLNameImageType];
+    [store sdl_setObject:imageType forName:SDLNameImageType];
 }
 
 - (SDLImageType)imageType {
-    return [self objectForName:SDLNameImageType];
+    return [store sdl_objectForName:SDLNameImageType];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLImageField.m b/SmartDeviceLink/SDLImageField.m
index db5eb45e1..201537ec0 100644
--- a/SmartDeviceLink/SDLImageField.m
+++ b/SmartDeviceLink/SDLImageField.m
@@ -10,15 +10,15 @@
 @implementation SDLImageField
 
 - (void)setName:(SDLImageFieldName)name {
-    [self setObject:name forName:SDLNameName];
+    [store sdl_setObject:name forName:SDLNameName];
 }
 
 - (SDLImageFieldName)name {
-    return [self objectForName:SDLNameName];
+    return [store sdl_objectForName:SDLNameName];
 }
 
 - (void)setImageTypeSupported:(NSMutableArray<SDLFileType> *)imageTypeSupported {
-    [self setObject:imageTypeSupported forName:SDLNameImageTypeSupported];
+    [store sdl_setObject:imageTypeSupported forName:SDLNameImageTypeSupported];
 }
 
 - (NSMutableArray<SDLFileType> *)imageTypeSupported {
@@ -35,11 +35,11 @@
 }
 
 - (void)setImageResolution:(SDLImageResolution *)imageResolution {
-    [self setObject:imageResolution forName:SDLNameImageResolution];
+    [store sdl_setObject:imageResolution forName:SDLNameImageResolution];
 }
 
 - (SDLImageResolution *)imageResolution {
-    return [self objectForName:SDLNameImageResolution ofClass:SDLImageResolution.class];
+    return [store sdl_objectForName:SDLNameImageResolution ofClass:SDLImageResolution.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLImageResolution.m b/SmartDeviceLink/SDLImageResolution.m
index adabdc9cf..2562afe21 100644
--- a/SmartDeviceLink/SDLImageResolution.m
+++ b/SmartDeviceLink/SDLImageResolution.m
@@ -9,19 +9,19 @@
 @implementation SDLImageResolution
 
 - (void)setResolutionWidth:(NSNumber<SDLInt> *)resolutionWidth {
-    [self setObject:resolutionWidth forName:SDLNameResolutionWidth];
+    [store sdl_setObject:resolutionWidth forName:SDLNameResolutionWidth];
 }
 
 - (NSNumber<SDLInt> *)resolutionWidth {
-    return [self objectForName:SDLNameResolutionWidth];
+    return [store sdl_objectForName:SDLNameResolutionWidth];
 }
 
 - (void)setResolutionHeight:(NSNumber<SDLInt> *)resolutionHeight {
-    [self setObject:resolutionHeight forName:SDLNameResolutionHeight];
+    [store sdl_setObject:resolutionHeight forName:SDLNameResolutionHeight];
 }
 
 - (NSNumber<SDLInt> *)resolutionHeight {
-    return [self objectForName:SDLNameResolutionHeight];
+    return [store sdl_objectForName:SDLNameResolutionHeight];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLKeyboardProperties.m b/SmartDeviceLink/SDLKeyboardProperties.m
index 095a5d8a6..3888175c3 100644
--- a/SmartDeviceLink/SDLKeyboardProperties.m
+++ b/SmartDeviceLink/SDLKeyboardProperties.m
@@ -23,43 +23,43 @@
 }
 
 - (void)setLanguage:(SDLLanguage)language {
-    [self setObject:language forName:SDLNameLanguage];
+    [store sdl_setObject:language forName:SDLNameLanguage];
 }
 
 - (SDLLanguage)language {
-    return [self objectForName:SDLNameLanguage];
+    return [store sdl_objectForName:SDLNameLanguage];
 }
 
 - (void)setKeyboardLayout:(SDLKeyboardLayout)keyboardLayout {
-    [self setObject:keyboardLayout forName:SDLNameKeyboardLayout];
+    [store sdl_setObject:keyboardLayout forName:SDLNameKeyboardLayout];
 }
 
 - (SDLKeyboardLayout)keyboardLayout {
-    return [self objectForName:SDLNameKeyboardLayout];
+    return [store sdl_objectForName:SDLNameKeyboardLayout];
 }
 
 - (void)setKeypressMode:(SDLKeypressMode)keypressMode {
-    [self setObject:keypressMode forName:SDLNameKeypressMode];
+    [store sdl_setObject:keypressMode forName:SDLNameKeypressMode];
 }
 
 - (SDLKeypressMode)keypressMode {
-    return [self objectForName:SDLNameKeypressMode];
+    return [store sdl_objectForName:SDLNameKeypressMode];
 }
 
 - (void)setLimitedCharacterList:(NSMutableArray<NSString *> *)limitedCharacterList {
-    [self setObject:limitedCharacterList forName:SDLNameLimitedCharacterList];
+    [store sdl_setObject:limitedCharacterList forName:SDLNameLimitedCharacterList];
 }
 
 - (NSMutableArray<NSString *> *)limitedCharacterList {
-    return [self objectForName:SDLNameLimitedCharacterList];
+    return [store sdl_objectForName:SDLNameLimitedCharacterList];
 }
 
 - (void)setAutoCompleteText:(NSString *)autoCompleteText {
-    [self setObject:autoCompleteText forName:SDLNameAutoCompleteText];
+    [store sdl_setObject:autoCompleteText forName:SDLNameAutoCompleteText];
 }
 
 - (NSString *)autoCompleteText {
-    return [self objectForName:SDLNameAutoCompleteText];
+    return [store sdl_objectForName:SDLNameAutoCompleteText];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLListFilesResponse.m b/SmartDeviceLink/SDLListFilesResponse.m
index af9be01ab..f70e4541f 100644
--- a/SmartDeviceLink/SDLListFilesResponse.m
+++ b/SmartDeviceLink/SDLListFilesResponse.m
@@ -15,7 +15,7 @@
 }
 
 - (void)setFilenames:(NSMutableArray<NSString *> *)filenames {
-    [self setObject:filenames forName:SDLNameFilenames];
+    [parameters sdl_setObject:filenames forName:SDLNameFilenames];
 }
 
 - (NSMutableArray<NSString *> *)filenames {
@@ -23,7 +23,7 @@
 }
 
 - (void)setSpaceAvailable:(NSNumber<SDLInt> *)spaceAvailable {
-    [self setObject:spaceAvailable forName:SDLNameSpaceAvailable];
+    [parameters sdl_setObject:spaceAvailable forName:SDLNameSpaceAvailable];
 }
 
 - (NSNumber<SDLInt> *)spaceAvailable {
diff --git a/SmartDeviceLink/SDLLocationCoordinate.m b/SmartDeviceLink/SDLLocationCoordinate.m
index b92b46e92..c2d9635db 100644
--- a/SmartDeviceLink/SDLLocationCoordinate.m
+++ b/SmartDeviceLink/SDLLocationCoordinate.m
@@ -7,19 +7,19 @@
 @implementation SDLLocationCoordinate
 
 - (void)setLongitudeDegrees:(NSNumber<SDLFloat> *)longitudeDegrees {
-    [self setObject:longitudeDegrees forName:SDLNameLongitudeDegrees];
+    [store sdl_setObject:longitudeDegrees forName:SDLNameLongitudeDegrees];
 }
 
 - (NSNumber<SDLFloat> *)longitudeDegrees {
-    return [self objectForName:SDLNameLongitudeDegrees];
+    return [store sdl_objectForName:SDLNameLongitudeDegrees];
 }
 
 - (void)setLatitudeDegrees:(NSNumber<SDLFloat> *)latitudeDegrees {
-    [self setObject:latitudeDegrees forName:SDLNameLatitudeDegrees];
+    [store sdl_setObject:latitudeDegrees forName:SDLNameLatitudeDegrees];
 }
 
 - (NSNumber<SDLFloat> *)latitudeDegrees {
-    return [self objectForName:SDLNameLatitudeDegrees];
+    return [store sdl_objectForName:SDLNameLatitudeDegrees];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLLocationDetails.m b/SmartDeviceLink/SDLLocationDetails.m
index 735487479..cc5ab9c68 100644
--- a/SmartDeviceLink/SDLLocationDetails.m
+++ b/SmartDeviceLink/SDLLocationDetails.m
@@ -11,59 +11,59 @@
 @implementation SDLLocationDetails
 
 - (void)setCoordinate:(SDLLocationCoordinate *)coordinate {
-    [self setObject:coordinate forName:SDLNameLocationCoordinate];
+    [store sdl_setObject:coordinate forName:SDLNameLocationCoordinate];
 }
 
 - (SDLLocationCoordinate *)coordinate {
-    return [self objectForName:SDLNameLocationCoordinate];
+    return [store sdl_objectForName:SDLNameLocationCoordinate];
 }
 
 - (void)setLocationName:(NSString *)locationName {
-    [self setObject:locationName forName:SDLNameLocationName];
+    [store sdl_setObject:locationName forName:SDLNameLocationName];
 }
 
 - (NSString *)locationName {
-    return [self objectForName:SDLNameLocationName];
+    return [store sdl_objectForName:SDLNameLocationName];
 }
 
 - (void)setAddressLines:(NSArray<NSString *> *)addressLines {
-    [self setObject:addressLines forName:SDLNameAddressLines];
+    [store sdl_setObject:addressLines forName:SDLNameAddressLines];
 }
 
 - (NSArray<NSString *> *)addressLines {
-    return [self objectForName:SDLNameAddressLines];
+    return [store sdl_objectForName:SDLNameAddressLines];
 }
 
 - (void)setLocationDescription:(NSString *)locationDescription {
-    [self setObject:locationDescription forName:SDLNameLocationDescription];
+    [store sdl_setObject:locationDescription forName:SDLNameLocationDescription];
 }
 
 - (NSString *)locationDescription {
-    return [self objectForName:SDLNameLocationDescription];
+    return [store sdl_objectForName:SDLNameLocationDescription];
 }
 
 - (void)setPhoneNumber:(NSString *)phoneNumber {
-    [self setObject:phoneNumber forName:SDLNamePhoneNumber];
+    [store sdl_setObject:phoneNumber forName:SDLNamePhoneNumber];
 }
 
 - (NSString *)phoneNumber {
-    return [self objectForName:SDLNamePhoneNumber];
+    return [store sdl_objectForName:SDLNamePhoneNumber];
 }
 
 - (void)setLocationImage:(SDLImage *)locationImage {
-    [self setObject:locationImage forName:SDLNameLocationImage];
+    [store sdl_setObject:locationImage forName:SDLNameLocationImage];
 }
 
 - (SDLImage *)locationImage {
-    return [self objectForName:SDLNameLocationImage];
+    return [store sdl_objectForName:SDLNameLocationImage];
 }
 
 - (void)setSearchAddress:(SDLOasisAddress *)searchAddress {
-    [self setObject:searchAddress forName:SDLNameAddress];
+    [store sdl_setObject:searchAddress forName:SDLNameAddress];
 }
 
 - (SDLOasisAddress *)searchAddress {
-    return [self objectForName:SDLNameAddress];
+    return [store sdl_objectForName:SDLNameAddress];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLMenuParams.m b/SmartDeviceLink/SDLMenuParams.m
index 21dda805e..21f939d4b 100644
--- a/SmartDeviceLink/SDLMenuParams.m
+++ b/SmartDeviceLink/SDLMenuParams.m
@@ -32,27 +32,27 @@
 }
 
 - (void)setParentID:(NSNumber<SDLInt> *)parentID {
-    [self setObject:parentID forName:SDLNameParentId];
+    [store sdl_setObject:parentID forName:SDLNameParentId];
 }
 
 - (NSNumber<SDLInt> *)parentID {
-    return [self objectForName:SDLNameParentId];
+    return [store sdl_objectForName:SDLNameParentId];
 }
 
 - (void)setPosition:(NSNumber<SDLInt> *)position {
-    [self setObject:position forName:SDLNamePosition];
+    [store sdl_setObject:position forName:SDLNamePosition];
 }
 
 - (NSNumber<SDLInt> *)position {
-    return [self objectForName:SDLNamePosition];
+    return [store sdl_objectForName:SDLNamePosition];
 }
 
 - (void)setMenuName:(NSString *)menuName {
-    [self setObject:menuName forName:SDLNameMenuName];
+    [store sdl_setObject:menuName forName:SDLNameMenuName];
 }
 
 - (NSString *)menuName {
-    return [self objectForName:SDLNameMenuName];
+    return [store sdl_objectForName:SDLNameMenuName];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLMyKey.m b/SmartDeviceLink/SDLMyKey.m
index d396223f8..5e36f780f 100644
--- a/SmartDeviceLink/SDLMyKey.m
+++ b/SmartDeviceLink/SDLMyKey.m
@@ -9,11 +9,11 @@
 @implementation SDLMyKey
 
 - (void)setE911Override:(SDLVehicleDataStatus)e911Override {
-    [self setObject:e911Override forName:SDLNameE911Override];
+    [store sdl_setObject:e911Override forName:SDLNameE911Override];
 }
 
 - (SDLVehicleDataStatus)e911Override {
-    return [self objectForName:SDLNameE911Override];
+    return [store sdl_objectForName:SDLNameE911Override];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOasisAddress.m b/SmartDeviceLink/SDLOasisAddress.m
index 0b9cd8891..0d1ad863f 100644
--- a/SmartDeviceLink/SDLOasisAddress.m
+++ b/SmartDeviceLink/SDLOasisAddress.m
@@ -31,75 +31,75 @@
 
 
 - (void)setCountryName:(NSString *)countryName {
-    [self setObject:countryName forName:SDLNameCountryName];
+    [store sdl_setObject:countryName forName:SDLNameCountryName];
 }
 
 - (NSString *)countryName {
-    return [self objectForName:SDLNameCountryName];
+    return [store sdl_objectForName:SDLNameCountryName];
 }
 
 - (void)setCountryCode:(NSString *)countryCode {
-    [self setObject:countryCode forName:SDLNameCountryCode];
+    [store sdl_setObject:countryCode forName:SDLNameCountryCode];
 }
 
 - (NSString *)countryCode {
-    return [self objectForName:SDLNameCountryCode];
+    return [store sdl_objectForName:SDLNameCountryCode];
 }
 
 - (void)setPostalCode:(NSString *)postalCode {
-    [self setObject:postalCode forName:SDLNamePostalCode];
+    [store sdl_setObject:postalCode forName:SDLNamePostalCode];
 }
 
 - (NSString *)postalCode {
-    return [self objectForName:SDLNamePostalCode];
+    return [store sdl_objectForName:SDLNamePostalCode];
 }
 
 - (void)setAdministrativeArea:(NSString *)administrativeArea {
-    [self setObject:administrativeArea forName:SDLNameAdministrativeArea];
+    [store sdl_setObject:administrativeArea forName:SDLNameAdministrativeArea];
 }
 
 - (NSString *)administrativeArea {
-    return [self objectForName:SDLNameAdministrativeArea];
+    return [store sdl_objectForName:SDLNameAdministrativeArea];
 }
 
 - (void)setSubAdministrativeArea:(NSString *)subAdministrativeArea {
-    [self setObject:subAdministrativeArea forName:SDLNameSubAdministrativeArea];
+    [store sdl_setObject:subAdministrativeArea forName:SDLNameSubAdministrativeArea];
 }
 
 - (NSString *)subAdministrativeArea {
-    return [self objectForName:SDLNameSubAdministrativeArea];
+    return [store sdl_objectForName:SDLNameSubAdministrativeArea];
 }
 
 - (void)setLocality:(NSString *)locality {
-    [self setObject:locality forName:SDLNameLocality];
+    [store sdl_setObject:locality forName:SDLNameLocality];
 }
 
 - (NSString *)locality {
-    return [self objectForName:SDLNameLocality];
+    return [store sdl_objectForName:SDLNameLocality];
 }
 
 - (void)setSubLocality:(NSString *)subLocality {
-    [self setObject:subLocality forName:SDLNameSubLocality];
+    [store sdl_setObject:subLocality forName:SDLNameSubLocality];
 }
 
 - (NSString *)subLocality {
-    return [self objectForName:SDLNameSubLocality];
+    return [store sdl_objectForName:SDLNameSubLocality];
 }
 
 - (void)setThoroughfare:(NSString *)thoroughfare {
-    [self setObject:thoroughfare forName:SDLNameThoroughfare];
+    [store sdl_setObject:thoroughfare forName:SDLNameThoroughfare];
 }
 
 - (NSString *)thoroughfare {
-    return [self objectForName:SDLNameThoroughfare];
+    return [store sdl_objectForName:SDLNameThoroughfare];
 }
 
 - (void)setSubThoroughfare:(NSString *)subThoroughfare {
-    [self setObject:subThoroughfare forName:SDLNameSubThoroughfare];
+    [store sdl_setObject:subThoroughfare forName:SDLNameSubThoroughfare];
 }
 
 - (NSString *)subThoroughfare {
-    return [self objectForName:SDLNameSubThoroughfare];
+    return [store sdl_objectForName:SDLNameSubThoroughfare];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
index 1c658eb25..2eb174fb3 100644
--- a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
+++ b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
@@ -14,12 +14,11 @@
 }
 
 - (void)setReason:(SDLAppInterfaceUnregisteredReason)reason {
-    [self setObject:reason forName: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/SDLOnButtonEvent.m b/SmartDeviceLink/SDLOnButtonEvent.m
index 17512eef2..7a5388d76 100644
--- a/SmartDeviceLink/SDLOnButtonEvent.m
+++ b/SmartDeviceLink/SDLOnButtonEvent.m
@@ -14,29 +14,29 @@
 }
 
 - (void)setButtonName:(SDLButtonName)buttonName {
-    [self setObject:buttonName forName: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 {
-    [self setObject:buttonEventMode forName: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:(NSNumber<SDLInt> *)customButtonID {
-    [self setObject:customButtonID forName:SDLNameCustomButtonId];
+    [parameters sdl_setObject:customButtonID forName:SDLNameCustomButtonId];
 }
 
 - (NSNumber<SDLInt> *)customButtonID {
-    return [parameters objectForKey:SDLNameCustomButtonId];
+    return [parameters sdl_objectForName:SDLNameCustomButtonId];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnButtonPress.m b/SmartDeviceLink/SDLOnButtonPress.m
index 8447a3b7e..e792329dc 100644
--- a/SmartDeviceLink/SDLOnButtonPress.m
+++ b/SmartDeviceLink/SDLOnButtonPress.m
@@ -14,29 +14,29 @@
 }
 
 - (void)setButtonName:(SDLButtonName)buttonName {
-    [self setObject:buttonName forName: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 {
-    [self setObject:buttonPressMode forName: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:(NSNumber<SDLInt> *)customButtonID {
-    [self setObject:customButtonID forName:SDLNameCustomButtonId];
+    [parameters sdl_setObject:customButtonID forName:SDLNameCustomButtonId];
 }
 
 - (NSNumber<SDLInt> *)customButtonID {
-    return [parameters objectForKey:SDLNameCustomButtonId];
+    return [parameters sdl_objectForName:SDLNameCustomButtonId];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnCommand.m b/SmartDeviceLink/SDLOnCommand.m
index 290c69262..76ca3d4a5 100644
--- a/SmartDeviceLink/SDLOnCommand.m
+++ b/SmartDeviceLink/SDLOnCommand.m
@@ -14,19 +14,19 @@
 }
 
 - (void)setCmdID:(NSNumber<SDLInt> *)cmdID {
-    [self setObject:cmdID forName:SDLNameCommandId];
+    [parameters sdl_setObject:cmdID forName:SDLNameCommandId];
 }
 
 - (NSNumber<SDLInt> *)cmdID {
-    return [parameters objectForKey:SDLNameCommandId];
+    return [parameters sdl_objectForName:SDLNameCommandId];
 }
 
 - (void)setTriggerSource:(SDLTriggerSource)triggerSource {
-    [self setObject:triggerSource forName: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 91975340b..551ec17fa 100644
--- a/SmartDeviceLink/SDLOnDriverDistraction.m
+++ b/SmartDeviceLink/SDLOnDriverDistraction.m
@@ -15,11 +15,11 @@
 }
 
 - (void)setState:(SDLDriverDistractionState)state {
-    [self setObject:state forName: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 b3a69da05..1e8f11ab6 100644
--- a/SmartDeviceLink/SDLOnEncodedSyncPData.m
+++ b/SmartDeviceLink/SDLOnEncodedSyncPData.m
@@ -14,27 +14,27 @@
 }
 
 - (void)setData:(NSMutableArray<NSString *> *)data {
-    [self setObject:data forName:SDLNameData];
+    [parameters sdl_setObject:data forName:SDLNameData];
 }
 
 - (NSMutableArray<NSString *> *)data {
-    return [parameters objectForKey:SDLNameData];
+    return [parameters sdl_objectForName:SDLNameData];
 }
 
 - (void)setURL:(NSString *)URL {
-    [self setObject:URL forName:SDLNameURLUppercase];
+    [parameters sdl_setObject:URL forName:SDLNameURLUppercase];
 }
 
 - (NSString *)URL {
-    return [parameters objectForKey:SDLNameURLUppercase];
+    return [parameters sdl_objectForName:SDLNameURLUppercase];
 }
 
 - (void)setTimeout:(NSNumber<SDLInt> *)Timeout {
-    [self setObject:Timeout forName:SDLNameTimeoutCapitalized];
+    [parameters sdl_setObject:Timeout forName:SDLNameTimeoutCapitalized];
 }
 
 - (NSNumber<SDLInt> *)Timeout {
-    return [parameters objectForKey:SDLNameTimeoutCapitalized];
+    return [parameters sdl_objectForName:SDLNameTimeoutCapitalized];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnHMIStatus.m b/SmartDeviceLink/SDLOnHMIStatus.m
index fb57ca15b..8275afe1a 100644
--- a/SmartDeviceLink/SDLOnHMIStatus.m
+++ b/SmartDeviceLink/SDLOnHMIStatus.m
@@ -17,29 +17,29 @@
 }
 
 - (void)setHmiLevel:(SDLHMILevel)hmiLevel {
-    [self setObject:hmiLevel forName: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 {
-    [self setObject:audioStreamingState forName: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 {
-    [self setObject:systemContext forName: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 2eb0af909..3092a58d4 100644
--- a/SmartDeviceLink/SDLOnHashChange.m
+++ b/SmartDeviceLink/SDLOnHashChange.m
@@ -15,11 +15,11 @@
 }
 
 - (void)setHashID:(NSString *)hashID {
-    [self setObject:hashID forName: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 b0d9409ae..1ef8768db 100644
--- a/SmartDeviceLink/SDLOnKeyboardInput.m
+++ b/SmartDeviceLink/SDLOnKeyboardInput.m
@@ -14,20 +14,20 @@
 }
 
 - (void)setEvent:(SDLKeyboardEvent)event {
-    [self setObject:event forName: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:(NSString *)data {
-    [self setObject:data forName:SDLNameData];
+    [parameters sdl_setObject:data forName:SDLNameData];
 }
 
 - (NSString *)data {
-    return [parameters objectForKey:SDLNameData];
+    return [parameters sdl_objectForName:SDLNameData];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnLanguageChange.m b/SmartDeviceLink/SDLOnLanguageChange.m
index a95c6c539..0610d8d4a 100644
--- a/SmartDeviceLink/SDLOnLanguageChange.m
+++ b/SmartDeviceLink/SDLOnLanguageChange.m
@@ -15,20 +15,20 @@
 }
 
 - (void)setLanguage:(SDLLanguage)language {
-    [self setObject:language forName: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 {
-    [self setObject:hmiDisplayLanguage forName: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 437cee85c..67b7f28e2 100644
--- a/SmartDeviceLink/SDLOnLockScreenStatus.m
+++ b/SmartDeviceLink/SDLOnLockScreenStatus.m
@@ -18,53 +18,35 @@
 }
 
 - (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 5ff145b47..4c304caea 100644
--- a/SmartDeviceLink/SDLOnPermissionsChange.m
+++ b/SmartDeviceLink/SDLOnPermissionsChange.m
@@ -15,11 +15,11 @@
 }
 
 - (void)setPermissionItem:(NSMutableArray<SDLPermissionItem *> *)permissionItem {
-    [self setObject:permissionItem forName: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 51609ea24..6db8b77f2 100644
--- a/SmartDeviceLink/SDLOnSyncPData.m
+++ b/SmartDeviceLink/SDLOnSyncPData.m
@@ -15,19 +15,19 @@
 }
 
 - (void)setURL:(NSString *)URL {
-    [self setObject:URL forName:SDLNameURLUppercase];
+    [parameters sdl_setObject:URL forName:SDLNameURLUppercase];
 }
 
 - (NSString *)URL {
-    return [parameters objectForKey:SDLNameURLUppercase];
+    return [parameters sdl_objectForName:SDLNameURLUppercase];
 }
 
 - (void)setTimeout:(NSNumber<SDLInt> *)Timeout {
-    [self setObject:Timeout forName:SDLNameTimeoutCapitalized];
+    [parameters sdl_setObject:Timeout forName:SDLNameTimeoutCapitalized];
 }
 
 - (NSNumber<SDLInt> *)Timeout {
-    return [parameters objectForKey:SDLNameTimeoutCapitalized];
+    return [parameters sdl_objectForName:SDLNameTimeoutCapitalized];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnSystemRequest.m b/SmartDeviceLink/SDLOnSystemRequest.m
index 60b66564d..f93bf8c86 100644
--- a/SmartDeviceLink/SDLOnSystemRequest.m
+++ b/SmartDeviceLink/SDLOnSystemRequest.m
@@ -14,53 +14,53 @@
 }
 
 - (void)setRequestType:(SDLRequestType)requestType {
-    [self setObject:requestType forName:SDLNameRequestType];
+    [parameters sdl_setObject:requestType forName:SDLNameRequestType];
 }
 
 - (SDLRequestType)requestType {
-    NSObject *obj = [parameters objectForKey:SDLNameRequestType];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameRequestType];
     return (SDLRequestType)obj;
 }
 
 - (void)setUrl:(NSString *)url {
-    [self setObject:url forName:SDLNameURL];
+    [parameters sdl_setObject:url forName:SDLNameURL];
 }
 
 - (NSString *)url {
-    return [parameters objectForKey:SDLNameURL];
+    return [parameters sdl_objectForName:SDLNameURL];
 }
 
 - (void)setTimeout:(NSNumber<SDLInt> *)timeout {
-    [self setObject:timeout forName:SDLNameTimeout];
+    [parameters sdl_setObject:timeout forName:SDLNameTimeout];
 }
 
 - (NSNumber<SDLInt> *)timeout {
-    return [parameters objectForKey:SDLNameTimeout];
+    return [parameters sdl_objectForName:SDLNameTimeout];
 }
 
 - (void)setFileType:(SDLFileType)fileType {
-    [self setObject:fileType forName:SDLNameFileType];
+    [parameters sdl_setObject:fileType forName:SDLNameFileType];
 }
 
 - (SDLFileType)fileType {
-    NSObject *obj = [parameters objectForKey:SDLNameFileType];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameFileType];
     return (SDLFileType)obj;
 }
 
 - (void)setOffset:(NSNumber<SDLInt> *)offset {
-    [self setObject:offset forName:SDLNameOffset];
+    [parameters sdl_setObject:offset forName:SDLNameOffset];
 }
 
 - (NSNumber<SDLInt> *)offset {
-    return [parameters objectForKey:SDLNameOffset];
+    return [parameters sdl_objectForName:SDLNameOffset];
 }
 
 - (void)setLength:(NSNumber<SDLInt> *)length {
-    [self setObject:length forName:SDLNameLength];
+    [parameters sdl_setObject:length forName:SDLNameLength];
 }
 
 - (NSNumber<SDLInt> *)length {
-    return [parameters objectForKey:SDLNameLength];
+    return [parameters sdl_objectForName:SDLNameLength];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLOnTBTClientState.m b/SmartDeviceLink/SDLOnTBTClientState.m
index 22b0c580d..2ba9f9ce1 100644
--- a/SmartDeviceLink/SDLOnTBTClientState.m
+++ b/SmartDeviceLink/SDLOnTBTClientState.m
@@ -14,11 +14,11 @@
 }
 
 - (void)setState:(SDLTBTState)state {
-    [self setObject:state forName: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 5a2e346e9..e97e5601b 100644
--- a/SmartDeviceLink/SDLOnTouchEvent.m
+++ b/SmartDeviceLink/SDLOnTouchEvent.m
@@ -15,20 +15,20 @@
 }
 
 - (void)setType:(SDLTouchType)type {
-    [self setObject:type forName: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 {
-    [self setObject:event forName: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 ea16e05cd..f23cca2b0 100644
--- a/SmartDeviceLink/SDLOnVehicleData.m
+++ b/SmartDeviceLink/SDLOnVehicleData.m
@@ -26,11 +26,11 @@
 }
 
 - (void)setGps:(SDLGPSData *)gps {
-    [self setObject:gps forName:SDLNameGPS];
+    [parameters sdl_setObject:gps forName:SDLNameGPS];
 }
 
 - (SDLGPSData *)gps {
-    NSObject *obj = [parameters objectForKey:SDLNameGPS];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameGPS];
     if (obj == nil || [obj isKindOfClass:SDLGPSData.class]) {
         return (SDLGPSData *)obj;
     } else {
@@ -39,77 +39,77 @@
 }
 
 - (void)setSpeed:(NSNumber<SDLFloat> *)speed {
-    [self setObject:speed forName:SDLNameSpeed];
+    [parameters sdl_setObject:speed forName:SDLNameSpeed];
 }
 
 - (NSNumber<SDLFloat> *)speed {
-    return [parameters objectForKey:SDLNameSpeed];
+    return [parameters sdl_objectForName:SDLNameSpeed];
 }
 
 - (void)setRpm:(NSNumber<SDLInt> *)rpm {
-    [self setObject:rpm forName:SDLNameRPM];
+    [parameters sdl_setObject:rpm forName:SDLNameRPM];
 }
 
 - (NSNumber<SDLInt> *)rpm {
-    return [parameters objectForKey:SDLNameRPM];
+    return [parameters sdl_objectForName:SDLNameRPM];
 }
 
 - (void)setFuelLevel:(NSNumber<SDLFloat> *)fuelLevel {
-    [self setObject:fuelLevel forName:SDLNameFuelLevel];
+    [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel];
 }
 
 - (NSNumber<SDLFloat> *)fuelLevel {
-    return [parameters objectForKey:SDLNameFuelLevel];
+    return [parameters sdl_objectForName:SDLNameFuelLevel];
 }
 
 - (void)setFuelLevel_State:(SDLComponentVolumeStatus)fuelLevel_State {
-    [self setObject:fuelLevel_State forName:SDLNameFuelLevelState];
+    [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState];
 }
 
 - (SDLComponentVolumeStatus)fuelLevel_State {
-    NSObject *obj = [parameters objectForKey:SDLNameFuelLevelState];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameFuelLevelState];
     return (SDLComponentVolumeStatus)obj;
 }
 
 - (void)setInstantFuelConsumption:(NSNumber<SDLFloat> *)instantFuelConsumption {
-    [self setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
+    [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
 }
 
 - (NSNumber<SDLFloat> *)instantFuelConsumption {
-    return [parameters objectForKey:SDLNameInstantFuelConsumption];
+    return [parameters sdl_objectForName:SDLNameInstantFuelConsumption];
 }
 
 - (void)setExternalTemperature:(NSNumber<SDLFloat> *)externalTemperature {
-    [self setObject:externalTemperature forName:SDLNameExternalTemperature];
+    [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature];
 }
 
 - (NSNumber<SDLFloat> *)externalTemperature {
-    return [parameters objectForKey:SDLNameExternalTemperature];
+    return [parameters sdl_objectForName:SDLNameExternalTemperature];
 }
 
 - (void)setVin:(NSString *)vin {
-    [self setObject:vin forName:SDLNameVIN];
+    [parameters sdl_setObject:vin forName:SDLNameVIN];
 }
 
 - (NSString *)vin {
-    return [parameters objectForKey:SDLNameVIN];
+    return [parameters sdl_objectForName:SDLNameVIN];
 }
 
 - (void)setPrndl:(SDLPRNDL)prndl {
-    [self setObject:prndl forName:SDLNamePRNDL];
+    [parameters sdl_setObject:prndl forName:SDLNamePRNDL];
 }
 
 - (SDLPRNDL)prndl {
-    NSObject *obj = [parameters objectForKey:SDLNamePRNDL];
+    NSObject *obj = [parameters sdl_objectForName:SDLNamePRNDL];
     return (SDLPRNDL)obj;
 }
 
 - (void)setTirePressure:(SDLTireStatus *)tirePressure {
-    [self setObject:tirePressure forName:SDLNameTirePressure];
+    [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure];
 }
 
 - (SDLTireStatus *)tirePressure {
-    NSObject *obj = [parameters objectForKey:SDLNameTirePressure];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameTirePressure];
     if (obj == nil || [obj isKindOfClass:SDLTireStatus.class]) {
         return (SDLTireStatus *)obj;
     } else {
@@ -118,19 +118,19 @@
 }
 
 - (void)setOdometer:(NSNumber<SDLInt> *)odometer {
-    [self setObject:odometer forName:SDLNameOdometer];
+    [parameters sdl_setObject:odometer forName:SDLNameOdometer];
 }
 
 - (NSNumber<SDLInt> *)odometer {
-    return [parameters objectForKey:SDLNameOdometer];
+    return [parameters sdl_objectForName:SDLNameOdometer];
 }
 
 - (void)setBeltStatus:(SDLBeltStatus *)beltStatus {
-    [self setObject:beltStatus forName:SDLNameBeltStatus];
+    [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus];
 }
 
 - (SDLBeltStatus *)beltStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameBeltStatus];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameBeltStatus];
     if (obj == nil || [obj isKindOfClass:SDLBeltStatus.class]) {
         return (SDLBeltStatus *)obj;
     } else {
@@ -139,11 +139,11 @@
 }
 
 - (void)setBodyInformation:(SDLBodyInformation *)bodyInformation {
-    [self setObject:bodyInformation forName:SDLNameBodyInformation];
+    [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation];
 }
 
 - (SDLBodyInformation *)bodyInformation {
-    NSObject *obj = [parameters objectForKey:SDLNameBodyInformation];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameBodyInformation];
     if (obj == nil || [obj isKindOfClass:SDLBodyInformation.class]) {
         return (SDLBodyInformation *)obj;
     } else {
@@ -152,11 +152,11 @@
 }
 
 - (void)setDeviceStatus:(SDLDeviceStatus *)deviceStatus {
-    [self setObject:deviceStatus forName:SDLNameDeviceStatus];
+    [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus];
 }
 
 - (SDLDeviceStatus *)deviceStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameDeviceStatus];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameDeviceStatus];
     if (obj == nil || [obj isKindOfClass:SDLDeviceStatus.class]) {
         return (SDLDeviceStatus *)obj;
     } else {
@@ -165,29 +165,29 @@
 }
 
 - (void)setDriverBraking:(SDLVehicleDataEventStatus)driverBraking {
-    [self setObject:driverBraking forName:SDLNameDriverBraking];
+    [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking];
 }
 
 - (SDLVehicleDataEventStatus)driverBraking {
-    NSObject *obj = [parameters objectForKey:SDLNameDriverBraking];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameDriverBraking];
     return (SDLVehicleDataEventStatus)obj;
 }
 
 - (void)setWiperStatus:(SDLWiperStatus)wiperStatus {
-    [self setObject:wiperStatus forName:SDLNameWiperStatus];
+    [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus];
 }
 
 - (SDLWiperStatus)wiperStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameWiperStatus];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameWiperStatus];
     return (SDLWiperStatus)obj;
 }
 
 - (void)setHeadLampStatus:(SDLHeadLampStatus *)headLampStatus {
-    [self setObject:headLampStatus forName:SDLNameHeadLampStatus];
+    [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus];
 }
 
 - (SDLHeadLampStatus *)headLampStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameHeadLampStatus];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameHeadLampStatus];
     if (obj == nil || [obj isKindOfClass:SDLHeadLampStatus.class]) {
         return (SDLHeadLampStatus *)obj;
     } else {
@@ -196,35 +196,35 @@
 }
 
 - (void)setEngineTorque:(NSNumber<SDLFloat> *)engineTorque {
-    [self setObject:engineTorque forName:SDLNameEngineTorque];
+    [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque];
 }
 
 - (NSNumber<SDLFloat> *)engineTorque {
-    return [parameters objectForKey:SDLNameEngineTorque];
+    return [parameters sdl_objectForName:SDLNameEngineTorque];
 }
 
 - (void)setAccPedalPosition:(NSNumber<SDLFloat> *)accPedalPosition {
-    [self setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
+    [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
 }
 
 - (NSNumber<SDLFloat> *)accPedalPosition {
-    return [parameters objectForKey:SDLNameAccelerationPedalPosition];
+    return [parameters sdl_objectForName:SDLNameAccelerationPedalPosition];
 }
 
 - (void)setSteeringWheelAngle:(NSNumber<SDLFloat> *)steeringWheelAngle {
-    [self setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
+    [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
 }
 
 - (NSNumber<SDLFloat> *)steeringWheelAngle {
-    return [parameters objectForKey:SDLNameSteeringWheelAngle];
+    return [parameters sdl_objectForName:SDLNameSteeringWheelAngle];
 }
 
 - (void)setECallInfo:(SDLECallInfo *)eCallInfo {
-    [self setObject:eCallInfo forName:SDLNameECallInfo];
+    [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo];
 }
 
 - (SDLECallInfo *)eCallInfo {
-    NSObject *obj = [parameters objectForKey:SDLNameECallInfo];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameECallInfo];
     if (obj == nil || [obj isKindOfClass:SDLECallInfo.class]) {
         return (SDLECallInfo *)obj;
     } else {
@@ -233,11 +233,11 @@
 }
 
 - (void)setAirbagStatus:(SDLAirbagStatus *)airbagStatus {
-    [self setObject:airbagStatus forName:SDLNameAirbagStatus];
+    [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus];
 }
 
 - (SDLAirbagStatus *)airbagStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameAirbagStatus];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameAirbagStatus];
     if (obj == nil || [obj isKindOfClass:SDLAirbagStatus.class]) {
         return (SDLAirbagStatus *)obj;
     } else {
@@ -246,11 +246,11 @@
 }
 
 - (void)setEmergencyEvent:(SDLEmergencyEvent *)emergencyEvent {
-    [self setObject:emergencyEvent forName:SDLNameEmergencyEvent];
+    [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent];
 }
 
 - (SDLEmergencyEvent *)emergencyEvent {
-    NSObject *obj = [parameters objectForKey:SDLNameEmergencyEvent];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameEmergencyEvent];
     if (obj == nil || [obj isKindOfClass:SDLEmergencyEvent.class]) {
         return (SDLEmergencyEvent *)obj;
     } else {
@@ -259,11 +259,11 @@
 }
 
 - (void)setClusterModeStatus:(SDLClusterModeStatus *)clusterModeStatus {
-    [self setObject:clusterModeStatus forName:SDLNameClusterModeStatus];
+    [parameters sdl_setObject:clusterModeStatus forName:SDLNameClusterModeStatus];
 }
 
 - (SDLClusterModeStatus *)clusterModeStatus {
-    NSObject *obj = [parameters objectForKey:SDLNameClusterModeStatus];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameClusterModeStatus];
     if (obj == nil || [obj isKindOfClass:SDLClusterModeStatus.class]) {
         return (SDLClusterModeStatus *)obj;
     } else {
@@ -272,11 +272,11 @@
 }
 
 - (void)setMyKey:(SDLMyKey *)myKey {
-    [self setObject:myKey forName:SDLNameMyKey];
+    [parameters sdl_setObject:myKey forName:SDLNameMyKey];
 }
 
 - (SDLMyKey *)myKey {
-    NSObject *obj = [parameters objectForKey:SDLNameMyKey];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameMyKey];
     if (obj == nil || [obj isKindOfClass:SDLMyKey.class]) {
         return (SDLMyKey *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLOnWaypointChange.m b/SmartDeviceLink/SDLOnWaypointChange.m
index e94c63bdf..9a6251716 100644
--- a/SmartDeviceLink/SDLOnWaypointChange.m
+++ b/SmartDeviceLink/SDLOnWaypointChange.m
@@ -14,11 +14,11 @@
 }
 
 - (void)setWaypoints:(NSArray<SDLLocationDetails *> *)waypoints {
-    [self setObject:waypoints forName:SDLNameWaypoints];
+    [parameters sdl_setObject:waypoints forName:SDLNameWaypoints];
 }
 
 - (NSArray<SDLLocationDetails *> *)waypoints {
-    return [self objectForName:SDLNameWaypoints];
+    return [parameters sdl_objectForName:SDLNameWaypoints];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLParameterPermissions.m b/SmartDeviceLink/SDLParameterPermissions.m
index f8b51014d..1843869c6 100644
--- a/SmartDeviceLink/SDLParameterPermissions.m
+++ b/SmartDeviceLink/SDLParameterPermissions.m
@@ -9,19 +9,19 @@
 @implementation SDLParameterPermissions
 
 - (void)setAllowed:(NSMutableArray<NSString *> *)allowed {
-    [self setObject:allowed forName:SDLNameAllowed];
+    [store sdl_setObject:allowed forName:SDLNameAllowed];
 }
 
 - (NSMutableArray<NSString *> *)allowed {
-    return [self objectForName:SDLNameAllowed];
+    return [store sdl_objectForName:SDLNameAllowed];
 }
 
 - (void)setUserDisallowed:(NSMutableArray<NSString *> *)userDisallowed {
-    [self setObject:userDisallowed forName:SDLNameUserDisallowed];
+    [store sdl_setObject:userDisallowed forName:SDLNameUserDisallowed];
 }
 
 - (NSMutableArray<NSString *> *)userDisallowed {
-    return [self objectForName:SDLNameUserDisallowed];
+    return [store sdl_objectForName:SDLNameUserDisallowed];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLPerformAudioPassThru.m b/SmartDeviceLink/SDLPerformAudioPassThru.m
index eb2fccfb0..80a923fa9 100644
--- a/SmartDeviceLink/SDLPerformAudioPassThru.m
+++ b/SmartDeviceLink/SDLPerformAudioPassThru.m
@@ -44,11 +44,11 @@
 }
 
 - (void)setInitialPrompt:(NSMutableArray<SDLTTSChunk *> *)initialPrompt {
-    [self setObject:initialPrompt forName:SDLNameInitialPrompt];
+    [parameters sdl_setObject:initialPrompt forName:SDLNameInitialPrompt];
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)initialPrompt {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameInitialPrompt];
+    NSMutableArray<SDLTTSChunk *> *array = [parameters sdl_objectForName:SDLNameInitialPrompt];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
@@ -61,62 +61,62 @@
 }
 
 - (void)setAudioPassThruDisplayText1:(NSString *)audioPassThruDisplayText1 {
-    [self setObject:audioPassThruDisplayText1 forName:SDLNameAudioPassThruDisplayText1];
+    [parameters sdl_setObject:audioPassThruDisplayText1 forName:SDLNameAudioPassThruDisplayText1];
 }
 
 - (NSString *)audioPassThruDisplayText1 {
-    return [parameters objectForKey:SDLNameAudioPassThruDisplayText1];
+    return [parameters sdl_objectForName:SDLNameAudioPassThruDisplayText1];
 }
 
 - (void)setAudioPassThruDisplayText2:(NSString *)audioPassThruDisplayText2 {
-    [self setObject:audioPassThruDisplayText2 forName:SDLNameAudioPassThruDisplayText2];
+    [parameters sdl_setObject:audioPassThruDisplayText2 forName:SDLNameAudioPassThruDisplayText2];
 }
 
 - (NSString *)audioPassThruDisplayText2 {
-    return [parameters objectForKey:SDLNameAudioPassThruDisplayText2];
+    return [parameters sdl_objectForName:SDLNameAudioPassThruDisplayText2];
 }
 
 - (void)setSamplingRate:(SDLSamplingRate)samplingRate {
-    [self setObject:samplingRate forName: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 {
-    [self setObject:maxDuration forName:SDLNameMaxDuration];
+    [parameters sdl_setObject:maxDuration forName:SDLNameMaxDuration];
 }
 
 - (NSNumber<SDLInt> *)maxDuration {
-    return [parameters objectForKey:SDLNameMaxDuration];
+    return [parameters sdl_objectForName:SDLNameMaxDuration];
 }
 
 - (void)setBitsPerSample:(SDLBitsPerSample)bitsPerSample {
-    [self setObject:bitsPerSample forName:SDLNameBitsPerSample];
+    [parameters sdl_setObject:bitsPerSample forName:SDLNameBitsPerSample];
 }
 
 - (SDLBitsPerSample)bitsPerSample {
-    NSObject *obj = [parameters objectForKey:SDLNameBitsPerSample];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameBitsPerSample];
     return (SDLBitsPerSample)obj;
 }
 
 - (void)setAudioType:(SDLAudioType)audioType {
-    [self setObject:audioType forName:SDLNameAudioType];
+    [parameters sdl_setObject:audioType forName:SDLNameAudioType];
 }
 
 - (SDLAudioType)audioType {
-    NSObject *obj = [parameters objectForKey:SDLNameAudioType];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameAudioType];
     return (SDLAudioType)obj;
 }
 
 - (void)setMuteAudio:(NSNumber<SDLBool> *)muteAudio {
-    [self setObject:muteAudio forName:SDLNameMuteAudio];
+    [parameters sdl_setObject:muteAudio forName:SDLNameMuteAudio];
 }
 
 - (NSNumber<SDLBool> *)muteAudio {
-    return [parameters objectForKey:SDLNameMuteAudio];
+    return [parameters sdl_objectForName:SDLNameMuteAudio];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink/SDLPerformInteraction.m
index a2dba01e0..e4ff9b85c 100644
--- a/SmartDeviceLink/SDLPerformInteraction.m
+++ b/SmartDeviceLink/SDLPerformInteraction.m
@@ -71,19 +71,19 @@ static UInt16 const SDLDefaultTimeout = 10000;
 }
 
 - (void)setInitialText:(NSString *)initialText {
-    [self setObject:initialText forName:SDLNameInitialText];
+    [parameters sdl_setObject:initialText forName:SDLNameInitialText];
 }
 
 - (NSString *)initialText {
-    return [parameters objectForKey:SDLNameInitialText];
+    return [parameters sdl_objectForName:SDLNameInitialText];
 }
 
 - (void)setInitialPrompt:(NSMutableArray<SDLTTSChunk *> *)initialPrompt {
-    [self setObject:initialPrompt forName:SDLNameInitialPrompt];
+    [parameters sdl_setObject:initialPrompt forName:SDLNameInitialPrompt];
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)initialPrompt {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameInitialPrompt];
+    NSMutableArray<SDLTTSChunk *> *array = [parameters sdl_objectForName:SDLNameInitialPrompt];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
@@ -96,28 +96,28 @@ static UInt16 const SDLDefaultTimeout = 10000;
 }
 
 - (void)setInteractionMode:(SDLInteractionMode)interactionMode {
-    [self setObject:interactionMode forName:SDLNameInteractionMode];
+    [parameters sdl_setObject:interactionMode forName:SDLNameInteractionMode];
 }
 
 - (SDLInteractionMode)interactionMode {
-    NSObject *obj = [parameters objectForKey:SDLNameInteractionMode];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameInteractionMode];
     return (SDLInteractionMode)obj;
 }
 
 - (void)setInteractionChoiceSetIDList:(NSMutableArray<NSNumber<SDLInt> *> *)interactionChoiceSetIDList {
-    [self setObject:interactionChoiceSetIDList forName:SDLNameInteractionChoiceSetIdList];
+    [parameters sdl_setObject:interactionChoiceSetIDList forName:SDLNameInteractionChoiceSetIdList];
 }
 
 - (NSMutableArray<NSNumber<SDLInt> *> *)interactionChoiceSetIDList {
-    return [parameters objectForKey:SDLNameInteractionChoiceSetIdList];
+    return [parameters sdl_objectForName:SDLNameInteractionChoiceSetIdList];
 }
 
 - (void)setHelpPrompt:(NSMutableArray<SDLTTSChunk *> *)helpPrompt {
-    [self setObject:helpPrompt forName:SDLNameHelpPrompt];
+    [parameters sdl_setObject:helpPrompt forName:SDLNameHelpPrompt];
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)helpPrompt {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameHelpPrompt];
+    NSMutableArray<SDLTTSChunk *> *array = [parameters sdl_objectForName:SDLNameHelpPrompt];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
@@ -130,11 +130,11 @@ static UInt16 const SDLDefaultTimeout = 10000;
 }
 
 - (void)setTimeoutPrompt:(NSMutableArray<SDLTTSChunk *> *)timeoutPrompt {
-    [self setObject:timeoutPrompt forName:SDLNameTimeoutPrompt];
+    [parameters sdl_setObject:timeoutPrompt forName:SDLNameTimeoutPrompt];
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)timeoutPrompt {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameTimeoutPrompt];
+    NSMutableArray<SDLTTSChunk *> *array = [parameters sdl_objectForName:SDLNameTimeoutPrompt];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
@@ -147,19 +147,19 @@ static UInt16 const SDLDefaultTimeout = 10000;
 }
 
 - (void)setTimeout:(NSNumber<SDLInt> *)timeout {
-    [self setObject:timeout forName:SDLNameTimeout];
+    [parameters sdl_setObject:timeout forName:SDLNameTimeout];
 }
 
 - (NSNumber<SDLInt> *)timeout {
-    return [parameters objectForKey:SDLNameTimeout];
+    return [parameters sdl_objectForName:SDLNameTimeout];
 }
 
 - (void)setVrHelp:(NSMutableArray<SDLVRHelpItem *> *)vrHelp {
-    [self setObject:vrHelp forName:SDLNameVRHelp];
+    [parameters sdl_setObject:vrHelp forName:SDLNameVRHelp];
 }
 
 - (NSMutableArray<SDLVRHelpItem *> *)vrHelp {
-    NSMutableArray<SDLVRHelpItem *> *array = [parameters objectForKey:SDLNameVRHelp];
+    NSMutableArray<SDLVRHelpItem *> *array = [parameters sdl_objectForName:SDLNameVRHelp];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVRHelpItem.class]) {
         return array;
     } else {
@@ -172,11 +172,11 @@ static UInt16 const SDLDefaultTimeout = 10000;
 }
 
 - (void)setInteractionLayout:(SDLLayoutMode)interactionLayout {
-    [self setObject:interactionLayout forName:SDLNameInteractionLayout];
+    [parameters sdl_setObject:interactionLayout forName:SDLNameInteractionLayout];
 }
 
 - (SDLLayoutMode)interactionLayout {
-    NSObject *obj = [parameters objectForKey:SDLNameInteractionLayout];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameInteractionLayout];
     return (SDLLayoutMode)obj;
 }
 
diff --git a/SmartDeviceLink/SDLPerformInteractionResponse.m b/SmartDeviceLink/SDLPerformInteractionResponse.m
index 68ed46b80..be89639a6 100644
--- a/SmartDeviceLink/SDLPerformInteractionResponse.m
+++ b/SmartDeviceLink/SDLPerformInteractionResponse.m
@@ -15,7 +15,7 @@
 }
 
 - (void)setChoiceID:(NSNumber<SDLInt> *)choiceID {
-    [self setObject:choiceID forName:SDLNameChoiceId];
+    [parameters sdl_setObject:choiceID forName:SDLNameChoiceId];
 }
 
 - (NSNumber<SDLInt> *)choiceID {
@@ -23,7 +23,7 @@
 }
 
 - (void)setManualTextEntry:(NSString *)manualTextEntry {
-    [self setObject:manualTextEntry forName:SDLNameManualTextEntry];
+    [parameters sdl_setObject:manualTextEntry forName:SDLNameManualTextEntry];
 }
 
 - (NSString *)manualTextEntry {
@@ -31,7 +31,7 @@
 }
 
 - (void)setTriggerSource:(SDLTriggerSource)triggerSource {
-    [self setObject:triggerSource forName:SDLNameTriggerSource];
+    [parameters sdl_setObject:triggerSource forName:SDLNameTriggerSource];
 }
 
 - (SDLTriggerSource)triggerSource {
diff --git a/SmartDeviceLink/SDLPermissionItem.m b/SmartDeviceLink/SDLPermissionItem.m
index 3cf61e3b7..14a340ab7 100644
--- a/SmartDeviceLink/SDLPermissionItem.m
+++ b/SmartDeviceLink/SDLPermissionItem.m
@@ -10,15 +10,15 @@
 @implementation SDLPermissionItem
 
 - (void)setRpcName:(NSString *)rpcName {
-    [self setObject:rpcName forName:SDLNameRPCName];
+    [store sdl_setObject:rpcName forName:SDLNameRPCName];
 }
 
 - (NSString *)rpcName {
-    return [self objectForName:SDLNameRPCName];
+    return [store sdl_objectForName:SDLNameRPCName];
 }
 
 - (void)setHmiPermissions:(SDLHMIPermissions *)hmiPermissions {
-    [self setObject:hmiPermissions forName:SDLNameHMIPermissions];
+    [store sdl_setObject:hmiPermissions forName:SDLNameHMIPermissions];
 }
 
 - (SDLHMIPermissions *)hmiPermissions {
@@ -31,7 +31,7 @@
 }
 
 - (void)setParameterPermissions:(SDLParameterPermissions *)parameterPermissions {
-    [self setObject:parameterPermissions forName:SDLNameParameterPermissions];
+    [store sdl_setObject:parameterPermissions forName:SDLNameParameterPermissions];
 }
 
 - (SDLParameterPermissions *)parameterPermissions {
diff --git a/SmartDeviceLink/SDLPresetBankCapabilities.m b/SmartDeviceLink/SDLPresetBankCapabilities.m
index f20936fa1..fb83854df 100644
--- a/SmartDeviceLink/SDLPresetBankCapabilities.m
+++ b/SmartDeviceLink/SDLPresetBankCapabilities.m
@@ -9,11 +9,11 @@
 @implementation SDLPresetBankCapabilities
 
 - (void)setOnScreenPresetsAvailable:(NSNumber<SDLBool> *)onScreenPresetsAvailable {
-    [self setObject:onScreenPresetsAvailable forName:SDLNameOnScreenPresetsAvailable];
+    [store sdl_setObject:onScreenPresetsAvailable forName:SDLNameOnScreenPresetsAvailable];
 }
 
 - (NSNumber<SDLBool> *)onScreenPresetsAvailable {
-    return [self objectForName:SDLNameOnScreenPresetsAvailable];
+    return [store sdl_objectForName:SDLNameOnScreenPresetsAvailable];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLPutFile.m b/SmartDeviceLink/SDLPutFile.m
index a32598328..7878bc17c 100644
--- a/SmartDeviceLink/SDLPutFile.m
+++ b/SmartDeviceLink/SDLPutFile.m
@@ -50,52 +50,52 @@
 }
 
 - (void)setSyncFileName:(NSString *)syncFileName {
-    [self setObject:syncFileName forName:SDLNameSyncFileName];
+    [parameters sdl_setObject:syncFileName forName:SDLNameSyncFileName];
 }
 
 - (NSString *)syncFileName {
-    return [parameters objectForKey:SDLNameSyncFileName];
+    return [parameters sdl_objectForName:SDLNameSyncFileName];
 }
 
 - (void)setFileType:(SDLFileType)fileType {
-    [self setObject:fileType forName:SDLNameFileType];
+    [parameters sdl_setObject:fileType forName:SDLNameFileType];
 }
 
 - (SDLFileType)fileType {
-    NSObject *obj = [parameters objectForKey:SDLNameFileType];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameFileType];
     return (SDLFileType)obj;
 }
 
 - (void)setPersistentFile:(NSNumber<SDLBool> *)persistentFile {
-    [self setObject:persistentFile forName:SDLNamePersistentFile];
+    [parameters sdl_setObject:persistentFile forName:SDLNamePersistentFile];
 }
 
 - (NSNumber<SDLBool> *)persistentFile {
-    return [parameters objectForKey:SDLNamePersistentFile];
+    return [parameters sdl_objectForName:SDLNamePersistentFile];
 }
 
 - (void)setSystemFile:(NSNumber<SDLBool> *)systemFile {
-    [self setObject:systemFile forName:SDLNameSystemFile];
+    [parameters sdl_setObject:systemFile forName:SDLNameSystemFile];
 }
 
 - (NSNumber<SDLBool> *)systemFile {
-    return [parameters objectForKey:SDLNameSystemFile];
+    return [parameters sdl_objectForName:SDLNameSystemFile];
 }
 
 - (void)setOffset:(NSNumber<SDLUInt> *)offset {
-    [self setObject:offset forName:SDLNameOffset];
+    [parameters sdl_setObject:offset forName:SDLNameOffset];
 }
 
 - (NSNumber<SDLUInt> *)offset {
-    return [parameters objectForKey:SDLNameOffset];
+    return [parameters sdl_objectForName:SDLNameOffset];
 }
 
 - (void)setLength:(NSNumber<SDLUInt> *)length {
-    [self setObject:length forName:SDLNameLength];
+    [parameters sdl_setObject:length forName:SDLNameLength];
 }
 
 - (NSNumber<SDLUInt> *)length {
-    return [parameters objectForKey:SDLNameLength];
+    return [parameters sdl_objectForName:SDLNameLength];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLPutFileResponse.m b/SmartDeviceLink/SDLPutFileResponse.m
index 07f3b842b..4cb8c893b 100644
--- a/SmartDeviceLink/SDLPutFileResponse.m
+++ b/SmartDeviceLink/SDLPutFileResponse.m
@@ -15,7 +15,7 @@
 }
 
 - (void)setSpaceAvailable:(NSNumber<SDLInt> *)spaceAvailable {
-    [self setObject:spaceAvailable forName:SDLNameSpaceAvailable];
+    [parameters sdl_setObject:spaceAvailable forName:SDLNameSpaceAvailable];
 }
 
 - (NSNumber<SDLInt> *)spaceAvailable {
diff --git a/SmartDeviceLink/SDLRPCMessage.m b/SmartDeviceLink/SDLRPCMessage.m
index 864e39d1a..04a03dabb 100644
--- a/SmartDeviceLink/SDLRPCMessage.m
+++ b/SmartDeviceLink/SDLRPCMessage.m
@@ -31,8 +31,8 @@
             }
         }
         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];
     }
@@ -41,19 +41,19 @@
 }
 
 - (NSString *)getFunctionName {
-    return [self objectForName:SDLNameOperationName fromStorage:function];
+    return [function sdl_objectForName:SDLNameOperationName];
 }
 
 - (void)setFunctionName:(NSString *)functionName {
-    [self setObject:functionName forName:SDLNameOperationName inStorage:function];
+    [function sdl_setObject:functionName forName:SDLNameOperationName];
 }
 
 - (NSObject *)getParameters:(NSString *)functionName {
-    return [self objectForName:functionName];
+    return [parameters sdl_objectForName:functionName];
 }
 
 - (void)setParameters:(NSString *)functionName value:(NSObject *)value {
-    [self setObject:value forName:functionName];
+    [parameters sdl_setObject:value forName:functionName];
 }
 
 - (void)dealloc {
@@ -71,13 +71,4 @@
     return description;
 }
 
-#pragma mark - Overrides
-- (void)setObject:(NSObject *)object forName:(SDLName)name {
-    [self setObject:object forName:name inStorage:parameters];
-}
-
-- (id)objectForName:(SDLName)name {
-    return [self objectForName:name fromStorage:parameters];
-}
-
 @end
diff --git a/SmartDeviceLink/SDLRPCRequest.m b/SmartDeviceLink/SDLRPCRequest.m
index d0384af48..a2112f28f 100644
--- a/SmartDeviceLink/SDLRPCRequest.m
+++ b/SmartDeviceLink/SDLRPCRequest.m
@@ -9,11 +9,11 @@
 @implementation SDLRPCRequest
 
 - (NSNumber<SDLInt> *)correlationID {
-    return [self objectForName:SDLNameCorrelationId fromStorage:function];
+    return [function sdl_objectForName:SDLNameCorrelationId];
 }
 
 - (void)setCorrelationID:(NSNumber<SDLInt> *)corrID {
-    [self setObject:corrID forName:SDLNameCorrelationId inStorage:function];
+    [function sdl_setObject:corrID forName:SDLNameCorrelationId];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLRPCResponse.m b/SmartDeviceLink/SDLRPCResponse.m
index 24cdcbb85..0ac47d95c 100644
--- a/SmartDeviceLink/SDLRPCResponse.m
+++ b/SmartDeviceLink/SDLRPCResponse.m
@@ -16,7 +16,7 @@
     }
 
     messageType = SDLNameResponse;
-    [self setObject:function forName:messageType inStorage:store];
+    [store sdl_setObject:function forName:messageType];
 
     return self;
 }
@@ -28,41 +28,41 @@
     }
 
     messageType = SDLNameResponse;
-    [self setObject:function forName:messageType inStorage:store];
+    [store sdl_setObject:function forName:messageType];
     
     return self;
 }
 
 - (NSNumber<SDLInt> *)correlationID {
-    return [self objectForName:SDLNameCorrelationId fromStorage:function];
+    return [function sdl_objectForName:SDLNameCorrelationId];
 }
 
 - (void)setCorrelationID:(NSNumber<SDLInt> *)corrID {
-    [self setObject:corrID forName:SDLNameCorrelationId inStorage:function];
+    [function sdl_setObject:corrID forName:SDLNameCorrelationId];
 }
 
 - (void)setSuccess:(NSNumber<SDLBool> *)success {
-    [self setObject:success forName:SDLNameSuccess];
+    [store sdl_setObject:success forName:SDLNameSuccess];
 }
 
 - (NSNumber<SDLBool> *)success {
-    return [self objectForName:SDLNameSuccess];
+    return [store sdl_objectForName:SDLNameSuccess];
 }
 
 - (void)setResultCode:(SDLResult)resultCode {
-    [self setObject:resultCode forName:SDLNameResultCode];
+    [store sdl_setObject:resultCode forName:SDLNameResultCode];
 }
 
 - (SDLResult)resultCode {
-    return [self objectForName:SDLNameResultCode];
+    return [store sdl_objectForName:SDLNameResultCode];
 }
 
 - (void)setInfo:(NSString *)info {
-    [self setObject:info forName:SDLNameInfo];
+    [store sdl_setObject:info forName:SDLNameInfo];
 }
 
 - (NSString *)info {
-    return [self objectForName:SDLNameInfo];
+    return [store sdl_objectForName:SDLNameInfo];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLRPCStruct.h b/SmartDeviceLink/SDLRPCStruct.h
index e38efa678..d56b28800 100644
--- a/SmartDeviceLink/SDLRPCStruct.h
+++ b/SmartDeviceLink/SDLRPCStruct.h
@@ -6,8 +6,7 @@
 
 #import "NSNumber+NumberType.h"
 
-// This is so we don't have to expose this to the project. (could also make the functions below an internal protocol).
-typedef NSString* SDLName;
+#import "NSMutableDictionary+Store.h"
 
 @interface SDLRPCStruct : NSObject {
     NSMutableDictionary<NSString *, id> *store;
@@ -18,11 +17,4 @@ typedef NSString* SDLName;
 
 - (NSDictionary<NSString *, id> *)serializeAsDictionary:(Byte)version;
 
-- (void)setObject:(NSObject*)object forName:(SDLName)name inStorage:(NSMutableDictionary*)storage;
-- (void)setObject:(NSObject *)object forName:(SDLName)name;
-- (id)objectForName:(SDLName)name fromStorage:(NSMutableDictionary*)storage;
-- (id)objectForName:(SDLName)name;
-- (id)objectForName:(SDLName)name ofClass:(Class)classType;
-- (NSMutableArray *)objectsForName:(SDLName)name ofClass:(Class)classType;
-
 @end
diff --git a/SmartDeviceLink/SDLRPCStruct.m b/SmartDeviceLink/SDLRPCStruct.m
index 44b13c183..d0be4bffb 100644
--- a/SmartDeviceLink/SDLRPCStruct.m
+++ b/SmartDeviceLink/SDLRPCStruct.m
@@ -27,48 +27,6 @@
     return self;
 }
 
-- (void)setObject:(NSObject *)object forName:(SDLName)name {
-    [self setObject:object forName:name inStorage:store];
-}
-
-- (void)setObject:(NSObject*)object forName:(SDLName)name inStorage:(NSMutableDictionary*)storage {
-    if (object != nil) {
-        storage[name] = object;
-    } else {
-        [storage removeObjectForKey:name];
-    }
-}
-
-- (id)objectForName:(SDLName)name {
-    return [self objectForName:name fromStorage:store];
-}
-
-- (id)objectForName:(SDLName)name ofClass:(Class)classType {
-    NSObject *obj = [self objectForName:name];
-    if (obj == nil || [obj isKindOfClass:classType.class]) {
-        return obj;
-    } else {
-        return [[classType alloc] initWithDictionary:(NSDictionary *)obj];
-    }
-}
-
-- (id)objectForName:(SDLName)name fromStorage:(NSMutableDictionary *)storage {
-    return storage[name];
-}
-
-- (NSMutableArray *)objectsForName:(SDLName)name ofClass:(Class)classType {
-    NSMutableArray *array = [self 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;
-    }
-}
-
 - (NSDictionary<NSString *, id> *)serializeAsDictionary:(Byte)version {
     if (version >= 2) {
         NSString *messageType = [[store keyEnumerator] nextObject];
diff --git a/SmartDeviceLink/SDLReadDID.m b/SmartDeviceLink/SDLReadDID.m
index 8fa3fdb5e..9cfd12ced 100644
--- a/SmartDeviceLink/SDLReadDID.m
+++ b/SmartDeviceLink/SDLReadDID.m
@@ -27,19 +27,19 @@
 }
 
 - (void)setEcuName:(NSNumber<SDLInt> *)ecuName {
-    [self setObject:ecuName forName: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 {
-    [self setObject:didLocation forName: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 ecd50bf47..6f878307f 100644
--- a/SmartDeviceLink/SDLReadDIDResponse.m
+++ b/SmartDeviceLink/SDLReadDIDResponse.m
@@ -16,7 +16,7 @@
 }
 
 - (void)setDidResult:(NSMutableArray<SDLDIDResult *> *)didResult {
-    [self setObject:didResult forName:SDLNameDIDResult];
+    [parameters sdl_setObject:didResult forName:SDLNameDIDResult];
 }
 
 - (NSMutableArray<SDLDIDResult *> *)didResult {
diff --git a/SmartDeviceLink/SDLRegisterAppInterface.m b/SmartDeviceLink/SDLRegisterAppInterface.m
index 8bf32cf01..7bfe79e58 100644
--- a/SmartDeviceLink/SDLRegisterAppInterface.m
+++ b/SmartDeviceLink/SDLRegisterAppInterface.m
@@ -63,11 +63,11 @@
 }
 
 - (void)setSyncMsgVersion:(SDLSyncMsgVersion *)syncMsgVersion {
-    [self setObject:syncMsgVersion forName:SDLNameSyncMessageVersion];
+    [parameters sdl_setObject:syncMsgVersion forName:SDLNameSyncMessageVersion];
 }
 
 - (SDLSyncMsgVersion *)syncMsgVersion {
-    NSObject *obj = [parameters objectForKey:SDLNameSyncMessageVersion];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameSyncMessageVersion];
     if (obj == nil || [obj isKindOfClass:SDLSyncMsgVersion.class]) {
         return (SDLSyncMsgVersion *)obj;
     } else {
@@ -76,19 +76,19 @@
 }
 
 - (void)setAppName:(NSString *)appName {
-    [self setObject:appName forName:SDLNameAppName];
+    [parameters sdl_setObject:appName forName:SDLNameAppName];
 }
 
 - (NSString *)appName {
-    return [parameters objectForKey:SDLNameAppName];
+    return [parameters sdl_objectForName:SDLNameAppName];
 }
 
 - (void)setTtsName:(NSMutableArray<SDLTTSChunk *> *)ttsName {
-    [self setObject:ttsName forName:SDLNameTTSName];
+    [parameters sdl_setObject:ttsName forName:SDLNameTTSName];
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)ttsName {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameTTSName];
+    NSMutableArray<SDLTTSChunk *> *array = [parameters sdl_objectForName:SDLNameTTSName];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
@@ -101,53 +101,53 @@
 }
 
 - (void)setNgnMediaScreenAppName:(NSString *)ngnMediaScreenAppName {
-    [self setObject:ngnMediaScreenAppName forName:SDLNameNGNMediaScreenAppName];
+    [parameters sdl_setObject:ngnMediaScreenAppName forName:SDLNameNGNMediaScreenAppName];
 }
 
 - (NSString *)ngnMediaScreenAppName {
-    return [parameters objectForKey:SDLNameNGNMediaScreenAppName];
+    return [parameters sdl_objectForName:SDLNameNGNMediaScreenAppName];
 }
 
 - (void)setVrSynonyms:(NSMutableArray<NSString *> *)vrSynonyms {
-    [self setObject:vrSynonyms forName:SDLNameVRSynonyms];
+    [parameters sdl_setObject:vrSynonyms forName:SDLNameVRSynonyms];
 }
 
 - (NSMutableArray<NSString *> *)vrSynonyms {
-    return [parameters objectForKey:SDLNameVRSynonyms];
+    return [parameters sdl_objectForName:SDLNameVRSynonyms];
 }
 
 - (void)setIsMediaApplication:(NSNumber<SDLBool> *)isMediaApplication {
-    [self setObject:isMediaApplication forName:SDLNameIsMediaApplication];
+    [parameters sdl_setObject:isMediaApplication forName:SDLNameIsMediaApplication];
 }
 
 - (NSNumber<SDLBool> *)isMediaApplication {
-    return [parameters objectForKey:SDLNameIsMediaApplication];
+    return [parameters sdl_objectForName:SDLNameIsMediaApplication];
 }
 
 - (void)setLanguageDesired:(SDLLanguage)languageDesired {
-    [self setObject:languageDesired forName:SDLNameLanguageDesired];
+    [parameters sdl_setObject:languageDesired forName:SDLNameLanguageDesired];
 }
 
 - (SDLLanguage)languageDesired {
-    NSObject *obj = [parameters objectForKey:SDLNameLanguageDesired];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameLanguageDesired];
     return (SDLLanguage)obj;
 }
 
 - (void)setHmiDisplayLanguageDesired:(SDLLanguage)hmiDisplayLanguageDesired {
-    [self setObject:hmiDisplayLanguageDesired forName:SDLNameHMIDisplayLanguageDesired];
+    [parameters sdl_setObject:hmiDisplayLanguageDesired forName:SDLNameHMIDisplayLanguageDesired];
 }
 
 - (SDLLanguage)hmiDisplayLanguageDesired {
-    NSObject *obj = [parameters objectForKey:SDLNameHMIDisplayLanguageDesired];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameHMIDisplayLanguageDesired];
     return (SDLLanguage)obj;
 }
 
 - (void)setAppHMIType:(NSMutableArray<SDLAppHMIType> *)appHMIType {
-    [self setObject:appHMIType forName:SDLNameAppHMIType];
+    [parameters sdl_setObject:appHMIType forName:SDLNameAppHMIType];
 }
 
 - (NSMutableArray<SDLAppHMIType> *)appHMIType {
-    NSMutableArray<SDLAppHMIType> *array = [parameters objectForKey:SDLNameAppHMIType];
+    NSMutableArray<SDLAppHMIType> *array = [parameters sdl_objectForName:SDLNameAppHMIType];
     if ([array count] < 1) {
         return array;
     } else {
@@ -160,19 +160,19 @@
 }
 
 - (void)setHashID:(NSString *)hashID {
-    [self setObject:hashID forName:SDLNameHashId];
+    [parameters sdl_setObject:hashID forName:SDLNameHashId];
 }
 
 - (NSString *)hashID {
-    return [parameters objectForKey:SDLNameHashId];
+    return [parameters sdl_objectForName:SDLNameHashId];
 }
 
 - (void)setDeviceInfo:(SDLDeviceInfo *)deviceInfo {
-    [self setObject:deviceInfo forName:SDLNameDeviceInfo];
+    [parameters sdl_setObject:deviceInfo forName:SDLNameDeviceInfo];
 }
 
 - (SDLDeviceInfo *)deviceInfo {
-    NSObject *obj = [parameters objectForKey:SDLNameDeviceInfo];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameDeviceInfo];
     if (obj == nil || [obj isKindOfClass:SDLDeviceInfo.class]) {
         return (SDLDeviceInfo *)obj;
     } else {
@@ -181,19 +181,19 @@
 }
 
 - (void)setAppID:(NSString *)appID {
-    [self setObject:appID forName:SDLNameAppId];
+    [parameters sdl_setObject:appID forName:SDLNameAppId];
 }
 
 - (NSString *)appID {
-    return [parameters objectForKey:SDLNameAppId];
+    return [parameters sdl_objectForName:SDLNameAppId];
 }
 
 - (void)setAppInfo:(SDLAppInfo *)appInfo {
-    [self setObject:appInfo forName:SDLNameAppInfo];
+    [parameters sdl_setObject:appInfo forName:SDLNameAppInfo];
 }
 
 - (SDLAppInfo *)appInfo {
-    NSObject *obj = [parameters objectForKey:SDLNameAppInfo];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameAppInfo];
     if (obj == nil || [obj isKindOfClass:SDLAppInfo.class]) {
         return (SDLAppInfo *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
index efa23a234..a85bd0d07 100644
--- a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
+++ b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
@@ -23,139 +23,139 @@
 }
 
 - (void)setSyncMsgVersion:(SDLSyncMsgVersion *)syncMsgVersion {
-    [self setObject:syncMsgVersion forName:SDLNameSyncMessageVersion];
+    [parameters sdl_setObject:syncMsgVersion forName:SDLNameSyncMessageVersion];
 }
 
 - (SDLSyncMsgVersion *)syncMsgVersion {
-    return [self objectForName:SDLNameSyncMessageVersion ofClass:SDLSyncMsgVersion.class];
+    return [parameters sdl_objectForName:SDLNameSyncMessageVersion ofClass:SDLSyncMsgVersion.class];
 }
 
 - (void)setLanguage:(SDLLanguage)language {
-    [self setObject:language forName:SDLNameLanguage];
+    [parameters sdl_setObject:language forName:SDLNameLanguage];
 }
 
 - (SDLLanguage)language {
-    return [self objectForName:SDLNameLanguage];
+    return [parameters sdl_objectForName:SDLNameLanguage];
 }
 
 - (void)setHmiDisplayLanguage:(SDLLanguage)hmiDisplayLanguage {
-    [self setObject:hmiDisplayLanguage forName:SDLNameHMIDisplayLanguage];
+    [parameters sdl_setObject:hmiDisplayLanguage forName:SDLNameHMIDisplayLanguage];
 }
 
 - (SDLLanguage)hmiDisplayLanguage {
-    return [self objectForName:SDLNameHMIDisplayLanguage];
+    return [parameters sdl_objectForName:SDLNameHMIDisplayLanguage];
 }
 
 - (void)setDisplayCapabilities:(SDLDisplayCapabilities *)displayCapabilities {
-    [self setObject:displayCapabilities forName:SDLNameDisplayCapabilities];
+    [parameters sdl_setObject:displayCapabilities forName:SDLNameDisplayCapabilities];
 }
 
 - (SDLDisplayCapabilities *)displayCapabilities {
-    return [self objectForName:SDLNameDisplayCapabilities ofClass:SDLDisplayCapabilities.class];
+    return [parameters sdl_objectForName:SDLNameDisplayCapabilities ofClass:SDLDisplayCapabilities.class];
 }
 
 - (void)setButtonCapabilities:(NSMutableArray<SDLButtonCapabilities *> *)buttonCapabilities {
-    [self setObject:buttonCapabilities forName:SDLNameButtonCapabilities];
+    [parameters sdl_setObject:buttonCapabilities forName:SDLNameButtonCapabilities];
 }
 
 - (NSMutableArray<SDLButtonCapabilities *> *)buttonCapabilities {
-    return [self objectsForName:SDLNameButtonCapabilities ofClass:SDLButtonCapabilities.class];
+    return [parameters sdl_objectsForName:SDLNameButtonCapabilities ofClass:SDLButtonCapabilities.class];
 }
 
 - (void)setSoftButtonCapabilities:(NSMutableArray<SDLSoftButtonCapabilities *> *)softButtonCapabilities {
-    [self setObject:softButtonCapabilities forName:SDLNameSoftButtonCapabilities];
+    [parameters sdl_setObject:softButtonCapabilities forName:SDLNameSoftButtonCapabilities];
 }
 
 - (NSMutableArray<SDLSoftButtonCapabilities *> *)softButtonCapabilities {
-    return [self objectsForName:SDLNameSoftButtonCapabilities ofClass:SDLSoftButtonCapabilities.class];
+    return [parameters sdl_objectsForName:SDLNameSoftButtonCapabilities ofClass:SDLSoftButtonCapabilities.class];
 }
 
 - (void)setPresetBankCapabilities:(SDLPresetBankCapabilities *)presetBankCapabilities {
-    [self setObject:presetBankCapabilities forName:SDLNamePresetBankCapabilities];
+    [parameters sdl_setObject:presetBankCapabilities forName:SDLNamePresetBankCapabilities];
 }
 
 - (SDLPresetBankCapabilities *)presetBankCapabilities {
-    return [self objectForName:SDLNamePresetBankCapabilities ofClass:SDLPresetBankCapabilities.class];
+    return [parameters sdl_objectForName:SDLNamePresetBankCapabilities ofClass:SDLPresetBankCapabilities.class];
 }
 
 - (void)setHmiZoneCapabilities:(NSMutableArray<SDLHMIZoneCapabilities> *)hmiZoneCapabilities {
-    [self setObject:hmiZoneCapabilities forName:SDLNameHMIZoneCapabilities];
+    [parameters sdl_setObject:hmiZoneCapabilities forName:SDLNameHMIZoneCapabilities];
 }
 
 - (NSMutableArray<SDLHMIZoneCapabilities> *)hmiZoneCapabilities {
-    return [self objectForName:SDLNameHMIZoneCapabilities];
+    return [parameters sdl_objectForName:SDLNameHMIZoneCapabilities];
 }
 
 - (void)setSpeechCapabilities:(NSMutableArray<SDLSpeechCapabilities> *)speechCapabilities {
-    [self setObject:speechCapabilities forName:SDLNameSpeechCapabilities];
+    [parameters sdl_setObject:speechCapabilities forName:SDLNameSpeechCapabilities];
 }
 
 - (NSMutableArray<SDLSpeechCapabilities> *)speechCapabilities {
-    return [self objectForName:SDLNameSpeechCapabilities];
+    return [parameters sdl_objectForName:SDLNameSpeechCapabilities];
 }
 
 - (void)setPrerecordedSpeech:(NSMutableArray<SDLPrerecordedSpeech> *)prerecordedSpeech {
-    [self setObject:prerecordedSpeech forName:SDLNamePrerecordedSpeech];
+    [parameters sdl_setObject:prerecordedSpeech forName:SDLNamePrerecordedSpeech];
 }
 
 - (NSMutableArray<SDLPrerecordedSpeech> *)prerecordedSpeech {
-    return [self objectForName:SDLNamePrerecordedSpeech];
+    return [parameters sdl_objectForName:SDLNamePrerecordedSpeech];
 }
 
 - (void)setVrCapabilities:(NSMutableArray<SDLVRCapabilities> *)vrCapabilities {
-    [self setObject:vrCapabilities forName:SDLNameVRCapabilities];
+    [parameters sdl_setObject:vrCapabilities forName:SDLNameVRCapabilities];
 }
 
 - (NSMutableArray<SDLVRCapabilities> *)vrCapabilities {
-    return [self objectForName:SDLNameVRCapabilities];
+    return [parameters sdl_objectForName:SDLNameVRCapabilities];
 }
 
 - (void)setAudioPassThruCapabilities:(NSMutableArray<SDLAudioPassThruCapabilities *> *)audioPassThruCapabilities {
-    [self setObject:audioPassThruCapabilities forName:SDLNameAudioPassThruCapabilities];
+    [parameters sdl_setObject:audioPassThruCapabilities forName:SDLNameAudioPassThruCapabilities];
 }
 
 - (NSMutableArray<SDLAudioPassThruCapabilities *> *)audioPassThruCapabilities {
-    return [self objectsForName:SDLNameAudioPassThruCapabilities ofClass:SDLAudioPassThruCapabilities.class];
+    return [parameters sdl_objectsForName:SDLNameAudioPassThruCapabilities ofClass:SDLAudioPassThruCapabilities.class];
 }
 
 - (void)setVehicleType:(SDLVehicleType *)vehicleType {
-    [self setObject:vehicleType forName:SDLNameVehicleType];
+    [parameters sdl_setObject:vehicleType forName:SDLNameVehicleType];
 }
 
 - (SDLVehicleType *)vehicleType {
-    return [self objectForName:SDLNameVehicleType ofClass:SDLVehicleType.class];
+    return [parameters sdl_objectForName:SDLNameVehicleType ofClass:SDLVehicleType.class];
 }
 
 - (void)setSupportedDiagModes:(NSMutableArray<NSNumber<SDLInt> *> *)supportedDiagModes {
-    [self setObject:supportedDiagModes forName:SDLNameSupportedDiagnosticModes];
+    [parameters sdl_setObject:supportedDiagModes forName:SDLNameSupportedDiagnosticModes];
 }
 
 - (NSMutableArray<NSNumber<SDLInt> *> *)supportedDiagModes {
-    return [self objectForName:SDLNameSupportedDiagnosticModes];
+    return [parameters sdl_objectForName:SDLNameSupportedDiagnosticModes];
 }
 
 - (void)setHmiCapabilities:(SDLHMICapabilities *)hmiCapabilities {
-    [self setObject:hmiCapabilities forName:SDLNameHMICapabilities];
+    [parameters sdl_setObject:hmiCapabilities forName:SDLNameHMICapabilities];
 }
 
 - (SDLHMICapabilities *)hmiCapabilities {
-    return [self objectForName:SDLNameHMICapabilities ofClass:SDLHMICapabilities.class];
+    return [parameters sdl_objectForName:SDLNameHMICapabilities ofClass:SDLHMICapabilities.class];
 }
 
 - (void)setSdlVersion:(NSString *)sdlVersion {
-    [self setObject:sdlVersion forName:SDLNameSDLVersion];
+    [parameters sdl_setObject:sdlVersion forName:SDLNameSDLVersion];
 }
 
 - (NSString *)sdlVersion {
-    return [self objectForName:SDLNameSDLVersion];
+    return [parameters sdl_objectForName:SDLNameSDLVersion];
 }
 
 - (void)setSystemSoftwareVersion:(NSString *)systemSoftwareVersion {
-    [self setObject:systemSoftwareVersion forName:SDLNameSystemSoftwareVersion];
+    [parameters sdl_setObject:systemSoftwareVersion forName:SDLNameSystemSoftwareVersion];
 }
 
 - (NSString *)systemSoftwareVersion {
-    return [self objectForName:SDLNameSystemSoftwareVersion];
+    return [parameters sdl_objectForName:SDLNameSystemSoftwareVersion];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLResetGlobalProperties.m b/SmartDeviceLink/SDLResetGlobalProperties.m
index 2733386b4..791fa9aad 100644
--- a/SmartDeviceLink/SDLResetGlobalProperties.m
+++ b/SmartDeviceLink/SDLResetGlobalProperties.m
@@ -27,11 +27,11 @@
 }
 
 - (void)setProperties:(NSMutableArray<SDLGlobalProperty> *)properties {
-    [self setObject:properties forName:SDLNameProperties];
+    [parameters sdl_setObject:properties forName:SDLNameProperties];
 }
 
 - (NSMutableArray<SDLGlobalProperty> *)properties {
-    NSMutableArray<SDLGlobalProperty> *array = [parameters objectForKey:SDLNameProperties];
+    NSMutableArray<SDLGlobalProperty> *array = [parameters sdl_objectForName:SDLNameProperties];
     if ([array count] < 1) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLScreenParams.m b/SmartDeviceLink/SDLScreenParams.m
index e75014617..4a0efd8cd 100644
--- a/SmartDeviceLink/SDLScreenParams.m
+++ b/SmartDeviceLink/SDLScreenParams.m
@@ -10,7 +10,7 @@
 @implementation SDLScreenParams
 
 - (void)setResolution:(SDLImageResolution *)resolution {
-    [self setObject:resolution forName:SDLNameResolution];
+    [store sdl_setObject:resolution forName:SDLNameResolution];
 }
 
 - (SDLImageResolution *)resolution {
@@ -23,7 +23,7 @@
 }
 
 - (void)setTouchEventAvailable:(SDLTouchEventCapabilities *)touchEventAvailable {
-    [self setObject:touchEventAvailable forName:SDLNameTouchEventAvailable];
+    [store sdl_setObject:touchEventAvailable forName:SDLNameTouchEventAvailable];
 }
 
 - (SDLTouchEventCapabilities *)touchEventAvailable {
diff --git a/SmartDeviceLink/SDLScrollableMessage.m b/SmartDeviceLink/SDLScrollableMessage.m
index 5c687d551..11850b541 100644
--- a/SmartDeviceLink/SDLScrollableMessage.m
+++ b/SmartDeviceLink/SDLScrollableMessage.m
@@ -39,27 +39,27 @@
 }
 
 - (void)setScrollableMessageBody:(NSString *)scrollableMessageBody {
-    [self setObject:scrollableMessageBody forName:SDLNameScrollableMessageBody];
+    [parameters sdl_setObject:scrollableMessageBody forName:SDLNameScrollableMessageBody];
 }
 
 - (NSString *)scrollableMessageBody {
-    return [parameters objectForKey:SDLNameScrollableMessageBody];
+    return [parameters sdl_objectForName:SDLNameScrollableMessageBody];
 }
 
 - (void)setTimeout:(NSNumber<SDLInt> *)timeout {
-    [self setObject:timeout forName:SDLNameTimeout];
+    [parameters sdl_setObject:timeout forName:SDLNameTimeout];
 }
 
 - (NSNumber<SDLInt> *)timeout {
-    return [parameters objectForKey:SDLNameTimeout];
+    return [parameters sdl_objectForName:SDLNameTimeout];
 }
 
 - (void)setSoftButtons:(NSMutableArray<SDLSoftButton *> *)softButtons {
-    [self setObject:softButtons forName:SDLNameSoftButtons];
+    [parameters sdl_setObject:softButtons forName:SDLNameSoftButtons];
 }
 
 - (NSMutableArray<SDLSoftButton *> *)softButtons {
-    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:SDLNameSoftButtons];
+    NSMutableArray<SDLSoftButton *> *array = [parameters sdl_objectForName:SDLNameSoftButtons];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLSendLocation.m b/SmartDeviceLink/SDLSendLocation.m
index fa0a0f895..693fef9eb 100644
--- a/SmartDeviceLink/SDLSendLocation.m
+++ b/SmartDeviceLink/SDLSendLocation.m
@@ -43,83 +43,83 @@
 }
 
 - (void)setLongitudeDegrees:(NSNumber<SDLFloat> *)longitudeDegrees {
-    [self setObject:longitudeDegrees forName:SDLNameLongitudeDegrees];
+    [parameters sdl_setObject:longitudeDegrees forName:SDLNameLongitudeDegrees];
 }
 
 - (NSNumber<SDLFloat> *)longitudeDegrees {
-    return [self objectForName:SDLNameLongitudeDegrees];
+    return [parameters sdl_objectForName:SDLNameLongitudeDegrees];
 }
 
 - (void)setLatitudeDegrees:(NSNumber<SDLFloat> *)latitudeDegrees {
-    [self setObject:latitudeDegrees forName:SDLNameLatitudeDegrees];
+    [parameters sdl_setObject:latitudeDegrees forName:SDLNameLatitudeDegrees];
 }
 
 - (NSNumber<SDLFloat> *)latitudeDegrees {
-    return [self objectForName:SDLNameLatitudeDegrees];
+    return [parameters sdl_objectForName:SDLNameLatitudeDegrees];
 }
 
 - (void)setLocationName:(NSString *)locationName {
-    [self setObject:locationName forName:SDLNameLocationName];
+    [parameters sdl_setObject:locationName forName:SDLNameLocationName];
 }
 
 - (NSString *)locationName {
-    return [self objectForName:SDLNameLocationName];
+    return [parameters sdl_objectForName:SDLNameLocationName];
 }
 
 - (void)setAddressLines:(NSArray<NSString *> *)addressLines {
-    [self setObject:addressLines forName:SDLNameAddressLines];
+    [parameters sdl_setObject:addressLines forName:SDLNameAddressLines];
 }
 
 - (NSString *)locationDescription {
-    return [self objectForName:SDLNameLocationDescription];
+    return [parameters sdl_objectForName:SDLNameLocationDescription];
 }
 
 - (void)setLocationDescription:(NSString *)locationDescription {
-    [self setObject:locationDescription forName:SDLNameLocationDescription];
+    [parameters sdl_setObject:locationDescription forName:SDLNameLocationDescription];
 }
 
 - (NSArray<NSString *> *)addressLines {
-    return [self objectForName:SDLNameAddressLines];
+    return [parameters sdl_objectForName:SDLNameAddressLines];
 }
 
 - (void)setPhoneNumber:(NSString *)phoneNumber {
-    [self setObject:phoneNumber forName:SDLNamePhoneNumber];
+    [parameters sdl_setObject:phoneNumber forName:SDLNamePhoneNumber];
 }
 
 - (NSString *)phoneNumber {
-    return [self objectForName:SDLNamePhoneNumber];
+    return [parameters sdl_objectForName:SDLNamePhoneNumber];
 }
 
 - (void)setLocationImage:(SDLImage *)locationImage {
-    [self setObject:locationImage forName:SDLNameLocationImage];
+    [parameters sdl_setObject:locationImage forName:SDLNameLocationImage];
 }
 
 - (SDLImage *)locationImage {
-    return [self objectForName:SDLNameLocationImage ofClass:SDLImage.class];
+    return [parameters sdl_objectForName:SDLNameLocationImage ofClass:SDLImage.class];
 }
 
 - (void)setDeliveryMode:(SDLDeliveryMode)deliveryMode {
-    [self setObject:deliveryMode forName:SDLNameDeliveryMode];
+    [parameters sdl_setObject:deliveryMode forName:SDLNameDeliveryMode];
 }
 
 - (SDLDeliveryMode)deliveryMode {
-    return [self objectForName:SDLNameDeliveryMode];
+    return [parameters sdl_objectForName:SDLNameDeliveryMode];
 }
 
 - (void)setTimeStamp:(SDLDateTime *)timeStamp {
-    [self setObject:timeStamp forName:SDLNameLocationTimeStamp];
+    [parameters sdl_setObject:timeStamp forName:SDLNameLocationTimeStamp];
 }
 
 - (SDLDateTime *)timeStamp {
-    return [self objectForName:SDLNameLocationTimeStamp ofClass:SDLDateTime.class];
+    return [parameters sdl_objectForName:SDLNameLocationTimeStamp ofClass:SDLDateTime.class];
 }
 
 - (void)setAddress:(SDLOasisAddress *)address {
-    [self setObject:address forName:SDLNameAddress];
+    [parameters sdl_setObject:address forName:SDLNameAddress];
 }
 
 - (SDLOasisAddress *)address {
-    return [self objectForName:SDLNameAddress ofClass:SDLOasisAddress.class];
+    return [parameters sdl_objectForName:SDLNameAddress ofClass:SDLOasisAddress.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSetAppIcon.m b/SmartDeviceLink/SDLSetAppIcon.m
index f71777b23..a2bcbd181 100644
--- a/SmartDeviceLink/SDLSetAppIcon.m
+++ b/SmartDeviceLink/SDLSetAppIcon.m
@@ -26,11 +26,11 @@
 }
 
 - (void)setSyncFileName:(NSString *)syncFileName {
-    [self setObject:syncFileName forName:SDLNameSyncFileName];
+    [parameters sdl_setObject:syncFileName forName:SDLNameSyncFileName];
 }
 
 - (NSString *)syncFileName {
-    return [parameters objectForKey:SDLNameSyncFileName];
+    return [parameters sdl_objectForName:SDLNameSyncFileName];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSetDisplayLayout.m b/SmartDeviceLink/SDLSetDisplayLayout.m
index f702c7fbf..9e1950015 100644
--- a/SmartDeviceLink/SDLSetDisplayLayout.m
+++ b/SmartDeviceLink/SDLSetDisplayLayout.m
@@ -30,11 +30,11 @@
 }
 
 - (void)setDisplayLayout:(NSString *)displayLayout {
-    [self setObject:displayLayout forName: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 743c2682c..20fcd68cb 100644
--- a/SmartDeviceLink/SDLSetDisplayLayoutResponse.m
+++ b/SmartDeviceLink/SDLSetDisplayLayoutResponse.m
@@ -19,7 +19,7 @@
 }
 
 - (void)setDisplayCapabilities:(SDLDisplayCapabilities *)displayCapabilities {
-    [self setObject:displayCapabilities forName:SDLNameDisplayCapabilities];
+    [parameters sdl_setObject:displayCapabilities forName:SDLNameDisplayCapabilities];
 }
 
 - (SDLDisplayCapabilities *)displayCapabilities {
@@ -32,7 +32,7 @@
 }
 
 - (void)setButtonCapabilities:(NSMutableArray<SDLButtonCapabilities *> *)buttonCapabilities {
-    [self setObject:buttonCapabilities forName:SDLNameButtonCapabilities];
+    [parameters sdl_setObject:buttonCapabilities forName:SDLNameButtonCapabilities];
 }
 
 - (NSMutableArray<SDLButtonCapabilities *> *)buttonCapabilities {
@@ -49,7 +49,7 @@
 }
 
 - (void)setSoftButtonCapabilities:(NSMutableArray<SDLSoftButtonCapabilities *> *)softButtonCapabilities {
-    [self setObject:softButtonCapabilities forName:SDLNameSoftButtonCapabilities];
+    [parameters sdl_setObject:softButtonCapabilities forName:SDLNameSoftButtonCapabilities];
 }
 
 - (NSMutableArray<SDLSoftButtonCapabilities *> *)softButtonCapabilities {
@@ -66,7 +66,7 @@
 }
 
 - (void)setPresetBankCapabilities:(SDLPresetBankCapabilities *)presetBankCapabilities {
-    [self setObject:presetBankCapabilities forName:SDLNamePresetBankCapabilities];
+    [parameters sdl_setObject:presetBankCapabilities forName:SDLNamePresetBankCapabilities];
 }
 
 - (SDLPresetBankCapabilities *)presetBankCapabilities {
diff --git a/SmartDeviceLink/SDLSetGlobalProperties.m b/SmartDeviceLink/SDLSetGlobalProperties.m
index cd5407807..b7fffc586 100644
--- a/SmartDeviceLink/SDLSetGlobalProperties.m
+++ b/SmartDeviceLink/SDLSetGlobalProperties.m
@@ -46,11 +46,11 @@
 
 
 - (void)setHelpPrompt:(NSMutableArray<SDLTTSChunk *> *)helpPrompt {
-    [self setObject:helpPrompt forName:SDLNameHelpPrompt];
+    [parameters sdl_setObject:helpPrompt forName:SDLNameHelpPrompt];
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)helpPrompt {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameHelpPrompt];
+    NSMutableArray<SDLTTSChunk *> *array = [parameters sdl_objectForName:SDLNameHelpPrompt];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
@@ -63,11 +63,11 @@
 }
 
 - (void)setTimeoutPrompt:(NSMutableArray<SDLTTSChunk *> *)timeoutPrompt {
-    [self setObject:timeoutPrompt forName:SDLNameTimeoutPrompt];
+    [parameters sdl_setObject:timeoutPrompt forName:SDLNameTimeoutPrompt];
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)timeoutPrompt {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameTimeoutPrompt];
+    NSMutableArray<SDLTTSChunk *> *array = [parameters sdl_objectForName:SDLNameTimeoutPrompt];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
@@ -80,19 +80,19 @@
 }
 
 - (void)setVrHelpTitle:(NSString *)vrHelpTitle {
-    [self setObject:vrHelpTitle forName:SDLNameVRHelpTitle];
+    [parameters sdl_setObject:vrHelpTitle forName:SDLNameVRHelpTitle];
 }
 
 - (NSString *)vrHelpTitle {
-    return [parameters objectForKey:SDLNameVRHelpTitle];
+    return [parameters sdl_objectForName:SDLNameVRHelpTitle];
 }
 
 - (void)setVrHelp:(NSMutableArray<SDLVRHelpItem *> *)vrHelp {
-    [self setObject:vrHelp forName:SDLNameVRHelp];
+    [parameters sdl_setObject:vrHelp forName:SDLNameVRHelp];
 }
 
 - (NSMutableArray<SDLVRHelpItem *> *)vrHelp {
-    NSMutableArray<SDLVRHelpItem *> *array = [parameters objectForKey:SDLNameVRHelp];
+    NSMutableArray<SDLVRHelpItem *> *array = [parameters sdl_objectForName:SDLNameVRHelp];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVRHelpItem.class]) {
         return array;
     } else {
@@ -105,19 +105,19 @@
 }
 
 - (void)setMenuTitle:(NSString *)menuTitle {
-    [self setObject:menuTitle forName:SDLNameMenuTitle];
+    [parameters sdl_setObject:menuTitle forName:SDLNameMenuTitle];
 }
 
 - (NSString *)menuTitle {
-    return [parameters objectForKey:SDLNameMenuTitle];
+    return [parameters sdl_objectForName:SDLNameMenuTitle];
 }
 
 - (void)setMenuIcon:(SDLImage *)menuIcon {
-    [self setObject:menuIcon forName:SDLNameMenuIcon];
+    [parameters sdl_setObject:menuIcon forName:SDLNameMenuIcon];
 }
 
 - (SDLImage *)menuIcon {
-    NSObject *obj = [parameters objectForKey:SDLNameMenuIcon];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameMenuIcon];
     if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
@@ -126,11 +126,11 @@
 }
 
 - (void)setKeyboardProperties:(SDLKeyboardProperties *)keyboardProperties {
-    [self setObject:keyboardProperties forName:SDLNameKeyboardProperties];
+    [parameters sdl_setObject:keyboardProperties forName:SDLNameKeyboardProperties];
 }
 
 - (SDLKeyboardProperties *)keyboardProperties {
-    NSObject *obj = [parameters objectForKey:SDLNameKeyboardProperties];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameKeyboardProperties];
     if (obj == nil || [obj isKindOfClass:SDLKeyboardProperties.class]) {
         return (SDLKeyboardProperties *)obj;
     } else {
diff --git a/SmartDeviceLink/SDLSetMediaClockTimer.m b/SmartDeviceLink/SDLSetMediaClockTimer.m
index 50f9a5e02..c95e8573b 100644
--- a/SmartDeviceLink/SDLSetMediaClockTimer.m
+++ b/SmartDeviceLink/SDLSetMediaClockTimer.m
@@ -39,11 +39,11 @@
 }
 
 - (void)setStartTime:(SDLStartTime *)startTime {
-    [self setObject:startTime forName:SDLNameStartTime];
+    [parameters sdl_setObject:startTime forName:SDLNameStartTime];
 }
 
 - (SDLStartTime *)startTime {
-    NSObject *obj = [parameters objectForKey:SDLNameStartTime];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameStartTime];
     if (obj == nil || [obj isKindOfClass:SDLStartTime.class]) {
         return (SDLStartTime *)obj;
     } else {
@@ -52,11 +52,11 @@
 }
 
 - (void)setEndTime:(SDLStartTime *)endTime {
-    [self setObject:endTime forName:SDLNameEndTime];
+    [parameters sdl_setObject:endTime forName:SDLNameEndTime];
 }
 
 - (SDLStartTime *)endTime {
-    NSObject *obj = [parameters objectForKey:SDLNameEndTime];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameEndTime];
     if (obj == nil || [obj isKindOfClass:SDLStartTime.class]) {
         return (SDLStartTime *)obj;
     } else {
@@ -65,11 +65,11 @@
 }
 
 - (void)setUpdateMode:(SDLUpdateMode)updateMode {
-    [self setObject:updateMode forName:SDLNameUpdateMode];
+    [parameters sdl_setObject:updateMode forName:SDLNameUpdateMode];
 }
 
 - (SDLUpdateMode)updateMode {
-    NSObject *obj = [parameters objectForKey:SDLNameUpdateMode];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameUpdateMode];
     return (SDLUpdateMode)obj;
 }
 
diff --git a/SmartDeviceLink/SDLShow.m b/SmartDeviceLink/SDLShow.m
index 2c6808486..f41fe3bf7 100644
--- a/SmartDeviceLink/SDLShow.m
+++ b/SmartDeviceLink/SDLShow.m
@@ -51,76 +51,76 @@
 }
 
 - (void)setMainField1:(NSString *)mainField1 {
-    [self setObject:mainField1 forName:SDLNameMainField1];
+    [parameters sdl_setObject:mainField1 forName:SDLNameMainField1];
 }
 
 - (NSString *)mainField1 {
-    return [parameters objectForKey:SDLNameMainField1];
+    return [parameters sdl_objectForName:SDLNameMainField1];
 }
 
 - (void)setMainField2:(NSString *)mainField2 {
-    [self setObject:mainField2 forName:SDLNameMainField2];
+    [parameters sdl_setObject:mainField2 forName:SDLNameMainField2];
 }
 
 - (NSString *)mainField2 {
-    return [parameters objectForKey:SDLNameMainField2];
+    return [parameters sdl_objectForName:SDLNameMainField2];
 }
 
 - (void)setMainField3:(NSString *)mainField3 {
-    [self setObject:mainField3 forName:SDLNameMainField3];
+    [parameters sdl_setObject:mainField3 forName:SDLNameMainField3];
 }
 
 - (NSString *)mainField3 {
-    return [parameters objectForKey:SDLNameMainField3];
+    return [parameters sdl_objectForName:SDLNameMainField3];
 }
 
 - (void)setMainField4:(NSString *)mainField4 {
-    [self setObject:mainField4 forName:SDLNameMainField4];
+    [parameters sdl_setObject:mainField4 forName:SDLNameMainField4];
 }
 
 - (NSString *)mainField4 {
-    return [parameters objectForKey:SDLNameMainField4];
+    return [parameters sdl_objectForName:SDLNameMainField4];
 }
 
 - (void)setAlignment:(SDLTextAlignment)alignment {
-    [self setObject:alignment forName:SDLNameAlignment];
+    [parameters sdl_setObject:alignment forName:SDLNameAlignment];
 }
 
 - (SDLTextAlignment)alignment {
-    NSObject *obj = [parameters objectForKey:SDLNameAlignment];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameAlignment];
     return (SDLTextAlignment)obj;
 }
 
 - (void)setStatusBar:(NSString *)statusBar {
-    [self setObject:statusBar forName:SDLNameStatusBar];
+    [parameters sdl_setObject:statusBar forName:SDLNameStatusBar];
 }
 
 - (NSString *)statusBar {
-    return [parameters objectForKey:SDLNameStatusBar];
+    return [parameters sdl_objectForName:SDLNameStatusBar];
 }
 
 - (void)setMediaClock:(NSString *)mediaClock {
-    [self setObject:mediaClock forName:SDLNameMediaClock];
+    [parameters sdl_setObject:mediaClock forName:SDLNameMediaClock];
 }
 
 - (NSString *)mediaClock {
-    return [parameters objectForKey:SDLNameMediaClock];
+    return [parameters sdl_objectForName:SDLNameMediaClock];
 }
 
 - (void)setMediaTrack:(NSString *)mediaTrack {
-    [self setObject:mediaTrack forName:SDLNameMediaTrack];
+    [parameters sdl_setObject:mediaTrack forName:SDLNameMediaTrack];
 }
 
 - (NSString *)mediaTrack {
-    return [parameters objectForKey:SDLNameMediaTrack];
+    return [parameters sdl_objectForName:SDLNameMediaTrack];
 }
 
 - (void)setGraphic:(SDLImage *)graphic {
-    [self setObject:graphic forName:SDLNameGraphic];
+    [parameters sdl_setObject:graphic forName:SDLNameGraphic];
 }
 
 - (SDLImage *)graphic {
-    NSObject *obj = [parameters objectForKey:SDLNameGraphic];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameGraphic];
     if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
@@ -129,11 +129,11 @@
 }
 
 - (void)setSecondaryGraphic:(SDLImage *)secondaryGraphic {
-    [self setObject:secondaryGraphic forName:SDLNameSecondaryGraphic];
+    [parameters sdl_setObject:secondaryGraphic forName:SDLNameSecondaryGraphic];
 }
 
 - (SDLImage *)secondaryGraphic {
-    NSObject *obj = [parameters objectForKey:SDLNameSecondaryGraphic];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameSecondaryGraphic];
     if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
@@ -142,11 +142,11 @@
 }
 
 - (void)setSoftButtons:(NSMutableArray<SDLSoftButton *> *)softButtons {
-    [self setObject:softButtons forName:SDLNameSoftButtons];
+    [parameters sdl_setObject:softButtons forName:SDLNameSoftButtons];
 }
 
 - (NSMutableArray<SDLSoftButton *> *)softButtons {
-    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:SDLNameSoftButtons];
+    NSMutableArray<SDLSoftButton *> *array = [parameters sdl_objectForName:SDLNameSoftButtons];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
         return array;
     } else {
@@ -159,11 +159,11 @@
 }
 
 - (void)setCustomPresets:(NSMutableArray<NSString *> *)customPresets {
-    [self setObject:customPresets forName:SDLNameCustomPresets];
+    [parameters sdl_setObject:customPresets forName:SDLNameCustomPresets];
 }
 
 - (NSMutableArray<NSString *> *)customPresets {
-    return [parameters objectForKey:SDLNameCustomPresets];
+    return [parameters sdl_objectForName:SDLNameCustomPresets];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLShowConstantTBT.m b/SmartDeviceLink/SDLShowConstantTBT.m
index bf2202c7d..5eb09a321 100644
--- a/SmartDeviceLink/SDLShowConstantTBT.m
+++ b/SmartDeviceLink/SDLShowConstantTBT.m
@@ -38,51 +38,51 @@
 }
 
 - (void)setNavigationText1:(NSString *)navigationText1 {
-    [self setObject:navigationText1 forName:SDLNameNavigationText1];
+    [parameters sdl_setObject:navigationText1 forName:SDLNameNavigationText1];
 }
 
 - (NSString *)navigationText1 {
-    return [parameters objectForKey:SDLNameNavigationText1];
+    return [parameters sdl_objectForName:SDLNameNavigationText1];
 }
 
 - (void)setNavigationText2:(NSString *)navigationText2 {
-    [self setObject:navigationText2 forName:SDLNameNavigationText2];
+    [parameters sdl_setObject:navigationText2 forName:SDLNameNavigationText2];
 }
 
 - (NSString *)navigationText2 {
-    return [parameters objectForKey:SDLNameNavigationText2];
+    return [parameters sdl_objectForName:SDLNameNavigationText2];
 }
 
 - (void)setEta:(NSString *)eta {
-    [self setObject:eta forName:SDLNameETA];
+    [parameters sdl_setObject:eta forName:SDLNameETA];
 }
 
 - (NSString *)eta {
-    return [parameters objectForKey:SDLNameETA];
+    return [parameters sdl_objectForName:SDLNameETA];
 }
 
 - (void)setTimeToDestination:(NSString *)timeToDestination {
-    [self setObject:timeToDestination forName:SDLNameTimeToDestination];
+    [parameters sdl_setObject:timeToDestination forName:SDLNameTimeToDestination];
 }
 
 - (NSString *)timeToDestination {
-    return [parameters objectForKey:SDLNameTimeToDestination];
+    return [parameters sdl_objectForName:SDLNameTimeToDestination];
 }
 
 - (void)setTotalDistance:(NSString *)totalDistance {
-    [self setObject:totalDistance forName:SDLNameTotalDistance];
+    [parameters sdl_setObject:totalDistance forName:SDLNameTotalDistance];
 }
 
 - (NSString *)totalDistance {
-    return [parameters objectForKey:SDLNameTotalDistance];
+    return [parameters sdl_objectForName:SDLNameTotalDistance];
 }
 
 - (void)setTurnIcon:(SDLImage *)turnIcon {
-    [self setObject:turnIcon forName:SDLNameTurnIcon];
+    [parameters sdl_setObject:turnIcon forName:SDLNameTurnIcon];
 }
 
 - (SDLImage *)turnIcon {
-    NSObject *obj = [parameters objectForKey:SDLNameTurnIcon];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameTurnIcon];
     if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
@@ -91,11 +91,11 @@
 }
 
 - (void)setNextTurnIcon:(SDLImage *)nextTurnIcon {
-    [self setObject:nextTurnIcon forName:SDLNameNextTurnIcon];
+    [parameters sdl_setObject:nextTurnIcon forName:SDLNameNextTurnIcon];
 }
 
 - (SDLImage *)nextTurnIcon {
-    NSObject *obj = [parameters objectForKey:SDLNameNextTurnIcon];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameNextTurnIcon];
     if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
         return (SDLImage *)obj;
     } else {
@@ -104,35 +104,35 @@
 }
 
 - (void)setDistanceToManeuver:(NSNumber<SDLFloat> *)distanceToManeuver {
-    [self setObject:distanceToManeuver forName:SDLNameDistanceToManeuver];
+    [parameters sdl_setObject:distanceToManeuver forName:SDLNameDistanceToManeuver];
 }
 
 - (NSNumber<SDLFloat> *)distanceToManeuver {
-    return [parameters objectForKey:SDLNameDistanceToManeuver];
+    return [parameters sdl_objectForName:SDLNameDistanceToManeuver];
 }
 
 - (void)setDistanceToManeuverScale:(NSNumber<SDLFloat> *)distanceToManeuverScale {
-    [self setObject:distanceToManeuverScale forName:SDLNameDistanceToManeuverScale];
+    [parameters sdl_setObject:distanceToManeuverScale forName:SDLNameDistanceToManeuverScale];
 }
 
 - (NSNumber<SDLFloat> *)distanceToManeuverScale {
-    return [parameters objectForKey:SDLNameDistanceToManeuverScale];
+    return [parameters sdl_objectForName:SDLNameDistanceToManeuverScale];
 }
 
 - (void)setManeuverComplete:(NSNumber<SDLBool> *)maneuverComplete {
-    [self setObject:maneuverComplete forName:SDLNameManeuverComplete];
+    [parameters sdl_setObject:maneuverComplete forName:SDLNameManeuverComplete];
 }
 
 - (NSNumber<SDLBool> *)maneuverComplete {
-    return [parameters objectForKey:SDLNameManeuverComplete];
+    return [parameters sdl_objectForName:SDLNameManeuverComplete];
 }
 
 - (void)setSoftButtons:(NSMutableArray<SDLSoftButton *> *)softButtons {
-    [self setObject:softButtons forName:SDLNameSoftButtons];
+    [parameters sdl_setObject:softButtons forName:SDLNameSoftButtons];
 }
 
 - (NSMutableArray<SDLSoftButton *> *)softButtons {
-    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:SDLNameSoftButtons];
+    NSMutableArray<SDLSoftButton *> *array = [parameters sdl_objectForName:SDLNameSoftButtons];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLSingleTireStatus.m b/SmartDeviceLink/SDLSingleTireStatus.m
index 2a04e5049..3dba61936 100644
--- a/SmartDeviceLink/SDLSingleTireStatus.m
+++ b/SmartDeviceLink/SDLSingleTireStatus.m
@@ -8,11 +8,11 @@
 @implementation SDLSingleTireStatus
 
 - (void)setStatus:(SDLComponentVolumeStatus)status {
-    [self setObject:status forName:SDLNameStatus];
+    [store sdl_setObject:status forName:SDLNameStatus];
 }
 
 - (SDLComponentVolumeStatus)status {
-    return [self objectForName:SDLNameStatus];
+    return [store sdl_objectForName:SDLNameStatus];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSlider.m b/SmartDeviceLink/SDLSlider.m
index 19aac16bd..c4e8e627e 100644
--- a/SmartDeviceLink/SDLSlider.m
+++ b/SmartDeviceLink/SDLSlider.m
@@ -51,43 +51,43 @@
 }
 
 - (void)setNumTicks:(NSNumber<SDLInt> *)numTicks {
-    [self setObject:numTicks forName:SDLNameNumberTicks];
+    [parameters sdl_setObject:numTicks forName:SDLNameNumberTicks];
 }
 
 - (NSNumber<SDLInt> *)numTicks {
-    return [parameters objectForKey:SDLNameNumberTicks];
+    return [parameters sdl_objectForName:SDLNameNumberTicks];
 }
 
 - (void)setPosition:(NSNumber<SDLInt> *)position {
-    [self setObject:position forName:SDLNamePosition];
+    [parameters sdl_setObject:position forName:SDLNamePosition];
 }
 
 - (NSNumber<SDLInt> *)position {
-    return [parameters objectForKey:SDLNamePosition];
+    return [parameters sdl_objectForName:SDLNamePosition];
 }
 
 - (void)setSliderHeader:(NSString *)sliderHeader {
-    [self setObject:sliderHeader forName:SDLNameSliderHeader];
+    [parameters sdl_setObject:sliderHeader forName:SDLNameSliderHeader];
 }
 
 - (NSString *)sliderHeader {
-    return [parameters objectForKey:SDLNameSliderHeader];
+    return [parameters sdl_objectForName:SDLNameSliderHeader];
 }
 
 - (void)setSliderFooter:(NSMutableArray<NSString *> *)sliderFooter {
-    [self setObject:sliderFooter forName:SDLNameSliderFooter];
+    [parameters sdl_setObject:sliderFooter forName:SDLNameSliderFooter];
 }
 
 - (NSMutableArray<NSString *> *)sliderFooter {
-    return [parameters objectForKey:SDLNameSliderFooter];
+    return [parameters sdl_objectForName:SDLNameSliderFooter];
 }
 
 - (void)setTimeout:(NSNumber<SDLInt> *)timeout {
-    [self setObject:timeout forName:SDLNameTimeout];
+    [parameters sdl_setObject:timeout forName:SDLNameTimeout];
 }
 
 - (NSNumber<SDLInt> *)timeout {
-    return [parameters objectForKey:SDLNameTimeout];
+    return [parameters sdl_objectForName:SDLNameTimeout];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSliderResponse.m b/SmartDeviceLink/SDLSliderResponse.m
index 2b8769d0e..6718470fe 100644
--- a/SmartDeviceLink/SDLSliderResponse.m
+++ b/SmartDeviceLink/SDLSliderResponse.m
@@ -15,7 +15,7 @@
 }
 
 - (void)setSliderPosition:(NSNumber<SDLInt> *)sliderPosition {
-    [self setObject:sliderPosition forName:SDLNameSliderPosition];
+    [parameters sdl_setObject:sliderPosition forName:SDLNameSliderPosition];
 }
 
 - (NSNumber<SDLInt> *)sliderPosition {
diff --git a/SmartDeviceLink/SDLSoftButton.m b/SmartDeviceLink/SDLSoftButton.m
index e92773f14..1ae82579b 100644
--- a/SmartDeviceLink/SDLSoftButton.m
+++ b/SmartDeviceLink/SDLSoftButton.m
@@ -38,51 +38,51 @@
 }
 
 - (void)setType:(SDLSoftButtonType)type {
-    [self setObject:type forName:SDLNameType];
+    [store sdl_setObject:type forName:SDLNameType];
 }
 
 - (SDLSoftButtonType)type {
-    return [self objectForName:SDLNameType];
+    return [store sdl_objectForName:SDLNameType];
 }
 
 - (void)setText:(NSString *)text {
-    [self setObject:text forName:SDLNameText];
+    [store sdl_setObject:text forName:SDLNameText];
 }
 
 - (NSString *)text {
-    return [self objectForName:SDLNameText];
+    return [store sdl_objectForName:SDLNameText];
 }
 
 - (void)setImage:(SDLImage *)image {
-    [self setObject:image forName:SDLNameImage];
+    [store sdl_setObject:image forName:SDLNameImage];
 }
 
 - (SDLImage *)image {
-    return [self objectForName:SDLNameImage ofClass:SDLImage.class];
+    return [store sdl_objectForName:SDLNameImage ofClass:SDLImage.class];
 }
 
 - (void)setIsHighlighted:(NSNumber<SDLBool> *)isHighlighted {
-    [self setObject:isHighlighted forName:SDLNameIsHighlighted];
+    [store sdl_setObject:isHighlighted forName:SDLNameIsHighlighted];
 }
 
 - (NSNumber<SDLBool> *)isHighlighted {
-    return [self objectForName:SDLNameIsHighlighted];
+    return [store sdl_objectForName:SDLNameIsHighlighted];
 }
 
 - (void)setSoftButtonID:(NSNumber<SDLInt> *)softButtonID {
-    [self setObject:softButtonID forName:SDLNameSoftButtonId];
+    [store sdl_setObject:softButtonID forName:SDLNameSoftButtonId];
 }
 
 - (NSNumber<SDLInt> *)softButtonID {
-    return [self objectForName:SDLNameSoftButtonId];
+    return [store sdl_objectForName:SDLNameSoftButtonId];
 }
 
 - (void)setSystemAction:(SDLSystemAction)systemAction {
-    [self setObject:systemAction forName:SDLNameSystemAction];
+    [store sdl_setObject:systemAction forName:SDLNameSystemAction];
 }
 
 - (SDLSystemAction)systemAction {
-    return [self objectForName:SDLNameSystemAction];
+    return [store sdl_objectForName:SDLNameSystemAction];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSoftButtonCapabilities.m b/SmartDeviceLink/SDLSoftButtonCapabilities.m
index 5b4cf146c..e64f7ffe8 100644
--- a/SmartDeviceLink/SDLSoftButtonCapabilities.m
+++ b/SmartDeviceLink/SDLSoftButtonCapabilities.m
@@ -9,35 +9,35 @@
 @implementation SDLSoftButtonCapabilities
 
 - (void)setShortPressAvailable:(NSNumber<SDLBool> *)shortPressAvailable {
-    [self setObject:shortPressAvailable forName:SDLNameShortPressAvailable];
+    [store sdl_setObject:shortPressAvailable forName:SDLNameShortPressAvailable];
 }
 
 - (NSNumber<SDLBool> *)shortPressAvailable {
-    return [self objectForName:SDLNameShortPressAvailable];
+    return [store sdl_objectForName:SDLNameShortPressAvailable];
 }
 
 - (void)setLongPressAvailable:(NSNumber<SDLBool> *)longPressAvailable {
-    [self setObject:longPressAvailable forName:SDLNameLongPressAvailable];
+    [store sdl_setObject:longPressAvailable forName:SDLNameLongPressAvailable];
 }
 
 - (NSNumber<SDLBool> *)longPressAvailable {
-    return [self objectForName:SDLNameLongPressAvailable];
+    return [store sdl_objectForName:SDLNameLongPressAvailable];
 }
 
 - (void)setUpDownAvailable:(NSNumber<SDLBool> *)upDownAvailable {
-    [self setObject:upDownAvailable forName:SDLNameUpDownAvailable];
+    [store sdl_setObject:upDownAvailable forName:SDLNameUpDownAvailable];
 }
 
 - (NSNumber<SDLBool> *)upDownAvailable {
-    return [self objectForName:SDLNameUpDownAvailable];
+    return [store sdl_objectForName:SDLNameUpDownAvailable];
 }
 
 - (void)setImageSupported:(NSNumber<SDLBool> *)imageSupported {
-    [self setObject:imageSupported forName:SDLNameImageSupported];
+    [store sdl_setObject:imageSupported forName:SDLNameImageSupported];
 }
 
 - (NSNumber<SDLBool> *)imageSupported {
-    return [self objectForName:SDLNameImageSupported];
+    return [store sdl_objectForName:SDLNameImageSupported];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSpeak.m b/SmartDeviceLink/SDLSpeak.m
index 255ed0898..7f233ce1c 100644
--- a/SmartDeviceLink/SDLSpeak.m
+++ b/SmartDeviceLink/SDLSpeak.m
@@ -33,11 +33,11 @@
 }
 
 - (void)setTtsChunks:(NSMutableArray<SDLTTSChunk *> *)ttsChunks {
-    [self setObject:ttsChunks forName:SDLNameTTSChunks];
+    [parameters sdl_setObject:ttsChunks forName:SDLNameTTSChunks];
 }
 
 - (NSMutableArray<SDLTTSChunk *> *)ttsChunks {
-    NSMutableArray<SDLTTSChunk *> *array = [parameters objectForKey:SDLNameTTSChunks];
+    NSMutableArray<SDLTTSChunk *> *array = [parameters sdl_objectForName:SDLNameTTSChunks];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLStartTime.m b/SmartDeviceLink/SDLStartTime.m
index 4461c5d0c..dea9b40be 100644
--- a/SmartDeviceLink/SDLStartTime.m
+++ b/SmartDeviceLink/SDLStartTime.m
@@ -22,27 +22,27 @@
 }
 
 - (void)setHours:(NSNumber<SDLInt> *)hours {
-    [self setObject:hours forName:SDLNameHours];
+    [store sdl_setObject:hours forName:SDLNameHours];
 }
 
 - (NSNumber<SDLInt> *)hours {
-    return [self objectForName:SDLNameHours];
+    return [store sdl_objectForName:SDLNameHours];
 }
 
 - (void)setMinutes:(NSNumber<SDLInt> *)minutes {
-    [self setObject:minutes forName:SDLNameMinutes];
+    [store sdl_setObject:minutes forName:SDLNameMinutes];
 }
 
 - (NSNumber<SDLInt> *)minutes {
-    return [self objectForName:SDLNameMinutes];
+    return [store sdl_objectForName:SDLNameMinutes];
 }
 
 - (void)setSeconds:(NSNumber<SDLInt> *)seconds {
-    [self setObject:seconds forName:SDLNameSeconds];
+    [store sdl_setObject:seconds forName:SDLNameSeconds];
 }
 
 - (NSNumber<SDLInt> *)seconds {
-    return [self objectForName:SDLNameSeconds];
+    return [store sdl_objectForName:SDLNameSeconds];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSubscribeButton.m b/SmartDeviceLink/SDLSubscribeButton.m
index 4f857fb06..6c08bca6c 100644
--- a/SmartDeviceLink/SDLSubscribeButton.m
+++ b/SmartDeviceLink/SDLSubscribeButton.m
@@ -39,11 +39,11 @@
 }
 
 - (void)setButtonName:(SDLButtonName)buttonName {
-    [self setObject:buttonName forName:SDLNameButtonName];
+    [parameters sdl_setObject:buttonName forName:SDLNameButtonName];
 }
 
 - (SDLButtonName)buttonName {
-    NSObject *obj = [parameters objectForKey:SDLNameButtonName];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameButtonName];
     return (SDLButtonName)obj;
 }
 
diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.m b/SmartDeviceLink/SDLSubscribeVehicleData.m
index 12c5616bd..1ae202715 100644
--- a/SmartDeviceLink/SDLSubscribeVehicleData.m
+++ b/SmartDeviceLink/SDLSubscribeVehicleData.m
@@ -49,195 +49,195 @@
 }
 
 - (void)setGps:(NSNumber<SDLBool> *)gps {
-    [self setObject:gps forName:SDLNameGPS];
+    [parameters sdl_setObject:gps forName:SDLNameGPS];
 }
 
 - (NSNumber<SDLBool> *)gps {
-    return [parameters objectForKey:SDLNameGPS];
+    return [parameters sdl_objectForName:SDLNameGPS];
 }
 
 - (void)setSpeed:(NSNumber<SDLBool> *)speed {
-    [self setObject:speed forName:SDLNameSpeed];
+    [parameters sdl_setObject:speed forName:SDLNameSpeed];
 }
 
 - (NSNumber<SDLBool> *)speed {
-    return [parameters objectForKey:SDLNameSpeed];
+    return [parameters sdl_objectForName:SDLNameSpeed];
 }
 
 - (void)setRpm:(NSNumber<SDLBool> *)rpm {
-    [self setObject:rpm forName:SDLNameRPM];
+    [parameters sdl_setObject:rpm forName:SDLNameRPM];
 }
 
 - (NSNumber<SDLBool> *)rpm {
-    return [parameters objectForKey:SDLNameRPM];
+    return [parameters sdl_objectForName:SDLNameRPM];
 }
 
 - (void)setFuelLevel:(NSNumber<SDLBool> *)fuelLevel {
-    [self setObject:fuelLevel forName:SDLNameFuelLevel];
+    [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel];
 }
 
 - (NSNumber<SDLBool> *)fuelLevel {
-    return [parameters objectForKey:SDLNameFuelLevel];
+    return [parameters sdl_objectForName:SDLNameFuelLevel];
 }
 
 - (void)setFuelLevel_State:(NSNumber<SDLBool> *)fuelLevel_State {
-    [self setObject:fuelLevel_State forName:SDLNameFuelLevelState];
+    [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState];
 }
 
 - (NSNumber<SDLBool> *)fuelLevel_State {
-    return [parameters objectForKey:SDLNameFuelLevelState];
+    return [parameters sdl_objectForName:SDLNameFuelLevelState];
 }
 
 - (void)setInstantFuelConsumption:(NSNumber<SDLBool> *)instantFuelConsumption {
-    [self setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
+    [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
 }
 
 - (NSNumber<SDLBool> *)instantFuelConsumption {
-    return [parameters objectForKey:SDLNameInstantFuelConsumption];
+    return [parameters sdl_objectForName:SDLNameInstantFuelConsumption];
 }
 
 - (void)setExternalTemperature:(NSNumber<SDLBool> *)externalTemperature {
-    [self setObject:externalTemperature forName:SDLNameExternalTemperature];
+    [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature];
 }
 
 - (NSNumber<SDLBool> *)externalTemperature {
-    return [parameters objectForKey:SDLNameExternalTemperature];
+    return [parameters sdl_objectForName:SDLNameExternalTemperature];
 }
 
 - (void)setPrndl:(NSNumber<SDLBool> *)prndl {
-    [self setObject:prndl forName:SDLNamePRNDL];
+    [parameters sdl_setObject:prndl forName:SDLNamePRNDL];
 }
 
 - (NSNumber<SDLBool> *)prndl {
-    return [parameters objectForKey:SDLNamePRNDL];
+    return [parameters sdl_objectForName:SDLNamePRNDL];
 }
 
 - (void)setTirePressure:(NSNumber<SDLBool> *)tirePressure {
-    [self setObject:tirePressure forName:SDLNameTirePressure];
+    [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure];
 }
 
 - (NSNumber<SDLBool> *)tirePressure {
-    return [parameters objectForKey:SDLNameTirePressure];
+    return [parameters sdl_objectForName:SDLNameTirePressure];
 }
 
 - (void)setOdometer:(NSNumber<SDLBool> *)odometer {
-    [self setObject:odometer forName:SDLNameOdometer];
+    [parameters sdl_setObject:odometer forName:SDLNameOdometer];
 }
 
 - (NSNumber<SDLBool> *)odometer {
-    return [parameters objectForKey:SDLNameOdometer];
+    return [parameters sdl_objectForName:SDLNameOdometer];
 }
 
 - (void)setBeltStatus:(NSNumber<SDLBool> *)beltStatus {
-    [self setObject:beltStatus forName:SDLNameBeltStatus];
+    [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus];
 }
 
 - (NSNumber<SDLBool> *)beltStatus {
-    return [parameters objectForKey:SDLNameBeltStatus];
+    return [parameters sdl_objectForName:SDLNameBeltStatus];
 }
 
 - (void)setBodyInformation:(NSNumber<SDLBool> *)bodyInformation {
-    [self setObject:bodyInformation forName:SDLNameBodyInformation];
+    [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation];
 }
 
 - (NSNumber<SDLBool> *)bodyInformation {
-    return [parameters objectForKey:SDLNameBodyInformation];
+    return [parameters sdl_objectForName:SDLNameBodyInformation];
 }
 
 - (void)setDeviceStatus:(NSNumber<SDLBool> *)deviceStatus {
-    [self setObject:deviceStatus forName:SDLNameDeviceStatus];
+    [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus];
 }
 
 - (NSNumber<SDLBool> *)deviceStatus {
-    return [parameters objectForKey:SDLNameDeviceStatus];
+    return [parameters sdl_objectForName:SDLNameDeviceStatus];
 }
 
 - (void)setDriverBraking:(NSNumber<SDLBool> *)driverBraking {
-    [self setObject:driverBraking forName:SDLNameDriverBraking];
+    [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking];
 }
 
 - (NSNumber<SDLBool> *)driverBraking {
-    return [parameters objectForKey:SDLNameDriverBraking];
+    return [parameters sdl_objectForName:SDLNameDriverBraking];
 }
 
 - (void)setWiperStatus:(NSNumber<SDLBool> *)wiperStatus {
-    [self setObject:wiperStatus forName:SDLNameWiperStatus];
+    [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus];
 }
 
 - (NSNumber<SDLBool> *)wiperStatus {
-    return [parameters objectForKey:SDLNameWiperStatus];
+    return [parameters sdl_objectForName:SDLNameWiperStatus];
 }
 
 - (void)setHeadLampStatus:(NSNumber<SDLBool> *)headLampStatus {
-    [self setObject:headLampStatus forName:SDLNameHeadLampStatus];
+    [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus];
 }
 
 - (NSNumber<SDLBool> *)headLampStatus {
-    return [parameters objectForKey:SDLNameHeadLampStatus];
+    return [parameters sdl_objectForName:SDLNameHeadLampStatus];
 }
 
 - (void)setEngineTorque:(NSNumber<SDLBool> *)engineTorque {
-    [self setObject:engineTorque forName:SDLNameEngineTorque];
+    [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque];
 }
 
 - (NSNumber<SDLBool> *)engineTorque {
-    return [parameters objectForKey:SDLNameEngineTorque];
+    return [parameters sdl_objectForName:SDLNameEngineTorque];
 }
 
 - (void)setAccPedalPosition:(NSNumber<SDLBool> *)accPedalPosition {
-    [self setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
+    [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
 }
 
 - (NSNumber<SDLBool> *)accPedalPosition {
-    return [parameters objectForKey:SDLNameAccelerationPedalPosition];
+    return [parameters sdl_objectForName:SDLNameAccelerationPedalPosition];
 }
 
 - (void)setSteeringWheelAngle:(NSNumber<SDLBool> *)steeringWheelAngle {
-    [self setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
+    [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
 }
 
 - (NSNumber<SDLBool> *)steeringWheelAngle {
-    return [parameters objectForKey:SDLNameSteeringWheelAngle];
+    return [parameters sdl_objectForName:SDLNameSteeringWheelAngle];
 }
 
 - (void)setECallInfo:(NSNumber<SDLBool> *)eCallInfo {
-    [self setObject:eCallInfo forName:SDLNameECallInfo];
+    [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo];
 }
 
 - (NSNumber<SDLBool> *)eCallInfo {
-    return [parameters objectForKey:SDLNameECallInfo];
+    return [parameters sdl_objectForName:SDLNameECallInfo];
 }
 
 - (void)setAirbagStatus:(NSNumber<SDLBool> *)airbagStatus {
-    [self setObject:airbagStatus forName:SDLNameAirbagStatus];
+    [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus];
 }
 
 - (NSNumber<SDLBool> *)airbagStatus {
-    return [parameters objectForKey:SDLNameAirbagStatus];
+    return [parameters sdl_objectForName:SDLNameAirbagStatus];
 }
 
 - (void)setEmergencyEvent:(NSNumber<SDLBool> *)emergencyEvent {
-    [self setObject:emergencyEvent forName:SDLNameEmergencyEvent];
+    [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent];
 }
 
 - (NSNumber<SDLBool> *)emergencyEvent {
-    return [parameters objectForKey:SDLNameEmergencyEvent];
+    return [parameters sdl_objectForName:SDLNameEmergencyEvent];
 }
 
 - (void)setClusterModeStatus:(NSNumber<SDLBool> *)clusterModeStatus {
-    [self setObject:clusterModeStatus forName:SDLNameClusterModeStatus];
+    [parameters sdl_setObject:clusterModeStatus forName:SDLNameClusterModeStatus];
 }
 
 - (NSNumber<SDLBool> *)clusterModeStatus {
-    return [parameters objectForKey:SDLNameClusterModeStatus];
+    return [parameters sdl_objectForName:SDLNameClusterModeStatus];
 }
 
 - (void)setMyKey:(NSNumber<SDLBool> *)myKey {
-    [self setObject:myKey forName:SDLNameMyKey];
+    [parameters sdl_setObject:myKey forName:SDLNameMyKey];
 }
 
 - (NSNumber<SDLBool> *)myKey {
-    return [parameters objectForKey:SDLNameMyKey];
+    return [parameters sdl_objectForName:SDLNameMyKey];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
index 543e4b106..bc0bdec75 100644
--- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
+++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
@@ -16,7 +16,7 @@
 }
 
 - (void)setGps:(SDLVehicleDataResult *)gps {
-    [self setObject:gps forName:SDLNameGPS];
+    [parameters sdl_setObject:gps forName:SDLNameGPS];
 }
 
 - (SDLVehicleDataResult *)gps {
@@ -29,7 +29,7 @@
 }
 
 - (void)setSpeed:(SDLVehicleDataResult *)speed {
-    [self setObject:speed forName:SDLNameSpeed];
+    [parameters sdl_setObject:speed forName:SDLNameSpeed];
 }
 
 - (SDLVehicleDataResult *)speed {
@@ -42,7 +42,7 @@
 }
 
 - (void)setRpm:(SDLVehicleDataResult *)rpm {
-    [self setObject:rpm forName:SDLNameRPM];
+    [parameters sdl_setObject:rpm forName:SDLNameRPM];
 }
 
 - (SDLVehicleDataResult *)rpm {
@@ -55,7 +55,7 @@
 }
 
 - (void)setFuelLevel:(SDLVehicleDataResult *)fuelLevel {
-    [self setObject:fuelLevel forName:SDLNameFuelLevel];
+    [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel];
 }
 
 - (SDLVehicleDataResult *)fuelLevel {
@@ -68,7 +68,7 @@
 }
 
 - (void)setFuelLevel_State:(SDLVehicleDataResult *)fuelLevel_State {
-    [self setObject:fuelLevel_State forName:SDLNameFuelLevelState];
+    [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState];
 }
 
 - (SDLVehicleDataResult *)fuelLevel_State {
@@ -81,7 +81,7 @@
 }
 
 - (void)setInstantFuelConsumption:(SDLVehicleDataResult *)instantFuelConsumption {
-    [self setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
+    [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
 }
 
 - (SDLVehicleDataResult *)instantFuelConsumption {
@@ -94,7 +94,7 @@
 }
 
 - (void)setExternalTemperature:(SDLVehicleDataResult *)externalTemperature {
-    [self setObject:externalTemperature forName:SDLNameExternalTemperature];
+    [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature];
 }
 
 - (SDLVehicleDataResult *)externalTemperature {
@@ -107,7 +107,7 @@
 }
 
 - (void)setPrndl:(SDLVehicleDataResult *)prndl {
-    [self setObject:prndl forName:SDLNamePRNDL];
+    [parameters sdl_setObject:prndl forName:SDLNamePRNDL];
 }
 
 - (SDLVehicleDataResult *)prndl {
@@ -120,7 +120,7 @@
 }
 
 - (void)setTirePressure:(SDLVehicleDataResult *)tirePressure {
-    [self setObject:tirePressure forName:SDLNameTirePressure];
+    [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure];
 }
 
 - (SDLVehicleDataResult *)tirePressure {
@@ -133,7 +133,7 @@
 }
 
 - (void)setOdometer:(SDLVehicleDataResult *)odometer {
-    [self setObject:odometer forName:SDLNameOdometer];
+    [parameters sdl_setObject:odometer forName:SDLNameOdometer];
 }
 
 - (SDLVehicleDataResult *)odometer {
@@ -146,7 +146,7 @@
 }
 
 - (void)setBeltStatus:(SDLVehicleDataResult *)beltStatus {
-    [self setObject:beltStatus forName:SDLNameBeltStatus];
+    [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus];
 }
 
 - (SDLVehicleDataResult *)beltStatus {
@@ -159,7 +159,7 @@
 }
 
 - (void)setBodyInformation:(SDLVehicleDataResult *)bodyInformation {
-    [self setObject:bodyInformation forName:SDLNameBodyInformation];
+    [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation];
 }
 
 - (SDLVehicleDataResult *)bodyInformation {
@@ -172,7 +172,7 @@
 }
 
 - (void)setDeviceStatus:(SDLVehicleDataResult *)deviceStatus {
-    [self setObject:deviceStatus forName:SDLNameDeviceStatus];
+    [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus];
 }
 
 - (SDLVehicleDataResult *)deviceStatus {
@@ -185,7 +185,7 @@
 }
 
 - (void)setDriverBraking:(SDLVehicleDataResult *)driverBraking {
-    [self setObject:driverBraking forName:SDLNameDriverBraking];
+    [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking];
 }
 
 - (SDLVehicleDataResult *)driverBraking {
@@ -198,7 +198,7 @@
 }
 
 - (void)setWiperStatus:(SDLVehicleDataResult *)wiperStatus {
-    [self setObject:wiperStatus forName:SDLNameWiperStatus];
+    [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus];
 }
 
 - (SDLVehicleDataResult *)wiperStatus {
@@ -211,7 +211,7 @@
 }
 
 - (void)setHeadLampStatus:(SDLVehicleDataResult *)headLampStatus {
-    [self setObject:headLampStatus forName:SDLNameHeadLampStatus];
+    [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus];
 }
 
 - (SDLVehicleDataResult *)headLampStatus {
@@ -224,7 +224,7 @@
 }
 
 - (void)setEngineTorque:(SDLVehicleDataResult *)engineTorque {
-    [self setObject:engineTorque forName:SDLNameEngineTorque];
+    [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque];
 }
 
 - (SDLVehicleDataResult *)engineTorque {
@@ -237,7 +237,7 @@
 }
 
 - (void)setAccPedalPosition:(SDLVehicleDataResult *)accPedalPosition {
-    [self setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
+    [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
 }
 
 - (SDLVehicleDataResult *)accPedalPosition {
@@ -250,7 +250,7 @@
 }
 
 - (void)setSteeringWheelAngle:(SDLVehicleDataResult *)steeringWheelAngle {
-    [self setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
+    [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
 }
 
 - (SDLVehicleDataResult *)steeringWheelAngle {
@@ -263,7 +263,7 @@
 }
 
 - (void)setECallInfo:(SDLVehicleDataResult *)eCallInfo {
-    [self setObject:eCallInfo forName:SDLNameECallInfo];
+    [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo];
 }
 
 - (SDLVehicleDataResult *)eCallInfo {
@@ -276,7 +276,7 @@
 }
 
 - (void)setAirbagStatus:(SDLVehicleDataResult *)airbagStatus {
-    [self setObject:airbagStatus forName:SDLNameAirbagStatus];
+    [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus];
 }
 
 - (SDLVehicleDataResult *)airbagStatus {
@@ -289,7 +289,7 @@
 }
 
 - (void)setEmergencyEvent:(SDLVehicleDataResult *)emergencyEvent {
-    [self setObject:emergencyEvent forName:SDLNameEmergencyEvent];
+    [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent];
 }
 
 - (SDLVehicleDataResult *)emergencyEvent {
@@ -302,7 +302,7 @@
 }
 
 - (void)setClusterModes:(SDLVehicleDataResult *)clusterModes {
-    [self setObject:clusterModes forName:SDLNameClusterModes];
+    [parameters sdl_setObject:clusterModes forName:SDLNameClusterModes];
 }
 
 - (SDLVehicleDataResult *)clusterModes {
@@ -315,7 +315,7 @@
 }
 
 - (void)setMyKey:(SDLVehicleDataResult *)myKey {
-    [self setObject:myKey forName:SDLNameMyKey];
+    [parameters sdl_setObject:myKey forName:SDLNameMyKey];
 }
 
 - (SDLVehicleDataResult *)myKey {
diff --git a/SmartDeviceLink/SDLSyncMsgVersion.m b/SmartDeviceLink/SDLSyncMsgVersion.m
index 957d3180b..57a53f385 100644
--- a/SmartDeviceLink/SDLSyncMsgVersion.m
+++ b/SmartDeviceLink/SDLSyncMsgVersion.m
@@ -21,19 +21,19 @@
 }
 
 - (void)setMajorVersion:(NSNumber<SDLInt> *)majorVersion {
-    [self setObject:majorVersion forName:SDLNameMajorVersion];
+    [store sdl_setObject:majorVersion forName:SDLNameMajorVersion];
 }
 
 - (NSNumber<SDLInt> *)majorVersion {
-    return [self objectForName:SDLNameMajorVersion];
+    return [store sdl_objectForName:SDLNameMajorVersion];
 }
 
 - (void)setMinorVersion:(NSNumber<SDLInt> *)minorVersion {
-    [self setObject:minorVersion forName:SDLNameMinorVersion];
+    [store sdl_setObject:minorVersion forName:SDLNameMinorVersion];
 }
 
 - (NSNumber<SDLInt> *)minorVersion {
-    return [self objectForName:SDLNameMinorVersion];
+    return [store sdl_objectForName:SDLNameMinorVersion];
 }
 
 - (NSString *)description {
diff --git a/SmartDeviceLink/SDLSystemRequest.m b/SmartDeviceLink/SDLSystemRequest.m
index 340b2fda4..3f12cbdf4 100644
--- a/SmartDeviceLink/SDLSystemRequest.m
+++ b/SmartDeviceLink/SDLSystemRequest.m
@@ -27,20 +27,20 @@
 }
 
 - (void)setRequestType:(SDLRequestType)requestType {
-    [self setObject:requestType forName:SDLNameRequestType];
+    [parameters sdl_setObject:requestType forName:SDLNameRequestType];
 }
 
 - (SDLRequestType)requestType {
-    NSObject *obj = [parameters objectForKey:SDLNameRequestType];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameRequestType];
     return (SDLRequestType)obj;
 }
 
 - (void)setFileName:(NSString *)fileName {
-    [self setObject:fileName forName:SDLNameFilename];
+    [parameters sdl_setObject:fileName forName:SDLNameFilename];
 }
 
 - (NSString *)fileName {
-    return [parameters objectForKey:SDLNameFilename];
+    return [parameters sdl_objectForName:SDLNameFilename];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLTTSChunk.m b/SmartDeviceLink/SDLTTSChunk.m
index 2be452315..f7553422b 100644
--- a/SmartDeviceLink/SDLTTSChunk.m
+++ b/SmartDeviceLink/SDLTTSChunk.m
@@ -48,19 +48,19 @@
 }
 
 - (void)setText:(NSString *)text {
-    [self setObject:text forName:SDLNameText];
+    [store sdl_setObject:text forName:SDLNameText];
 }
 
 - (NSString *)text {
-    return [self objectForName:SDLNameText];
+    return [store sdl_objectForName:SDLNameText];
 }
 
 - (void)setType:(SDLSpeechCapabilities)type {
-    [self setObject:type forName:SDLNameType];
+    [store sdl_setObject:type forName:SDLNameType];
 }
 
 - (SDLSpeechCapabilities)type {
-    return [self objectForName:SDLNameType];
+    return [store sdl_objectForName:SDLNameType];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLTextField.m b/SmartDeviceLink/SDLTextField.m
index 2b9680c09..22c04bb91 100644
--- a/SmartDeviceLink/SDLTextField.m
+++ b/SmartDeviceLink/SDLTextField.m
@@ -11,35 +11,35 @@
 @implementation SDLTextField
 
 - (void)setName:(SDLTextFieldName)name {
-    [self setObject:name forName:SDLNameName];
+    [store sdl_setObject:name forName:SDLNameName];
 }
 
 - (SDLTextFieldName)name {
-    return [self objectForName:SDLNameName];
+    return [store sdl_objectForName:SDLNameName];
 }
 
 - (void)setCharacterSet:(SDLCharacterSet)characterSet {
-    [self setObject:characterSet forName:SDLNameCharacterSet];
+    [store sdl_setObject:characterSet forName:SDLNameCharacterSet];
 }
 
 - (SDLCharacterSet)characterSet {
-    return [self objectForName:SDLNameCharacterSet];
+    return [store sdl_objectForName:SDLNameCharacterSet];
 }
 
 - (void)setWidth:(NSNumber<SDLInt> *)width {
-    [self setObject:width forName:SDLNameWidth];
+    [store sdl_setObject:width forName:SDLNameWidth];
 }
 
 - (NSNumber<SDLInt> *)width {
-    return [self objectForName:SDLNameWidth];
+    return [store sdl_objectForName:SDLNameWidth];
 }
 
 - (void)setRows:(NSNumber<SDLInt> *)rows {
-    [self setObject:rows forName:SDLNameRows];
+    [store sdl_setObject:rows forName:SDLNameRows];
 }
 
 - (NSNumber<SDLInt> *)rows {
-    return [self objectForName:SDLNameRows];
+    return [store sdl_objectForName:SDLNameRows];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLTireStatus.m b/SmartDeviceLink/SDLTireStatus.m
index 34bbf24d3..3aee276ec 100644
--- a/SmartDeviceLink/SDLTireStatus.m
+++ b/SmartDeviceLink/SDLTireStatus.m
@@ -10,7 +10,7 @@
 @implementation SDLTireStatus
 
 - (void)setPressureTelltale:(SDLWarningLightStatus)pressureTelltale {
-    [self setObject:pressureTelltale forName:SDLNamePressureTelltale];
+    [store sdl_setObject:pressureTelltale forName:SDLNamePressureTelltale];
 }
 
 - (SDLWarningLightStatus)pressureTelltale {
@@ -19,7 +19,7 @@
 }
 
 - (void)setLeftFront:(SDLSingleTireStatus *)leftFront {
-    [self setObject:leftFront forName:SDLNameLeftFront];
+    [store sdl_setObject:leftFront forName:SDLNameLeftFront];
 }
 
 - (SDLSingleTireStatus *)leftFront {
@@ -32,7 +32,7 @@
 }
 
 - (void)setRightFront:(SDLSingleTireStatus *)rightFront {
-    [self setObject:rightFront forName:SDLNameRightFront];
+    [store sdl_setObject:rightFront forName:SDLNameRightFront];
 }
 
 - (SDLSingleTireStatus *)rightFront {
@@ -45,7 +45,7 @@
 }
 
 - (void)setLeftRear:(SDLSingleTireStatus *)leftRear {
-    [self setObject:leftRear forName:SDLNameLeftRear];
+    [store sdl_setObject:leftRear forName:SDLNameLeftRear];
 }
 
 - (SDLSingleTireStatus *)leftRear {
@@ -58,7 +58,7 @@
 }
 
 - (void)setRightRear:(SDLSingleTireStatus *)rightRear {
-    [self setObject:rightRear forName:SDLNameRightRear];
+    [store sdl_setObject:rightRear forName:SDLNameRightRear];
 }
 
 - (SDLSingleTireStatus *)rightRear {
@@ -71,7 +71,7 @@
 }
 
 - (void)setInnerLeftRear:(SDLSingleTireStatus *)innerLeftRear {
-    [self setObject:innerLeftRear forName:SDLNameInnerLeftRear];
+    [store sdl_setObject:innerLeftRear forName:SDLNameInnerLeftRear];
 }
 
 - (SDLSingleTireStatus *)innerLeftRear {
@@ -84,7 +84,7 @@
 }
 
 - (void)setInnerRightRear:(SDLSingleTireStatus *)innerRightRear {
-    [self setObject:innerRightRear forName:SDLNameInnerRightRear];
+    [store sdl_setObject:innerRightRear forName:SDLNameInnerRightRear];
 }
 
 - (SDLSingleTireStatus *)innerRightRear {
diff --git a/SmartDeviceLink/SDLTouchCoord.m b/SmartDeviceLink/SDLTouchCoord.m
index d7fe1a210..f3dee9c0f 100644
--- a/SmartDeviceLink/SDLTouchCoord.m
+++ b/SmartDeviceLink/SDLTouchCoord.m
@@ -9,19 +9,19 @@
 @implementation SDLTouchCoord
 
 - (void)setX:(NSNumber<SDLFloat> *)x {
-    [self setObject:x forName:SDLNameX];
+    [store sdl_setObject:x forName:SDLNameX];
 }
 
 - (NSNumber<SDLFloat> *)x {
-    return [self objectForName:SDLNameX];
+    return [store sdl_objectForName:SDLNameX];
 }
 
 - (void)setY:(NSNumber<SDLFloat> *)y {
-    [self setObject:y forName:SDLNameY];
+    [store sdl_setObject:y forName:SDLNameY];
 }
 
 - (NSNumber<SDLFloat> *)y {
-    return [self objectForName:SDLNameY];
+    return [store sdl_objectForName:SDLNameY];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLTouchEvent.m b/SmartDeviceLink/SDLTouchEvent.m
index 90fc8ed08..855705fbf 100644
--- a/SmartDeviceLink/SDLTouchEvent.m
+++ b/SmartDeviceLink/SDLTouchEvent.m
@@ -10,23 +10,23 @@
 @implementation SDLTouchEvent
 
 - (void)setTouchEventId:(NSNumber<SDLInt> *)touchEventId {
-    [self setObject:touchEventId forName:SDLNameId];
+    [store sdl_setObject:touchEventId forName:SDLNameId];
 }
 
 - (NSNumber<SDLInt> *)touchEventId {
-    return [self objectForName:SDLNameId];
+    return [store sdl_objectForName:SDLNameId];
 }
 
 - (void)setTimeStamp:(NSMutableArray<NSNumber<SDLInt> *> *)timeStamp {
-    [self setObject:timeStamp forName:SDLNameTimestamp];
+    [store sdl_setObject:timeStamp forName:SDLNameTimestamp];
 }
 
 - (NSMutableArray<NSNumber<SDLInt> *> *)timeStamp {
-    return [self objectForName:SDLNameTimestamp];
+    return [store sdl_objectForName:SDLNameTimestamp];
 }
 
 - (void)setCoord:(NSMutableArray<SDLTouchCoord *> *)coord {
-    [self setObject:coord forName:SDLNameCoordinate];
+    [store sdl_setObject:coord forName:SDLNameCoordinate];
 }
 
 - (NSMutableArray<SDLTouchCoord *> *)coord {
diff --git a/SmartDeviceLink/SDLTouchEventCapabilities.m b/SmartDeviceLink/SDLTouchEventCapabilities.m
index 2a290590f..3eed2fdfd 100644
--- a/SmartDeviceLink/SDLTouchEventCapabilities.m
+++ b/SmartDeviceLink/SDLTouchEventCapabilities.m
@@ -9,27 +9,27 @@
 @implementation SDLTouchEventCapabilities
 
 - (void)setPressAvailable:(NSNumber<SDLBool> *)pressAvailable {
-    [self setObject:pressAvailable forName:SDLNamePressAvailable];
+    [store sdl_setObject:pressAvailable forName:SDLNamePressAvailable];
 }
 
 - (NSNumber<SDLBool> *)pressAvailable {
-    return [self objectForName:SDLNamePressAvailable];
+    return [store sdl_objectForName:SDLNamePressAvailable];
 }
 
 - (void)setMultiTouchAvailable:(NSNumber<SDLBool> *)multiTouchAvailable {
-    [self setObject:multiTouchAvailable forName:SDLNameMultiTouchAvailable];
+    [store sdl_setObject:multiTouchAvailable forName:SDLNameMultiTouchAvailable];
 }
 
 - (NSNumber<SDLBool> *)multiTouchAvailable {
-    return [self objectForName:SDLNameMultiTouchAvailable];
+    return [store sdl_objectForName:SDLNameMultiTouchAvailable];
 }
 
 - (void)setDoublePressAvailable:(NSNumber<SDLBool> *)doublePressAvailable {
-    [self setObject:doublePressAvailable forName:SDLNameDoublePressAvailable];
+    [store sdl_setObject:doublePressAvailable forName:SDLNameDoublePressAvailable];
 }
 
 - (NSNumber<SDLBool> *)doublePressAvailable {
-    return [self objectForName:SDLNameDoublePressAvailable];
+    return [store sdl_objectForName:SDLNameDoublePressAvailable];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLTurn.m b/SmartDeviceLink/SDLTurn.m
index bbbbda698..ddf7db1ee 100644
--- a/SmartDeviceLink/SDLTurn.m
+++ b/SmartDeviceLink/SDLTurn.m
@@ -22,15 +22,15 @@
 }
 
 - (void)setNavigationText:(NSString *)navigationText {
-    [self setObject:navigationText forName:SDLNameNavigationText];
+    [store sdl_setObject:navigationText forName:SDLNameNavigationText];
 }
 
 - (NSString *)navigationText {
-    return [self objectForName:SDLNameNavigationText];
+    return [store sdl_objectForName:SDLNameNavigationText];
 }
 
 - (void)setTurnIcon:(SDLImage *)turnIcon {
-    [self setObject:turnIcon forName:SDLNameTurnIcon];
+    [store sdl_setObject:turnIcon forName:SDLNameTurnIcon];
 }
 
 - (SDLImage *)turnIcon {
diff --git a/SmartDeviceLink/SDLUnsubscribeButton.m b/SmartDeviceLink/SDLUnsubscribeButton.m
index 861a7822b..70abb25d6 100644
--- a/SmartDeviceLink/SDLUnsubscribeButton.m
+++ b/SmartDeviceLink/SDLUnsubscribeButton.m
@@ -27,11 +27,11 @@
 }
 
 - (void)setButtonName:(SDLButtonName)buttonName {
-    [self setObject:buttonName forName:SDLNameButtonName];
+    [parameters sdl_setObject:buttonName forName:SDLNameButtonName];
 }
 
 - (SDLButtonName)buttonName {
-    NSObject *obj = [parameters objectForKey:SDLNameButtonName];
+    NSObject *obj = [parameters sdl_objectForName:SDLNameButtonName];
     return (SDLButtonName)obj;
 }
 
diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.m b/SmartDeviceLink/SDLUnsubscribeVehicleData.m
index cbc6b92d0..7c0b521e7 100644
--- a/SmartDeviceLink/SDLUnsubscribeVehicleData.m
+++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.m
@@ -49,195 +49,195 @@
 }
 
 - (void)setGps:(NSNumber<SDLBool> *)gps {
-    [self setObject:gps forName:SDLNameGPS];
+    [parameters sdl_setObject:gps forName:SDLNameGPS];
 }
 
 - (NSNumber<SDLBool> *)gps {
-    return [parameters objectForKey:SDLNameGPS];
+    return [parameters sdl_objectForName:SDLNameGPS];
 }
 
 - (void)setSpeed:(NSNumber<SDLBool> *)speed {
-    [self setObject:speed forName:SDLNameSpeed];
+    [parameters sdl_setObject:speed forName:SDLNameSpeed];
 }
 
 - (NSNumber<SDLBool> *)speed {
-    return [parameters objectForKey:SDLNameSpeed];
+    return [parameters sdl_objectForName:SDLNameSpeed];
 }
 
 - (void)setRpm:(NSNumber<SDLBool> *)rpm {
-    [self setObject:rpm forName:SDLNameRPM];
+    [parameters sdl_setObject:rpm forName:SDLNameRPM];
 }
 
 - (NSNumber<SDLBool> *)rpm {
-    return [parameters objectForKey:SDLNameRPM];
+    return [parameters sdl_objectForName:SDLNameRPM];
 }
 
 - (void)setFuelLevel:(NSNumber<SDLBool> *)fuelLevel {
-    [self setObject:fuelLevel forName:SDLNameFuelLevel];
+    [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel];
 }
 
 - (NSNumber<SDLBool> *)fuelLevel {
-    return [parameters objectForKey:SDLNameFuelLevel];
+    return [parameters sdl_objectForName:SDLNameFuelLevel];
 }
 
 - (void)setFuelLevel_State:(NSNumber<SDLBool> *)fuelLevel_State {
-    [self setObject:fuelLevel_State forName:SDLNameFuelLevelState];
+    [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState];
 }
 
 - (NSNumber<SDLBool> *)fuelLevel_State {
-    return [parameters objectForKey:SDLNameFuelLevelState];
+    return [parameters sdl_objectForName:SDLNameFuelLevelState];
 }
 
 - (void)setInstantFuelConsumption:(NSNumber<SDLBool> *)instantFuelConsumption {
-    [self setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
+    [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
 }
 
 - (NSNumber<SDLBool> *)instantFuelConsumption {
-    return [parameters objectForKey:SDLNameInstantFuelConsumption];
+    return [parameters sdl_objectForName:SDLNameInstantFuelConsumption];
 }
 
 - (void)setExternalTemperature:(NSNumber<SDLBool> *)externalTemperature {
-    [self setObject:externalTemperature forName:SDLNameExternalTemperature];
+    [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature];
 }
 
 - (NSNumber<SDLBool> *)externalTemperature {
-    return [parameters objectForKey:SDLNameExternalTemperature];
+    return [parameters sdl_objectForName:SDLNameExternalTemperature];
 }
 
 - (void)setPrndl:(NSNumber<SDLBool> *)prndl {
-    [self setObject:prndl forName:SDLNamePRNDL];
+    [parameters sdl_setObject:prndl forName:SDLNamePRNDL];
 }
 
 - (NSNumber<SDLBool> *)prndl {
-    return [parameters objectForKey:SDLNamePRNDL];
+    return [parameters sdl_objectForName:SDLNamePRNDL];
 }
 
 - (void)setTirePressure:(NSNumber<SDLBool> *)tirePressure {
-    [self setObject:tirePressure forName:SDLNameTirePressure];
+    [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure];
 }
 
 - (NSNumber<SDLBool> *)tirePressure {
-    return [parameters objectForKey:SDLNameTirePressure];
+    return [parameters sdl_objectForName:SDLNameTirePressure];
 }
 
 - (void)setOdometer:(NSNumber<SDLBool> *)odometer {
-    [self setObject:odometer forName:SDLNameOdometer];
+    [parameters sdl_setObject:odometer forName:SDLNameOdometer];
 }
 
 - (NSNumber<SDLBool> *)odometer {
-    return [parameters objectForKey:SDLNameOdometer];
+    return [parameters sdl_objectForName:SDLNameOdometer];
 }
 
 - (void)setBeltStatus:(NSNumber<SDLBool> *)beltStatus {
-    [self setObject:beltStatus forName:SDLNameBeltStatus];
+    [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus];
 }
 
 - (NSNumber<SDLBool> *)beltStatus {
-    return [parameters objectForKey:SDLNameBeltStatus];
+    return [parameters sdl_objectForName:SDLNameBeltStatus];
 }
 
 - (void)setBodyInformation:(NSNumber<SDLBool> *)bodyInformation {
-    [self setObject:bodyInformation forName:SDLNameBodyInformation];
+    [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation];
 }
 
 - (NSNumber<SDLBool> *)bodyInformation {
-    return [parameters objectForKey:SDLNameBodyInformation];
+    return [parameters sdl_objectForName:SDLNameBodyInformation];
 }
 
 - (void)setDeviceStatus:(NSNumber<SDLBool> *)deviceStatus {
-    [self setObject:deviceStatus forName:SDLNameDeviceStatus];
+    [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus];
 }
 
 - (NSNumber<SDLBool> *)deviceStatus {
-    return [parameters objectForKey:SDLNameDeviceStatus];
+    return [parameters sdl_objectForName:SDLNameDeviceStatus];
 }
 
 - (void)setDriverBraking:(NSNumber<SDLBool> *)driverBraking {
-    [self setObject:driverBraking forName:SDLNameDriverBraking];
+    [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking];
 }
 
 - (NSNumber<SDLBool> *)driverBraking {
-    return [parameters objectForKey:SDLNameDriverBraking];
+    return [parameters sdl_objectForName:SDLNameDriverBraking];
 }
 
 - (void)setWiperStatus:(NSNumber<SDLBool> *)wiperStatus {
-    [self setObject:wiperStatus forName:SDLNameWiperStatus];
+    [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus];
 }
 
 - (NSNumber<SDLBool> *)wiperStatus {
-    return [parameters objectForKey:SDLNameWiperStatus];
+    return [parameters sdl_objectForName:SDLNameWiperStatus];
 }
 
 - (void)setHeadLampStatus:(NSNumber<SDLBool> *)headLampStatus {
-    [self setObject:headLampStatus forName:SDLNameHeadLampStatus];
+    [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus];
 }
 
 - (NSNumber<SDLBool> *)headLampStatus {
-    return [parameters objectForKey:SDLNameHeadLampStatus];
+    return [parameters sdl_objectForName:SDLNameHeadLampStatus];
 }
 
 - (void)setEngineTorque:(NSNumber<SDLBool> *)engineTorque {
-    [self setObject:engineTorque forName:SDLNameEngineTorque];
+    [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque];
 }
 
 - (NSNumber<SDLBool> *)engineTorque {
-    return [parameters objectForKey:SDLNameEngineTorque];
+    return [parameters sdl_objectForName:SDLNameEngineTorque];
 }
 
 - (void)setAccPedalPosition:(NSNumber<SDLBool> *)accPedalPosition {
-    [self setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
+    [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
 }
 
 - (NSNumber<SDLBool> *)accPedalPosition {
-    return [parameters objectForKey:SDLNameAccelerationPedalPosition];
+    return [parameters sdl_objectForName:SDLNameAccelerationPedalPosition];
 }
 
 - (void)setSteeringWheelAngle:(NSNumber<SDLBool> *)steeringWheelAngle {
-    [self setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
+    [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
 }
 
 - (NSNumber<SDLBool> *)steeringWheelAngle {
-    return [parameters objectForKey:SDLNameSteeringWheelAngle];
+    return [parameters sdl_objectForName:SDLNameSteeringWheelAngle];
 }
 
 - (void)setECallInfo:(NSNumber<SDLBool> *)eCallInfo {
-    [self setObject:eCallInfo forName:SDLNameECallInfo];
+    [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo];
 }
 
 - (NSNumber<SDLBool> *)eCallInfo {
-    return [parameters objectForKey:SDLNameECallInfo];
+    return [parameters sdl_objectForName:SDLNameECallInfo];
 }
 
 - (void)setAirbagStatus:(NSNumber<SDLBool> *)airbagStatus {
-    [self setObject:airbagStatus forName:SDLNameAirbagStatus];
+    [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus];
 }
 
 - (NSNumber<SDLBool> *)airbagStatus {
-    return [parameters objectForKey:SDLNameAirbagStatus];
+    return [parameters sdl_objectForName:SDLNameAirbagStatus];
 }
 
 - (void)setEmergencyEvent:(NSNumber<SDLBool> *)emergencyEvent {
-    [self setObject:emergencyEvent forName:SDLNameEmergencyEvent];
+    [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent];
 }
 
 - (NSNumber<SDLBool> *)emergencyEvent {
-    return [parameters objectForKey:SDLNameEmergencyEvent];
+    return [parameters sdl_objectForName:SDLNameEmergencyEvent];
 }
 
 - (void)setClusterModeStatus:(NSNumber<SDLBool> *)clusterModeStatus {
-    [self setObject:clusterModeStatus forName:SDLNameClusterModeStatus];
+    [parameters sdl_setObject:clusterModeStatus forName:SDLNameClusterModeStatus];
 }
 
 - (NSNumber<SDLBool> *)clusterModeStatus {
-    return [parameters objectForKey:SDLNameClusterModeStatus];
+    return [parameters sdl_objectForName:SDLNameClusterModeStatus];
 }
 
 - (void)setMyKey:(NSNumber<SDLBool> *)myKey {
-    [self setObject:myKey forName:SDLNameMyKey];
+    [parameters sdl_setObject:myKey forName:SDLNameMyKey];
 }
 
 - (NSNumber<SDLBool> *)myKey {
-    return [parameters objectForKey:SDLNameMyKey];
+    return [parameters sdl_objectForName:SDLNameMyKey];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
index 74214628a..a5ccff022 100644
--- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
+++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
@@ -16,7 +16,7 @@
 }
 
 - (void)setGps:(SDLVehicleDataResult *)gps {
-    [self setObject:gps forName:SDLNameGPS];
+    [parameters sdl_setObject:gps forName:SDLNameGPS];
 }
 
 - (SDLVehicleDataResult *)gps {
@@ -29,7 +29,7 @@
 }
 
 - (void)setSpeed:(SDLVehicleDataResult *)speed {
-    [self setObject:speed forName:SDLNameSpeed];
+    [parameters sdl_setObject:speed forName:SDLNameSpeed];
 }
 
 - (SDLVehicleDataResult *)speed {
@@ -42,7 +42,7 @@
 }
 
 - (void)setRpm:(SDLVehicleDataResult *)rpm {
-    [self setObject:rpm forName:SDLNameRPM];
+    [parameters sdl_setObject:rpm forName:SDLNameRPM];
 }
 
 - (SDLVehicleDataResult *)rpm {
@@ -55,7 +55,7 @@
 }
 
 - (void)setFuelLevel:(SDLVehicleDataResult *)fuelLevel {
-    [self setObject:fuelLevel forName:SDLNameFuelLevel];
+    [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel];
 }
 
 - (SDLVehicleDataResult *)fuelLevel {
@@ -68,7 +68,7 @@
 }
 
 - (void)setFuelLevel_State:(SDLVehicleDataResult *)fuelLevel_State {
-    [self setObject:fuelLevel_State forName:SDLNameFuelLevelState];
+    [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState];
 }
 
 - (SDLVehicleDataResult *)fuelLevel_State {
@@ -81,7 +81,7 @@
 }
 
 - (void)setInstantFuelConsumption:(SDLVehicleDataResult *)instantFuelConsumption {
-    [self setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
+    [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
 }
 
 - (SDLVehicleDataResult *)instantFuelConsumption {
@@ -94,7 +94,7 @@
 }
 
 - (void)setExternalTemperature:(SDLVehicleDataResult *)externalTemperature {
-    [self setObject:externalTemperature forName:SDLNameExternalTemperature];
+    [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature];
 }
 
 - (SDLVehicleDataResult *)externalTemperature {
@@ -107,7 +107,7 @@
 }
 
 - (void)setPrndl:(SDLVehicleDataResult *)prndl {
-    [self setObject:prndl forName:SDLNamePRNDL];
+    [parameters sdl_setObject:prndl forName:SDLNamePRNDL];
 }
 
 - (SDLVehicleDataResult *)prndl {
@@ -120,7 +120,7 @@
 }
 
 - (void)setTirePressure:(SDLVehicleDataResult *)tirePressure {
-    [self setObject:tirePressure forName:SDLNameTirePressure];
+    [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure];
 }
 
 - (SDLVehicleDataResult *)tirePressure {
@@ -133,7 +133,7 @@
 }
 
 - (void)setOdometer:(SDLVehicleDataResult *)odometer {
-    [self setObject:odometer forName:SDLNameOdometer];
+    [parameters sdl_setObject:odometer forName:SDLNameOdometer];
 }
 
 - (SDLVehicleDataResult *)odometer {
@@ -146,7 +146,7 @@
 }
 
 - (void)setBeltStatus:(SDLVehicleDataResult *)beltStatus {
-    [self setObject:beltStatus forName:SDLNameBeltStatus];
+    [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus];
 }
 
 - (SDLVehicleDataResult *)beltStatus {
@@ -159,7 +159,7 @@
 }
 
 - (void)setBodyInformation:(SDLVehicleDataResult *)bodyInformation {
-    [self setObject:bodyInformation forName:SDLNameBodyInformation];
+    [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation];
 }
 
 - (SDLVehicleDataResult *)bodyInformation {
@@ -172,7 +172,7 @@
 }
 
 - (void)setDeviceStatus:(SDLVehicleDataResult *)deviceStatus {
-    [self setObject:deviceStatus forName:SDLNameDeviceStatus];
+    [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus];
 }
 
 - (SDLVehicleDataResult *)deviceStatus {
@@ -185,7 +185,7 @@
 }
 
 - (void)setDriverBraking:(SDLVehicleDataResult *)driverBraking {
-    [self setObject:driverBraking forName:SDLNameDriverBraking];
+    [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking];
 }
 
 - (SDLVehicleDataResult *)driverBraking {
@@ -198,7 +198,7 @@
 }
 
 - (void)setWiperStatus:(SDLVehicleDataResult *)wiperStatus {
-    [self setObject:wiperStatus forName:SDLNameWiperStatus];
+    [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus];
 }
 
 - (SDLVehicleDataResult *)wiperStatus {
@@ -211,7 +211,7 @@
 }
 
 - (void)setHeadLampStatus:(SDLVehicleDataResult *)headLampStatus {
-    [self setObject:headLampStatus forName:SDLNameHeadLampStatus];
+    [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus];
 }
 
 - (SDLVehicleDataResult *)headLampStatus {
@@ -224,7 +224,7 @@
 }
 
 - (void)setEngineTorque:(SDLVehicleDataResult *)engineTorque {
-    [self setObject:engineTorque forName:SDLNameEngineTorque];
+    [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque];
 }
 
 - (SDLVehicleDataResult *)engineTorque {
@@ -237,7 +237,7 @@
 }
 
 - (void)setAccPedalPosition:(SDLVehicleDataResult *)accPedalPosition {
-    [self setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
+    [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
 }
 
 - (SDLVehicleDataResult *)accPedalPosition {
@@ -250,7 +250,7 @@
 }
 
 - (void)setSteeringWheelAngle:(SDLVehicleDataResult *)steeringWheelAngle {
-    [self setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
+    [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
 }
 
 - (SDLVehicleDataResult *)steeringWheelAngle {
@@ -263,7 +263,7 @@
 }
 
 - (void)setECallInfo:(SDLVehicleDataResult *)eCallInfo {
-    [self setObject:eCallInfo forName:SDLNameECallInfo];
+    [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo];
 }
 
 - (SDLVehicleDataResult *)eCallInfo {
@@ -276,7 +276,7 @@
 }
 
 - (void)setAirbagStatus:(SDLVehicleDataResult *)airbagStatus {
-    [self setObject:airbagStatus forName:SDLNameAirbagStatus];
+    [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus];
 }
 
 - (SDLVehicleDataResult *)airbagStatus {
@@ -289,7 +289,7 @@
 }
 
 - (void)setEmergencyEvent:(SDLVehicleDataResult *)emergencyEvent {
-    [self setObject:emergencyEvent forName:SDLNameEmergencyEvent];
+    [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent];
 }
 
 - (SDLVehicleDataResult *)emergencyEvent {
@@ -302,7 +302,7 @@
 }
 
 - (void)setClusterModes:(SDLVehicleDataResult *)clusterModes {
-    [self setObject:clusterModes forName:SDLNameClusterModes];
+    [parameters sdl_setObject:clusterModes forName:SDLNameClusterModes];
 }
 
 - (SDLVehicleDataResult *)clusterModes {
@@ -315,7 +315,7 @@
 }
 
 - (void)setMyKey:(SDLVehicleDataResult *)myKey {
-    [self setObject:myKey forName:SDLNameMyKey];
+    [parameters sdl_setObject:myKey forName:SDLNameMyKey];
 }
 
 - (SDLVehicleDataResult *)myKey {
diff --git a/SmartDeviceLink/SDLUpdateTurnList.m b/SmartDeviceLink/SDLUpdateTurnList.m
index bd2ccf8d2..7fed41e48 100644
--- a/SmartDeviceLink/SDLUpdateTurnList.m
+++ b/SmartDeviceLink/SDLUpdateTurnList.m
@@ -29,11 +29,11 @@
 }
 
 - (void)setTurnList:(NSMutableArray<SDLTurn *> *)turnList {
-    [self setObject:turnList forName:SDLNameTurnList];
+    [parameters sdl_setObject:turnList forName:SDLNameTurnList];
 }
 
 - (NSMutableArray<SDLTurn *> *)turnList {
-    NSMutableArray<SDLTurn *> *array = [parameters objectForKey:SDLNameTurnList];
+    NSMutableArray<SDLTurn *> *array = [parameters sdl_objectForName:SDLNameTurnList];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTurn.class]) {
         return array;
     } else {
@@ -46,11 +46,11 @@
 }
 
 - (void)setSoftButtons:(NSMutableArray<SDLSoftButton *> *)softButtons {
-    [self setObject:softButtons forName:SDLNameSoftButtons];
+    [parameters sdl_setObject:softButtons forName:SDLNameSoftButtons];
 }
 
 - (NSMutableArray<SDLSoftButton *> *)softButtons {
-    NSMutableArray<SDLSoftButton *> *array = [parameters objectForKey:SDLNameSoftButtons];
+    NSMutableArray<SDLSoftButton *> *array = [parameters sdl_objectForName:SDLNameSoftButtons];
     if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) {
         return array;
     } else {
diff --git a/SmartDeviceLink/SDLVehicleDataResult.m b/SmartDeviceLink/SDLVehicleDataResult.m
index 21b01810e..280172f7f 100644
--- a/SmartDeviceLink/SDLVehicleDataResult.m
+++ b/SmartDeviceLink/SDLVehicleDataResult.m
@@ -8,19 +8,19 @@
 @implementation SDLVehicleDataResult
 
 - (void)setDataType:(SDLVehicleDataType)dataType {
-    [self setObject:dataType forName:SDLNameDataType];
+    [store sdl_setObject:dataType forName:SDLNameDataType];
 }
 
 - (SDLVehicleDataType)dataType {
-    return [self objectForName:SDLNameDataType];
+    return [store sdl_objectForName:SDLNameDataType];
 }
 
 - (void)setResultCode:(SDLVehicleDataResultCode)resultCode {
-    [self setObject:resultCode forName:SDLNameResultCode];
+    [store sdl_setObject:resultCode forName:SDLNameResultCode];
 }
 
 - (SDLVehicleDataResultCode)resultCode {
-    return [self objectForName:SDLNameResultCode];
+    return [store sdl_objectForName:SDLNameResultCode];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLVehicleType.m b/SmartDeviceLink/SDLVehicleType.m
index 7ef39d27f..cdab269bc 100644
--- a/SmartDeviceLink/SDLVehicleType.m
+++ b/SmartDeviceLink/SDLVehicleType.m
@@ -9,35 +9,35 @@
 @implementation SDLVehicleType
 
 - (void)setMake:(NSString *)make {
-    [self setObject:make forName:SDLNameMake];
+    [store sdl_setObject:make forName:SDLNameMake];
 }
 
 - (NSString *)make {
-    return [self objectForName:SDLNameMake];
+    return [store sdl_objectForName:SDLNameMake];
 }
 
 - (void)setModel:(NSString *)model {
-    [self setObject:model forName:SDLNameModel];
+    [store sdl_setObject:model forName:SDLNameModel];
 }
 
 - (NSString *)model {
-    return [self objectForName:SDLNameModel];
+    return [store sdl_objectForName:SDLNameModel];
 }
 
 - (void)setModelYear:(NSString *)modelYear {
-    [self setObject:modelYear forName:SDLNameModelYear];
+    [store sdl_setObject:modelYear forName:SDLNameModelYear];
 }
 
 - (NSString *)modelYear {
-    return [self objectForName:SDLNameModelYear];
+    return [store sdl_objectForName:SDLNameModelYear];
 }
 
 - (void)setTrim:(NSString *)trim {
-    [self setObject:trim forName:SDLNameTrim];
+    [store sdl_setObject:trim forName:SDLNameTrim];
 }
 
 - (NSString *)trim {
-    return [self objectForName:SDLNameTrim];
+    return [store sdl_objectForName:SDLNameTrim];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLVrHelpItem.m b/SmartDeviceLink/SDLVrHelpItem.m
index 6080e6ef0..ef47772a7 100644
--- a/SmartDeviceLink/SDLVrHelpItem.m
+++ b/SmartDeviceLink/SDLVrHelpItem.m
@@ -33,27 +33,27 @@
 }
 
 - (void)setText:(NSString *)text {
-    [self setObject:text forName:SDLNameText];
+    [store sdl_setObject:text forName:SDLNameText];
 }
 
 - (NSString *)text {
-    return [self objectForName:SDLNameText];
+    return [store sdl_objectForName:SDLNameText];
 }
 
 - (void)setImage:(SDLImage *)image {
-    [self setObject:image forName:SDLNameImage];
+    [store sdl_setObject:image forName:SDLNameImage];
 }
 
 - (SDLImage *)image {
-    return [self objectForName:SDLNameImage ofClass:SDLImage.class];
+    return [store sdl_objectForName:SDLNameImage ofClass:SDLImage.class];
 }
 
 - (void)setPosition:(NSNumber<SDLInt> *)position {
-    [self setObject:position forName:SDLNamePosition];
+    [store sdl_setObject:position forName:SDLNamePosition];
 }
 
 - (NSNumber<SDLInt> *)position {
-    return [self objectForName:SDLNamePosition];
+    return [store sdl_objectForName:SDLNamePosition];
 }
 
 @end