0261 'New vehicle data WindowStatus': apply review comments use [[x alloc] init] instead of [x new];

replace (nullable, strong, nonatomic) with (strong, nonatomic, nullable);
replace .to(beFalse()); with .to(equal(@NO)); in tests
replace .to(beTrue()); with .to(equal(@YES)); in tests
reorder header imports alphabetically

20 files changed, 903 insertions, 594 deletions

diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec
index 3c591e152..92037864f 100644
--- a/SmartDeviceLink-iOS.podspec
+++ b/SmartDeviceLink-iOS.podspec
@@ -450,6 +450,8 @@ ss.public_header_files = [
 'SmartDeviceLink/SDLWindowCapability.h',
 'SmartDeviceLink/SDLWindowType.h',
 'SmartDeviceLink/SDLWindowTypeCapabilities.h',
+'SmartDeviceLink/SDLWindowStatus.h',
+'SmartDeviceLink/SDLWindowState.h',
 'SmartDeviceLink/SmartDeviceLink.h',
 ]
 end
diff --git a/SmartDeviceLink.podspec b/SmartDeviceLink.podspec
index a525183f5..f4c0bd211 100644
--- a/SmartDeviceLink.podspec
+++ b/SmartDeviceLink.podspec
@@ -451,6 +451,8 @@ sdefault.public_header_files = [
 'SmartDeviceLink/SDLWindowCapability.h',
 'SmartDeviceLink/SDLWindowType.h',
 'SmartDeviceLink/SDLWindowTypeCapabilities.h',
+'SmartDeviceLink/SDLWindowStatus.h',
+'SmartDeviceLink/SDLWindowState.h',
 'SmartDeviceLink/SmartDeviceLink.h',
 ]
 end
diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h
index 992994093..f8a4c80cb 100644
--- a/SmartDeviceLink/SDLGetVehicleData.h
+++ b/SmartDeviceLink/SDLGetVehicleData.h
@@ -44,295 +44,355 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  *  Convenience init for getting data for all possible vehicle data items.
  *
- *  @param accelerationPedalPosition   Get accelerationPedalPosition data
- *  @param airbagStatus                Get airbagStatus data
- *  @param beltStatus                  Get beltStatus data
- *  @param bodyInformation             Get bodyInformation data
- *  @param clusterModeStatus           Get clusterModeStatus data
- *  @param deviceStatus                Get deviceStatus data
- *  @param driverBraking               Get driverBraking data
- *  @param eCallInfo                   Get eCallInfo data
- *  @param emergencyEvent              Get emergencyEvent data
- *  @param engineTorque                Get engineTorque data
- *  @param externalTemperature         Get externalTemperature data
- *  @param fuelLevel                   Get fuelLevel data
- *  @param fuelLevelState              Get fuelLevelState data
- *  @param gps                         Get gps data
- *  @param headLampStatus              Get headLampStatus data
- *  @param instantFuelConsumption      Get instantFuelConsumption data
- *  @param myKey                       Get myKey data
- *  @param odometer                    Get odometer data
- *  @param prndl                       Get prndl data
- *  @param rpm                         Get rpm data
- *  @param speed                       Get speed data
- *  @param steeringWheelAngle          Get steeringWheelAngle data
- *  @param tirePressure                Get tirePressure data
- *  @param vin                         Get vin data
- *  @param wiperStatus                 Get wiperStatus data
- *  @return                            A SDLGetVehicleData object
+ *  @param accelerationPedalPosition  Get accelerationPedalPosition data
+ *  @param airbagStatus  Get airbagStatus data
+ *  @param beltStatus  Get beltStatus data
+ *  @param bodyInformation  Get bodyInformation data
+ *  @param clusterModeStatus  Get clusterModeStatus data
+ *  @param deviceStatus  Get deviceStatus data
+ *  @param driverBraking  Get driverBraking data
+ *  @param eCallInfo  Get eCallInfo data
+ *  @param emergencyEvent  Get emergencyEvent data
+ *  @param engineTorque  Get engineTorque data
+ *  @param externalTemperature  Get externalTemperature data
+ *  @param fuelLevel  Get fuelLevel data
+ *  @param fuelLevelState  Get fuelLevelState data
+ *  @param gps  Get gps data
+ *  @param headLampStatus  Get headLampStatus data
+ *  @param instantFuelConsumption  Get instantFuelConsumption data
+ *  @param myKey  Get myKey data
+ *  @param odometer  Get odometer data
+ *  @param prndl  Get prndl data
+ *  @param rpm  Get rpm data
+ *  @param speed  Get speed data
+ *  @param steeringWheelAngle  Get steeringWheelAngle data
+ *  @param tirePressure  Get tirePressure data
+ *  @param vin  Get vin data
+ *  @param wiperStatus  Get wiperStatus data
+ *  @returnA SDLGetVehicleData object
  */
 - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo emergencyEvent:(BOOL)emergencyEvent engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure vin:(BOOL)vin wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:windowStatus: instead");
 
 /**
  *  Convenience init for getting data for all possible vehicle data items.
  *
- *  @param accelerationPedalPosition   Get accelerationPedalPosition data
- *  @param airbagStatus                Get airbagStatus data
- *  @param beltStatus                  Get beltStatus data
- *  @param bodyInformation             Get bodyInformation data
- *  @param clusterModeStatus           Get clusterModeStatus data
- *  @param deviceStatus                Get deviceStatus data
- *  @param driverBraking               Get driverBraking data
- *  @param eCallInfo                   Get eCallInfo data
+ *  @param accelerationPedalPosition  Get accelerationPedalPosition data
+ *  @param airbagStatus  Get airbagStatus data
+ *  @param beltStatus  Get beltStatus data
+ *  @param bodyInformation  Get bodyInformation data
+ *  @param clusterModeStatus  Get clusterModeStatus data
+ *  @param deviceStatus  Get deviceStatus data
+ *  @param driverBraking  Get driverBraking data
+ *  @param eCallInfo  Get eCallInfo data
  *  @param electronicParkBrakeStatus  Get electronicParkBrakeStatus data
- *  @param emergencyEvent              Get emergencyEvent data
- *  @param engineOilLife               Get engineOilLife data
- *  @param engineTorque                Get engineTorque data
- *  @param externalTemperature         Get externalTemperature data
- *  @param fuelLevel                   Get fuelLevel data
- *  @param fuelLevelState              Get fuelLevelState data
- *  @param fuelRange                   Get fuelRange data
- *  @param gps                         Get gps data
- *  @param headLampStatus              Get headLampStatus data
- *  @param instantFuelConsumption      Get instantFuelConsumption data
- *  @param myKey                       Get myKey data
- *  @param odometer                    Get odometer data
- *  @param prndl                       Get prndl data
- *  @param rpm                         Get rpm data
- *  @param speed                       Get speed data
- *  @param steeringWheelAngle          Get steeringWheelAngle data
- *  @param tirePressure                Get tirePressure data
- *  @param turnSignal                  Get turnSignal data
- *  @param vin                         Get vin data
- *  @param wiperStatus                 Get wiperStatus data
- *  @return                            A SDLGetVehicleData object
+ *  @param emergencyEvent  Get emergencyEvent data
+ *  @param engineOilLife  Get engineOilLife data
+ *  @param engineTorque  Get engineTorque data
+ *  @param externalTemperature  Get externalTemperature data
+ *  @param fuelLevel  Get fuelLevel data
+ *  @param fuelLevelState  Get fuelLevelState data
+ *  @param fuelRange  Get fuelRange data
+ *  @param gps  Get gps data
+ *  @param headLampStatus  Get headLampStatus data
+ *  @param instantFuelConsumption  Get instantFuelConsumption data
+ *  @param myKey  Get myKey data
+ *  @param odometer  Get odometer data
+ *  @param prndl  Get prndl data
+ *  @param rpm  Get rpm data
+ *  @param speed  Get speed data
+ *  @param steeringWheelAngle  Get steeringWheelAngle data
+ *  @param tirePressure  Get tirePressure data
+ *  @param turnSignal  Get turnSignal data
+ *  @param vin  Get vin data
+ *  @param wiperStatus  Get wiperStatus data
+ *  @return A SDLGetVehicleData object
  */
 - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal vin:(BOOL)vin wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:windowStatus: instead");
 
 /**
  *  Convenience init for getting data for all possible vehicle data items.
  *
- *  @param accelerationPedalPosition   Get accelerationPedalPosition data
- *  @param airbagStatus                Get airbagStatus data
- *  @param beltStatus                  Get beltStatus data
- *  @param bodyInformation             Get bodyInformation data
- *  @param cloudAppVehicleID           Get cloudAppVehicleID data
- *  @param clusterModeStatus           Get clusterModeStatus data
- *  @param deviceStatus                Get deviceStatus data
- *  @param driverBraking               Get driverBraking data
- *  @param eCallInfo                   Get eCallInfo data
- *  @param electronicParkBrakeStatus   Get electronicParkBrakeStatus data
- *  @param emergencyEvent              Get emergencyEvent data
- *  @param engineOilLife               Get engineOilLife data
- *  @param engineTorque                Get engineTorque data
- *  @param externalTemperature         Get externalTemperature data
- *  @param fuelLevel                   Get fuelLevel data
- *  @param fuelLevelState              Get fuelLevelState data
- *  @param fuelRange                   Get fuelRange data
- *  @param gps                         Get gps data
- *  @param headLampStatus              Get headLampStatus data
- *  @param instantFuelConsumption      Get instantFuelConsumption data
- *  @param myKey                       Get myKey data
- *  @param odometer                    Get odometer data
- *  @param prndl                       Get prndl data
- *  @param rpm                         Get rpm data
- *  @param speed                       Get speed data
- *  @param steeringWheelAngle          Get steeringWheelAngle data
- *  @param tirePressure                Get tirePressure data
- *  @param turnSignal                  Get turnSignal data
- *  @param vin                         Get vin data
- *  @param wiperStatus                 Get wiperStatus data
- *  @return                            A SDLGetVehicleData object
+ *  @param accelerationPedalPosition  Get accelerationPedalPosition data
+ *  @param airbagStatus  Get airbagStatus data
+ *  @param beltStatus  Get beltStatus data
+ *  @param bodyInformation  Get bodyInformation data
+ *  @param cloudAppVehicleID  Get cloudAppVehicleID data
+ *  @param clusterModeStatus  Get clusterModeStatus data
+ *  @param deviceStatus  Get deviceStatus data
+ *  @param driverBraking  Get driverBraking data
+ *  @param eCallInfo  Get eCallInfo data
+ *  @param electronicParkBrakeStatus  Get electronicParkBrakeStatus data
+ *  @param emergencyEvent  Get emergencyEvent data
+ *  @param engineOilLife  Get engineOilLife data
+ *  @param engineTorque  Get engineTorque data
+ *  @param externalTemperature  Get externalTemperature data
+ *  @param fuelLevel  Get fuelLevel data
+ *  @param fuelLevelState  Get fuelLevelState data
+ *  @param fuelRange  Get fuelRange data
+ *  @param gps  Get gps data
+ *  @param headLampStatus  Get headLampStatus data
+ *  @param instantFuelConsumption  Get instantFuelConsumption data
+ *  @param myKey  Get myKey data
+ *  @param odometer  Get odometer data
+ *  @param prndl  Get prndl data
+ *  @param rpm  Get rpm data
+ *  @param speed  Get speed data
+ *  @param steeringWheelAngle  Get steeringWheelAngle data
+ *  @param tirePressure  Get tirePressure data
+ *  @param turnSignal  Get turnSignal data
+ *  @param vin  Get vin data
+ *  @param wiperStatus  Get wiperStatus data
+ *  @return A SDLGetVehicleData object
  */
 - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation cloudAppVehicleID:(BOOL)cloudAppVehicleID clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal vin:(BOOL)vin wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:windowStatus: instead");
 
 /**
  *  Convenience init for getting data for all possible vehicle data items.
  *
- *  @param accelerationPedalPosition   Get accelerationPedalPosition data
- *  @param airbagStatus                Get airbagStatus data
- *  @param beltStatus                  Get beltStatus data
- *  @param bodyInformation             Get bodyInformation data
- *  @param cloudAppVehicleID           Get cloudAppVehicleID data
- *  @param clusterModeStatus           Get clusterModeStatus data
- *  @param deviceStatus                Get deviceStatus data
- *  @param driverBraking               Get driverBraking data
- *  @param eCallInfo                   Get eCallInfo data
- *  @param electronicParkBrakeStatus   Get electronicParkBrakeStatus data
- *  @param emergencyEvent              Get emergencyEvent data
- *  @param engineOilLife               Get engineOilLife data
- *  @param engineTorque                Get engineTorque data
- *  @param externalTemperature         Get externalTemperature data
- *  @param fuelLevel                   Get fuelLevel data
- *  @param fuelLevelState              Get fuelLevelState data
- *  @param fuelRange                   Get fuelRange data
- *  @param gps                         Get gps data
- *  @param headLampStatus              Get headLampStatus data
- *  @param instantFuelConsumption      Get instantFuelConsumption data
- *  @param myKey                       Get myKey data
- *  @param odometer                    Get odometer data
- *  @param prndl                       Get prndl data
- *  @param rpm                         Get rpm data
- *  @param speed                       Get speed data
- *  @param steeringWheelAngle          Get steeringWheelAngle data
- *  @param tirePressure                Get tirePressure data
- *  @param turnSignal                  Get turnSignal data
- *  @param vin                         Get vin data
- *  @param wiperStatus                 Get wiperStatus data
- *  @param windowStatus                 Get windowStatus data
- *  @return                            A SDLGetVehicleData object
+ *  @param accelerationPedalPosition  Get accelerationPedalPosition data
+ *  @param airbagStatus  Get airbagStatus data
+ *  @param beltStatus  Get beltStatus data
+ *  @param bodyInformation  Get bodyInformation data
+ *  @param cloudAppVehicleID  Get cloudAppVehicleID data
+ *  @param clusterModeStatus  Get clusterModeStatus data
+ *  @param deviceStatus  Get deviceStatus data
+ *  @param driverBraking  Get driverBraking data
+ *  @param eCallInfo  Get eCallInfo data
+ *  @param electronicParkBrakeStatus  Get electronicParkBrakeStatus data
+ *  @param emergencyEvent  Get emergencyEvent data
+ *  @param engineOilLife  Get engineOilLife data
+ *  @param engineTorque  Get engineTorque data
+ *  @param externalTemperature  Get externalTemperature data
+ *  @param fuelLevel  Get fuelLevel data
+ *  @param fuelLevelState  Get fuelLevelState data
+ *  @param fuelRange  Get fuelRange data
+ *  @param gps  Get gps data
+ *  @param headLampStatus  Get headLampStatus data
+ *  @param instantFuelConsumption  Get instantFuelConsumption data
+ *  @param myKey  Get myKey data
+ *  @param odometer  Get odometer data
+ *  @param prndl  Get prndl data
+ *  @param rpm  Get rpm data
+ *  @param speed  Get speed data
+ *  @param steeringWheelAngle  Get steeringWheelAngle data
+ *  @param tirePressure  Get tirePressure data
+ *  @param turnSignal  Get turnSignal data
+ *  @param vin  Get vin data
+ *  @param wiperStatus  Get wiperStatus data
+ *  @param windowStatus  Get windowStatus data
+ *  @return A SDLGetVehicleData object
  */
 - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation cloudAppVehicleID:(BOOL)cloudAppVehicleID clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal vin:(BOOL)vin wiperStatus:(BOOL)wiperStatus windowStatus:(BOOL)windowStatus;
 
 /**
  * A boolean value. If true, requests GPS data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *gps;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *gps;
 
 /**
  * A boolean value. If true, requests Speed data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *speed;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *speed;
 
 /**
  * A boolean value. If true, requests RPM data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *rpm;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *rpm;
 
 /**
  * A boolean value. If true, requests Fuel Level data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *fuelLevel;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel;
 
 /**
  * A boolean value. If true, requests Fuel Level State data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *fuelLevel_State;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel_State;
 
 /**
  * A boolean value. If true, requests Fuel Range data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *fuelRange;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelRange;
 
 /**
  * A boolean value. If true, requests Instant Fuel Consumption data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *instantFuelConsumption;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *instantFuelConsumption;
 
 /**
  * A boolean value. If true, requests External Temperature data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *externalTemperature;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *externalTemperature;
 
 /**
  * A boolean value. If true, requests the Vehicle Identification Number.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *vin;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *vin;
 
 /**
  * A boolean value. If true, requests PRNDL data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *prndl;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *prndl;
 
 /**
  * A boolean value. If true, requests Tire Pressure data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *tirePressure;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *tirePressure;
 
 /**
  * A boolean value. If true, requests Odometer data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *odometer;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *odometer;
 
 /**
  * A boolean value. If true, requests Belt Status data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *beltStatus;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *beltStatus;
 
 /**
  * A boolean value. If true, requests Body Information data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *bodyInformation;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *bodyInformation;
 
 /**
  * A boolean value. If true, requests Device Status data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *deviceStatus;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *deviceStatus;
 
 /**
  * A boolean value. If true, requests Driver Braking data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *driverBraking;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *driverBraking;
 
 /**
  * A boolean value. If true, requests Wiper Status data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *wiperStatus;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *wiperStatus;
 
 /**
  * A boolean value. If true, requests Head Lamp Status data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *headLampStatus;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *headLampStatus;
 
 /**
  * A boolean value. If true, requests Engine Oil Life data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *engineOilLife;
 
 /**
  * A boolean value. If true, requests Engine Torque data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *engineTorque;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *engineTorque;
 
 /**
  * A boolean value. If true, requests Acc Pedal Position data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *accPedalPosition;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *accPedalPosition;
 
 /**
  * A boolean value. If true, requests Steering Wheel Angle data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *steeringWheelAngle;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *steeringWheelAngle;
 
 /**
  * A boolean value. If true, requests Emergency Call Info data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *eCallInfo;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *eCallInfo;
 
 /**
  * A boolean value. If true, requests Air Bag Status data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *airbagStatus;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *airbagStatus;
 
 /**
  * A boolean value. If true, requests Emergency Event (if it occurred) data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *emergencyEvent;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *emergencyEvent;
 
 /**
  * A boolean value. If true, requests Cluster Mode Status data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *clusterModeStatus;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *clusterModeStatus;
 
 /**
  * A boolean value. If true, requests MyKey data.
+ *
+ * Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *myKey;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *myKey;
 
 /**
  A boolean value. If true, requests Electronic Parking Brake status data.
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *electronicParkBrakeStatus;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *electronicParkBrakeStatus;
 
 /**
  A boolean value. If true, requests Turn Signal data.
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *turnSignal;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *turnSignal;
 
 /**
  A boolean value. If true, requests the Cloud App Vehicle ID.
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *cloudAppVehicleID;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *cloudAppVehicleID;
 
 /**
  Sets the OEM custom vehicle data state for any given OEM custom vehicle data name.
@@ -357,9 +417,11 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * See WindowStatus
  *
+ * Optional.
+ *
  * @since SDL 6.2.0
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *windowStatus;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *windowStatus;
 
 @end
 
diff --git a/SmartDeviceLink/SDLGetVehicleData.m b/SmartDeviceLink/SDLGetVehicleData.m
index f881a9db4..379423eff 100644
--- a/SmartDeviceLink/SDLGetVehicleData.m
+++ b/SmartDeviceLink/SDLGetVehicleData.m
@@ -30,8 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "SDLGetVehicleData.h"
 #import "NSMutableDictionary+Store.h"
+#import "SDLGetVehicleData.h"
 #import "SDLRPCFunctionNames.h"
 #import "SDLRPCParameterNames.h"
 
diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h
index 87e46bfa8..8b05f7df7 100644
--- a/SmartDeviceLink/SDLGetVehicleDataResponse.h
+++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h
@@ -30,27 +30,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "SDLPRNDL.h"
-#import "SDLRPCResponse.h"
-#import "SDLWiperStatus.h"
-#import "SDLVehicleDataEventStatus.h"
 #import "SDLComponentVolumeStatus.h"
 #import "SDLElectronicParkBrakeStatus.h"
 #import "SDLTurnSignal.h"
+#import "SDLPRNDL.h"
+#import "SDLRPCResponse.h"
+#import "SDLVehicleDataEventStatus.h"
+#import "SDLWiperStatus.h"
 
-@class SDLFuelRange;
-@class SDLWindowStatus;
+@class SDLAirbagStatus;
+@class SDLBeltStatus;
 @class SDLBodyInformation;
-@class SDLEmergencyEvent;
 @class SDLClusterModeStatus;
-@class SDLHeadLampStatus;
 @class SDLDeviceStatus;
-@class SDLBeltStatus;
-@class SDLMyKey;
+@class SDLECallInfo;
+@class SDLEmergencyEvent;
+@class SDLFuelRange;
+@class SDLHeadLampStatus;
 @class SDLGPSData;
+@class SDLMyKey;
 @class SDLTireStatus;
-@class SDLECallInfo;
-@class SDLAirbagStatus;
+@class SDLWindowStatus;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -61,155 +61,213 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
   The car current GPS coordinates
+
+  Optional.
  */
-@property (nullable, strong, nonatomic) SDLGPSData *gps;
+@property (strong, nonatomic, nullable) SDLGPSData *gps;
 
 /**
  The vehicle speed in kilometers per hour
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *speed;
+@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *speed;
 
 /**
  The number of revolutions per minute of the engine.
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLInt> *rpm;
+@property (strong, nonatomic, nullable) NSNumber<SDLInt> *rpm;
 
 /**
  The fuel level in the tank (percentage)
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *fuelLevel;
+@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *fuelLevel;
 
 /**
  The fuel level state
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLComponentVolumeStatus fuelLevel_State;
+@property (strong, nonatomic, nullable) SDLComponentVolumeStatus fuelLevel_State;
 
 /**
  The estimate range in KM the vehicle can travel based on fuel level and consumption
 
  Optional, Array of length 0 - 100, of SDLFuelRange
  */
-@property (nullable, strong, nonatomic) NSArray<SDLFuelRange *> *fuelRange;
+@property (strong, nonatomic, nullable) NSArray<SDLFuelRange *> *fuelRange;
 
 /**
  The instantaneous fuel consumption in microlitres
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *instantFuelConsumption;
+@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *instantFuelConsumption;
 
 /**
  The external temperature in degrees celsius.
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *externalTemperature;
+@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *externalTemperature;
 
 /**
  The Vehicle Identification Number
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSString *vin;
+@property (strong, nonatomic, nullable) NSString *vin;
 
 /**
  The current gear shift state of the user's vehicle
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLPRNDL prndl;
+@property (strong, nonatomic, nullable) SDLPRNDL prndl;
 
 /**
  The current pressure warnings for the user's vehicle
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLTireStatus *tirePressure;
+@property (strong, nonatomic, nullable) SDLTireStatus *tirePressure;
 
 /**
  Odometer reading in km
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLInt> *odometer;
+@property (strong, nonatomic, nullable) NSNumber<SDLInt> *odometer;
 
 /**
  The status of the seat belts
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLBeltStatus *beltStatus;
+@property (strong, nonatomic, nullable) SDLBeltStatus *beltStatus;
 
 /**
  The body information including power modes
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLBodyInformation *bodyInformation;
+@property (strong, nonatomic, nullable) SDLBodyInformation *bodyInformation;
 
 /**
  The IVI system status including signal and battery strength
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLDeviceStatus *deviceStatus;
+@property (strong, nonatomic, nullable) SDLDeviceStatus *deviceStatus;
 
 /**
  The status of the brake pedal
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLVehicleDataEventStatus driverBraking;
+@property (strong, nonatomic, nullable) SDLVehicleDataEventStatus driverBraking;
 
 /**
  The status of the wipers
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLWiperStatus wiperStatus;
+@property (strong, nonatomic, nullable) SDLWiperStatus wiperStatus;
 
 /**
  Status of the head lamps
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLHeadLampStatus *headLampStatus;
+@property (strong, nonatomic, nullable) SDLHeadLampStatus *headLampStatus;
 
 /**
  The estimated percentage (0% - 100%) of remaining oil life of the engine
+
+ Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLFloat> *engineOilLife;
 
 /**
  Torque value for engine (in Nm) on non-diesel variants
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *engineTorque;
+@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *engineTorque;
 
 /**
  Accelerator pedal position (percentage depressed)
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *accPedalPosition;
+@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *accPedalPosition;
 
 /**
  Current angle of the steering wheel (in deg)
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *steeringWheelAngle;
+@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *steeringWheelAngle;
 
 /**
  Emergency Call notification and confirmation data
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLECallInfo *eCallInfo;
+@property (strong, nonatomic, nullable) SDLECallInfo *eCallInfo;
 
 /**
  The status of the air bags
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLAirbagStatus *airbagStatus;
+@property (strong, nonatomic, nullable) SDLAirbagStatus *airbagStatus;
 
 /**
  Information related to an emergency event (and if it occurred)
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLEmergencyEvent *emergencyEvent;
+@property (strong, nonatomic, nullable) SDLEmergencyEvent *emergencyEvent;
 
 /**
  The status modes of the cluster
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLClusterModeStatus *clusterModeStatus;
+@property (strong, nonatomic, nullable) SDLClusterModeStatus *clusterModeStatus;
 
 /**
  Information related to the MyKey feature
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLMyKey *myKey;
+@property (strong, nonatomic, nullable) SDLMyKey *myKey;
 
 /**
  The status of the electronic parking brake
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLElectronicParkBrakeStatus electronicParkBrakeStatus;
+@property (strong, nonatomic, nullable) SDLElectronicParkBrakeStatus electronicParkBrakeStatus;
 
 /**
  The status of the turn signal
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLTurnSignal turnSignal;
+@property (strong, nonatomic, nullable) SDLTurnSignal turnSignal;
 
 /**
  The cloud app vehicle ID
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSString *cloudAppVehicleID;
+@property (strong, nonatomic, nullable) NSString *cloudAppVehicleID;
 
 /**
  Sets the OEM custom vehicle data state for any given OEM custom vehicle data name.
@@ -234,9 +292,11 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * See WindowStatus
  *
+ * Optional.
+ *
  * @since SDL 6.2.0
  */
-@property (nullable, strong, nonatomic) NSArray<SDLWindowStatus *> *windowStatus;
+@property (strong, nonatomic, nullable) NSArray<SDLWindowStatus *> *windowStatus;
 
 @end
 
diff --git a/SmartDeviceLink/SDLOnVehicleData.h b/SmartDeviceLink/SDLOnVehicleData.h
index 486127116..d30ddf3c5 100644
--- a/SmartDeviceLink/SDLOnVehicleData.h
+++ b/SmartDeviceLink/SDLOnVehicleData.h
@@ -30,27 +30,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "SDLPRNDL.h"
-#import "SDLWiperStatus.h"
-#import "SDLVehicleDataEventStatus.h"
 #import "SDLComponentVolumeStatus.h"
-#import "SDLRPCNotification.h"
 #import "SDLElectronicParkBrakeStatus.h"
+#import "SDLPRNDL.h"
+#import "SDLRPCNotification.h"
 #import "SDLTurnSignal.h"
+#import "SDLVehicleDataEventStatus.h"
+#import "SDLWiperStatus.h"
 
-@class SDLFuelRange;
-@class SDLWindowStatus;
+@class SDLAirbagStatus;
+@class SDLBeltStatus;
 @class SDLBodyInformation;
-@class SDLEmergencyEvent;
 @class SDLClusterModeStatus;
-@class SDLHeadLampStatus;
 @class SDLDeviceStatus;
-@class SDLBeltStatus;
-@class SDLMyKey;
+@class SDLECallInfo;
+@class SDLEmergencyEvent;
+@class SDLFuelRange;
 @class SDLGPSData;
+@class SDLHeadLampStatus;
+@class SDLMyKey;
 @class SDLTireStatus;
-@class SDLECallInfo;
-@class SDLAirbagStatus;
+@class SDLWindowStatus;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -63,155 +63,213 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  The car current GPS coordinates
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLGPSData *gps;
+@property (strong, nonatomic, nullable) SDLGPSData *gps;
 
 /**
  The vehicle speed in kilometers per hour
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *speed;
+@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *speed;
 
 /**
  The number of revolutions per minute of the engine.
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLInt> *rpm;
+@property (strong, nonatomic, nullable) NSNumber<SDLInt> *rpm;
 
 /**
  The fuel level in the tank (percentage)
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *fuelLevel;
+@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *fuelLevel;
 
 /**
  The fuel level state
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLComponentVolumeStatus fuelLevel_State;
+@property (strong, nonatomic, nullable) SDLComponentVolumeStatus fuelLevel_State;
 
 /**
  The estimate range in KM the vehicle can travel based on fuel level and consumption
 
  Optional, Array of length 0 - 100, of SDLFuelRange
  */
-@property (nullable, strong, nonatomic) NSArray<SDLFuelRange *> *fuelRange;
+@property (strong, nonatomic, nullable) NSArray<SDLFuelRange *> *fuelRange;
 
 /**
  The instantaneous fuel consumption in microlitres
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *instantFuelConsumption;
+@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *instantFuelConsumption;
 
 /**
  The external temperature in degrees celsius.
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *externalTemperature;
+@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *externalTemperature;
 
 /**
  The Vehicle Identification Number
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSString *vin;
+@property (strong, nonatomic, nullable) NSString *vin;
 
 /**
  The current gear shift state of the user's vehicle
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLPRNDL prndl;
+@property (strong, nonatomic, nullable) SDLPRNDL prndl;
 
 /**
  The current pressure warnings for the user's vehicle
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLTireStatus *tirePressure;
+@property (strong, nonatomic, nullable) SDLTireStatus *tirePressure;
 
 /**
  Odometer reading in km
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLInt> *odometer;
+@property (strong, nonatomic, nullable) NSNumber<SDLInt> *odometer;
 
 /**
  The status of the seat belts
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLBeltStatus *beltStatus;
+@property (strong, nonatomic, nullable) SDLBeltStatus *beltStatus;
 
 /**
  The body information including power modes
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLBodyInformation *bodyInformation;
+@property (strong, nonatomic, nullable) SDLBodyInformation *bodyInformation;
 
 /**
  The IVI system status including signal and battery strength
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLDeviceStatus *deviceStatus;
+@property (strong, nonatomic, nullable) SDLDeviceStatus *deviceStatus;
 
 /**
  The status of the brake pedal
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLVehicleDataEventStatus driverBraking;
+@property (strong, nonatomic, nullable) SDLVehicleDataEventStatus driverBraking;
 
 /**
  The status of the wipers
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLWiperStatus wiperStatus;
+@property (strong, nonatomic, nullable) SDLWiperStatus wiperStatus;
 
 /**
  Status of the head lamps
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLHeadLampStatus *headLampStatus;
+@property (strong, nonatomic, nullable) SDLHeadLampStatus *headLampStatus;
 
 /**
  The estimated percentage (0% - 100%) of remaining oil life of the engine
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *engineOilLife;
+@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *engineOilLife;
 
 /**
  Torque value for engine (in Nm) on non-diesel variants
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *engineTorque;
+@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *engineTorque;
 
 /**
  Accelerator pedal position (percentage depressed)
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *accPedalPosition;
+@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *accPedalPosition;
 
 /**
  Current angle of the steering wheel (in deg)
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *steeringWheelAngle;
+@property (strong, nonatomic, nullable) NSNumber<SDLFloat> *steeringWheelAngle;
 
 /**
  Emergency Call notification and confirmation data
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLECallInfo *eCallInfo;
+@property (strong, nonatomic, nullable) SDLECallInfo *eCallInfo;
 
 /**
  The status of the air bags
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLAirbagStatus *airbagStatus;
+@property (strong, nonatomic, nullable) SDLAirbagStatus *airbagStatus;
 
 /**
  Information related to an emergency event (and if it occurred)
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLEmergencyEvent *emergencyEvent;
+@property (strong, nonatomic, nullable) SDLEmergencyEvent *emergencyEvent;
 
 /**
  The status modes of the cluster
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLClusterModeStatus *clusterModeStatus;
+@property (strong, nonatomic, nullable) SDLClusterModeStatus *clusterModeStatus;
 
 /**
  Information related to the MyKey feature
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLMyKey *myKey;
+@property (strong, nonatomic, nullable) SDLMyKey *myKey;
 
 /**
  The status of the electronic parking brake
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLElectronicParkBrakeStatus electronicParkBrakeStatus;
+@property (strong, nonatomic, nullable) SDLElectronicParkBrakeStatus electronicParkBrakeStatus;
 
 /**
  The status of the turn signal
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) SDLTurnSignal turnSignal;
+@property (strong, nonatomic, nullable) SDLTurnSignal turnSignal;
 
 /**
  The cloud app vehicle ID
+
+ Optional.
  */
-@property (nullable, strong, nonatomic) NSString *cloudAppVehicleID;
+@property (strong, nonatomic, nullable) NSString *cloudAppVehicleID;
 
 /**
  Sets the OEM custom vehicle data state for any given OEM custom vehicle data name.
@@ -236,9 +294,11 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * See WindowStatus
  *
+ * Optional.
+ *
  * @since SDL 6.2.0
  */
-@property (nullable, strong, nonatomic) NSArray<SDLWindowStatus *> *windowStatus;
+@property (strong, nonatomic, nullable) NSArray<SDLWindowStatus *> *windowStatus;
 
 @end
 
diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.h b/SmartDeviceLink/SDLSubscribeVehicleData.h
index 4ea5b6180..d972b7d7e 100644
--- a/SmartDeviceLink/SDLSubscribeVehicleData.h
+++ b/SmartDeviceLink/SDLSubscribeVehicleData.h
@@ -46,284 +46,342 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  *  Convenience init for subscribing to all possible vehicle data items.
  *
- *  @param accelerationPedalPosition    Subscribe to accelerationPedalPosition
- *  @param airbagStatus                 Subscribe to airbagStatus
- *  @param beltStatus                   Subscribe to beltStatus
- *  @param bodyInformation              Subscribe to bodyInformation
- *  @param clusterModeStatus            Subscribe to clusterModeStatus
- *  @param deviceStatus                 Subscribe to deviceStatus
- *  @param driverBraking                Subscribe to driverBraking
- *  @param eCallInfo                    Subscribe to eCallInfo
- *  @param emergencyEvent               Subscribe to emergencyEvent
- *  @param engineTorque                 Subscribe to engineTorque
- *  @param externalTemperature          Subscribe to externalTemperature
- *  @param fuelLevel                    Subscribe to fuelLevel
- *  @param fuelLevelState               Subscribe to fuelLevelState
- *  @param gps                          Subscribe to gps
- *  @param headLampStatus               Subscribe to headLampStatus
- *  @param instantFuelConsumption       Subscribe to instantFuelConsumption
- *  @param myKey                        Subscribe to myKey
- *  @param odometer                     Subscribe to odometer
- *  @param prndl                        Subscribe to prndl
- *  @param rpm                          Subscribe to rpm
- *  @param speed                        Subscribe to speed
- *  @param steeringWheelAngle           Subscribe to steeringWheelAngle
- *  @param tirePressure                 Subscribe to tirePressure
- *  @param wiperStatus                  Subscribe to wiperStatus
- *  @return                             A SDLSubscribeVehicleData object
+ *  @param accelerationPedalPosition Subscribe to accelerationPedalPosition
+ *  @param airbagStatus Subscribe to airbagStatus
+ *  @param beltStatus Subscribe to beltStatus
+ *  @param bodyInformation Subscribe to bodyInformation
+ *  @param clusterModeStatus Subscribe to clusterModeStatus
+ *  @param deviceStatus Subscribe to deviceStatus
+ *  @param driverBraking Subscribe to driverBraking
+ *  @param eCallInfo Subscribe to eCallInfo
+ *  @param emergencyEvent Subscribe to emergencyEvent
+ *  @param engineTorque Subscribe to engineTorque
+ *  @param externalTemperature Subscribe to externalTemperature
+ *  @param fuelLevel Subscribe to fuelLevel
+ *  @param fuelLevelState Subscribe to fuelLevelState
+ *  @param gps Subscribe to gps
+ *  @param headLampStatus Subscribe to headLampStatus
+ *  @param instantFuelConsumption Subscribe to instantFuelConsumption
+ *  @param myKey Subscribe to myKey
+ *  @param odometer Subscribe to odometer
+ *  @param prndl Subscribe to prndl
+ *  @param rpm Subscribe to rpm
+ *  @param speed Subscribe to speed
+ *  @param steeringWheelAngle Subscribe to steeringWheelAngle
+ *  @param tirePressure Subscribe to tirePressure
+ *  @param wiperStatus Subscribe to wiperStatus
+ *  @return A SDLSubscribeVehicleData object
  */
 - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo emergencyEvent:(BOOL)emergencyEvent engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:windowStatus: instead");
 
 /**
  *  Convenience init for subscribing to all possible vehicle data items.
  *
- *  @param accelerationPedalPosition    Subscribe to accelerationPedalPosition
- *  @param airbagStatus                 Subscribe to airbagStatus
- *  @param beltStatus                   Subscribe to beltStatus
- *  @param bodyInformation              Subscribe to bodyInformation
- *  @param clusterModeStatus            Subscribe to clusterModeStatus
- *  @param deviceStatus                 Subscribe to deviceStatus
- *  @param driverBraking                Subscribe to driverBraking
- *  @param eCallInfo                    Subscribe to eCallInfo
- *  @param electronicParkBrakeStatus    Subscribe to electronicParkBrakeStatus
- *  @param emergencyEvent               Subscribe to emergencyEvent
- *  @param engineOilLife                Subscribe to engineOilLife
- *  @param engineTorque                 Subscribe to engineTorque
- *  @param externalTemperature          Subscribe to externalTemperature
- *  @param fuelLevel                    Subscribe to fuelLevel
- *  @param fuelLevelState               Subscribe to fuelLevelState
- *  @param fuelRange                    Subscribe to fuelRange
- *  @param gps                          Subscribe to gps
- *  @param headLampStatus               Subscribe to headLampStatus
- *  @param instantFuelConsumption       Subscribe to instantFuelConsumption
- *  @param myKey                        Subscribe to myKey
- *  @param odometer                     Subscribe to odometer
- *  @param prndl                        Subscribe to prndl
- *  @param rpm                          Subscribe to rpm
- *  @param speed                        Subscribe to speed
- *  @param steeringWheelAngle           Subscribe to steeringWheelAngle
- *  @param tirePressure                 Subscribe to tirePressure
- *  @param turnSignal                   Subscribe to turnSignal
- *  @param wiperStatus                  Subscribe to wiperStatus
- *  @return                             A SDLSubscribeVehicleData object
+ *  @param accelerationPedalPosition Subscribe to accelerationPedalPosition
+ *  @param airbagStatus Subscribe to airbagStatus
+ *  @param beltStatus Subscribe to beltStatus
+ *  @param bodyInformation Subscribe to bodyInformation
+ *  @param clusterModeStatus Subscribe to clusterModeStatus
+ *  @param deviceStatus Subscribe to deviceStatus
+ *  @param driverBraking Subscribe to driverBraking
+ *  @param eCallInfo Subscribe to eCallInfo
+ *  @param electronicParkBrakeStatus Subscribe to electronicParkBrakeStatus
+ *  @param emergencyEvent Subscribe to emergencyEvent
+ *  @param engineOilLife Subscribe to engineOilLife
+ *  @param engineTorque Subscribe to engineTorque
+ *  @param externalTemperature Subscribe to externalTemperature
+ *  @param fuelLevel Subscribe to fuelLevel
+ *  @param fuelLevelState Subscribe to fuelLevelState
+ *  @param fuelRange Subscribe to fuelRange
+ *  @param gps Subscribe to gps
+ *  @param headLampStatus Subscribe to headLampStatus
+ *  @param instantFuelConsumption Subscribe to instantFuelConsumption
+ *  @param myKey Subscribe to myKey
+ *  @param odometer Subscribe to odometer
+ *  @param prndl Subscribe to prndl
+ *  @param rpm Subscribe to rpm
+ *  @param speed Subscribe to speed
+ *  @param steeringWheelAngle Subscribe to steeringWheelAngle
+ *  @param tirePressure Subscribe to tirePressure
+ *  @param turnSignal Subscribe to turnSignal
+ *  @param wiperStatus Subscribe to wiperStatus
+ *  @return A SDLSubscribeVehicleData object
  */
 - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:windowStatus: instead");
 
 /**
  *  Convenience init for subscribing to all possible vehicle data items.
  *
- *  @param accelerationPedalPosition    Subscribe to accelerationPedalPosition
- *  @param airbagStatus                 Subscribe to airbagStatus
- *  @param beltStatus                   Subscribe to beltStatus
- *  @param bodyInformation              Subscribe to bodyInformation
- *  @param cloudAppVehicleID            Subscribe to cloudAppVehicleID
- *  @param clusterModeStatus            Subscribe to clusterModeStatus
- *  @param deviceStatus                 Subscribe to deviceStatus
- *  @param driverBraking                Subscribe to driverBraking
- *  @param eCallInfo                    Subscribe to eCallInfo
- *  @param electronicParkBrakeStatus    Subscribe to electronicParkBrakeStatus
- *  @param emergencyEvent               Subscribe to emergencyEvent
- *  @param engineOilLife                Subscribe to engineOilLife
- *  @param engineTorque                 Subscribe to engineTorque
- *  @param externalTemperature          Subscribe to externalTemperature
- *  @param fuelLevel                    Subscribe to fuelLevel
- *  @param fuelLevelState               Subscribe to fuelLevelState
- *  @param fuelRange                    Subscribe to fuelRange
- *  @param gps                          Subscribe to gps
- *  @param headLampStatus               Subscribe to headLampStatus
- *  @param instantFuelConsumption       Subscribe to instantFuelConsumption
- *  @param myKey                        Subscribe to myKey
- *  @param odometer                     Subscribe to odometer
- *  @param prndl                        Subscribe to prndl
- *  @param rpm                          Subscribe to rpm
- *  @param speed                        Subscribe to speed
- *  @param steeringWheelAngle           Subscribe to steeringWheelAngle
- *  @param tirePressure                 Subscribe to tirePressure
- *  @param turnSignal                   Subscribe to turnSignal
- *  @param wiperStatus                  Subscribe to wiperStatus
- *  @return                             A SDLSubscribeVehicleData object
+ *  @param accelerationPedalPosition Subscribe to accelerationPedalPosition
+ *  @param airbagStatus Subscribe to airbagStatus
+ *  @param beltStatus Subscribe to beltStatus
+ *  @param bodyInformation Subscribe to bodyInformation
+ *  @param cloudAppVehicleID Subscribe to cloudAppVehicleID
+ *  @param clusterModeStatus Subscribe to clusterModeStatus
+ *  @param deviceStatus Subscribe to deviceStatus
+ *  @param driverBraking Subscribe to driverBraking
+ *  @param eCallInfo Subscribe to eCallInfo
+ *  @param electronicParkBrakeStatus Subscribe to electronicParkBrakeStatus
+ *  @param emergencyEvent Subscribe to emergencyEvent
+ *  @param engineOilLife Subscribe to engineOilLife
+ *  @param engineTorque Subscribe to engineTorque
+ *  @param externalTemperature Subscribe to externalTemperature
+ *  @param fuelLevel Subscribe to fuelLevel
+ *  @param fuelLevelState Subscribe to fuelLevelState
+ *  @param fuelRange Subscribe to fuelRange
+ *  @param gps Subscribe to gps
+ *  @param headLampStatus Subscribe to headLampStatus
+ *  @param instantFuelConsumption Subscribe to instantFuelConsumption
+ *  @param myKey Subscribe to myKey
+ *  @param odometer Subscribe to odometer
+ *  @param prndl Subscribe to prndl
+ *  @param rpm Subscribe to rpm
+ *  @param speed Subscribe to speed
+ *  @param steeringWheelAngle Subscribe to steeringWheelAngle
+ *  @param tirePressure Subscribe to tirePressure
+ *  @param turnSignal Subscribe to turnSignal
+ *  @param wiperStatus Subscribe to wiperStatus
+ *  @return A SDLSubscribeVehicleData object
  */
 - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation cloudAppVehicleID:(BOOL)cloudAppVehicleID clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:windowStatus: instead");
 
 /**
  *  Convenience init for subscribing to all possible vehicle data items.
  *
- *  @param accelerationPedalPosition    Subscribe to accelerationPedalPosition
- *  @param airbagStatus                 Subscribe to airbagStatus
- *  @param beltStatus                   Subscribe to beltStatus
- *  @param bodyInformation              Subscribe to bodyInformation
- *  @param cloudAppVehicleID            Subscribe to cloudAppVehicleID
- *  @param clusterModeStatus            Subscribe to clusterModeStatus
- *  @param deviceStatus                 Subscribe to deviceStatus
- *  @param driverBraking                Subscribe to driverBraking
- *  @param eCallInfo                    Subscribe to eCallInfo
- *  @param electronicParkBrakeStatus    Subscribe to electronicParkBrakeStatus
- *  @param emergencyEvent               Subscribe to emergencyEvent
- *  @param engineOilLife                Subscribe to engineOilLife
- *  @param engineTorque                 Subscribe to engineTorque
- *  @param externalTemperature          Subscribe to externalTemperature
- *  @param fuelLevel                    Subscribe to fuelLevel
- *  @param fuelLevelState               Subscribe to fuelLevelState
- *  @param fuelRange                    Subscribe to fuelRange
- *  @param gps                          Subscribe to gps
- *  @param headLampStatus               Subscribe to headLampStatus
- *  @param instantFuelConsumption       Subscribe to instantFuelConsumption
- *  @param myKey                        Subscribe to myKey
- *  @param odometer                     Subscribe to odometer
- *  @param prndl                        Subscribe to prndl
- *  @param rpm                          Subscribe to rpm
- *  @param speed                        Subscribe to speed
- *  @param steeringWheelAngle           Subscribe to steeringWheelAngle
- *  @param tirePressure                 Subscribe to tirePressure
- *  @param turnSignal                   Subscribe to turnSignal
- *  @param wiperStatus                  Subscribe to wiperStatus
- *  @param windowStatus                  Subscribe to windowStatus
- *  @return                             A SDLSubscribeVehicleData object
+ *  @param accelerationPedalPosition Subscribe to accelerationPedalPosition
+ *  @param airbagStatus Subscribe to airbagStatus
+ *  @param beltStatus Subscribe to beltStatus
+ *  @param bodyInformation Subscribe to bodyInformation
+ *  @param cloudAppVehicleID Subscribe to cloudAppVehicleID
+ *  @param clusterModeStatus Subscribe to clusterModeStatus
+ *  @param deviceStatus Subscribe to deviceStatus
+ *  @param driverBraking Subscribe to driverBraking
+ *  @param eCallInfo Subscribe to eCallInfo
+ *  @param electronicParkBrakeStatus Subscribe to electronicParkBrakeStatus
+ *  @param emergencyEvent Subscribe to emergencyEvent
+ *  @param engineOilLife Subscribe to engineOilLife
+ *  @param engineTorque Subscribe to engineTorque
+ *  @param externalTemperature Subscribe to externalTemperature
+ *  @param fuelLevel Subscribe to fuelLevel
+ *  @param fuelLevelState Subscribe to fuelLevelState
+ *  @param fuelRange Subscribe to fuelRange
+ *  @param gps Subscribe to gps
+ *  @param headLampStatus Subscribe to headLampStatus
+ *  @param instantFuelConsumption Subscribe to instantFuelConsumption
+ *  @param myKey Subscribe to myKey
+ *  @param odometer Subscribe to odometer
+ *  @param prndl Subscribe to prndl
+ *  @param rpm Subscribe to rpm
+ *  @param speed Subscribe to speed
+ *  @param steeringWheelAngle Subscribe to steeringWheelAngle
+ *  @param tirePressure Subscribe to tirePressure
+ *  @param turnSignal Subscribe to turnSignal
+ *  @param wiperStatus Subscribe to wiperStatus
+ *  @param windowStatus Subscribe to windowStatus
+ *  @return A SDLSubscribeVehicleData object
  */
 - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation cloudAppVehicleID:(BOOL)cloudAppVehicleID clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus windowStatus:(BOOL)windowStatus;
 
 /**
  * A boolean value. If true, subscribes GPS data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *gps;
 
 /**
  * A boolean value. If true, subscribes Speed data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *speed;
 
 /**
  * A boolean value. If true, subscribes RPM data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *rpm;
 
 /**
  * A boolean value. If true, subscribes Fuel Level data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel;
 
 /**
  * A boolean value. If true, subscribes Fuel Level State data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel_State;
 
 /**
  * A boolean value. If true, subscribes Fuel Range data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelRange;
 
 /**
  * A boolean value. If true, subscribes Instant Fuel Consumption data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *instantFuelConsumption;
 
 /**
  * A boolean value. If true, subscribes External Temperature data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *externalTemperature;
 
 /**
  * A boolean value. If true, subscribes PRNDL data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *prndl;
 
 /**
  * A boolean value. If true, subscribes Tire Pressure status data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *tirePressure;
 
 /**
  * A boolean value. If true, subscribes Odometer data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *odometer;
 
 /**
  * A boolean value. If true, subscribes Belt Status data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *beltStatus;
 
 /**
  * A boolean value. If true, subscribes Body Information data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *bodyInformation;
 
 /**
  * A boolean value. If true, subscribes Device Status data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *deviceStatus;
 
 /**
  * A boolean value. If true, subscribes Driver Braking data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *driverBraking;
 
 /**
  * A boolean value. If true, subscribes Wiper Status data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *wiperStatus;
 
 /**
  * A boolean value. If true, subscribes Head Lamp Status data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *headLampStatus;
 
 /**
  * A boolean value. If true, subscribes to Engine Oil Life data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *engineOilLife;
 
 /**
  * A boolean value. If true, subscribes Engine Torque data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *engineTorque;
 
 /**
  * A boolean value. If true, subscribes Acc Pedal Position data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *accPedalPosition;
 
 /**
  * A boolean value. If true, subscribes Steering Wheel Angle data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *steeringWheelAngle;
 
 /**
  * A boolean value. If true, subscribes eCall Info data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *eCallInfo;
 
 /**
  * A boolean value. If true, subscribes Airbag Status data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *airbagStatus;
 
 /**
  * A boolean value. If true, subscribes Emergency Event data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *emergencyEvent;
 
 /**
  * A boolean value. If true, subscribes Cluster Mode Status data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *clusterModeStatus;
 
 /**
  * A boolean value. If true, subscribes myKey data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *myKey;
 
 /**
  * A boolean value. If true, subscribes to the electronic parking brake status.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *electronicParkBrakeStatus;
 
 /**
  * A boolean value. If true, subscribes to the turn signal status.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *turnSignal;
 
 /**
  * A boolean value. If true, subscribes to the cloud app vehicle ID.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *cloudAppVehicleID;
 
@@ -350,9 +408,11 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * See WindowStatus
  *
+ * Optional.
+ *
  * @since SDL 6.2.0
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *windowStatus;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *windowStatus;
 
 @end
 
diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h
index bd3cefaf3..4e1e06768 100644
--- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h
+++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h
@@ -267,9 +267,11 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * See WindowStatus
  *
+ * Optional.
+ *
  * @since SDL 6.2.0
  */
-@property (nullable, strong, nonatomic) SDLVehicleDataResult *windowStatus;
+@property (strong, nonatomic, nullable) SDLVehicleDataResult *windowStatus;
 
 @end
 
diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.h b/SmartDeviceLink/SDLUnsubscribeVehicleData.h
index 7b5df4464..e132b3d4a 100644
--- a/SmartDeviceLink/SDLUnsubscribeVehicleData.h
+++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.h
@@ -44,284 +44,342 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  *  Convenience init for unsubscribing to all possible vehicle data items.
  *
- *  @param accelerationPedalPosition    Unsubscribe to accelerationPedalPosition
- *  @param airbagStatus                 Unsubscribe to airbagStatus
- *  @param beltStatus                   Unsubscribe to beltStatus
- *  @param bodyInformation              Unsubscribe to bodyInformation
- *  @param clusterModeStatus            Unsubscribe to clusterModeStatus
- *  @param deviceStatus                 Unsubscribe to deviceStatus
- *  @param driverBraking                Unsubscribe to driverBraking
- *  @param eCallInfo                    Unsubscribe to eCallInfo
- *  @param emergencyEvent               Unsubscribe to emergencyEvent
- *  @param engineTorque                 Unsubscribe to engineTorque
- *  @param externalTemperature          Unsubscribe to externalTemperature
- *  @param fuelLevel                    Unsubscribe to fuelLevel
- *  @param fuelLevelState               Unsubscribe to fuelLevelState
- *  @param gps                          Unsubscribe to gps
- *  @param headLampStatus               Unsubscribe to headLampStatus
- *  @param instantFuelConsumption       Unsubscribe to instantFuelConsumption
- *  @param myKey                        Unsubscribe to myKey
- *  @param odometer                     Unsubscribe to odometer
- *  @param prndl                        Unsubscribe to prndl
- *  @param rpm                          Unsubscribe to rpm
- *  @param speed                        Unsubscribe to speed
- *  @param steeringWheelAngle           Unsubscribe to steeringWheelAngle
- *  @param tirePressure                 Unsubscribe to tirePressure
- *  @param wiperStatus                  Unsubscribe to wiperStatus
- *  @return                             A SDLUnsubscribeVehicleData object
+ *  @param accelerationPedalPosition Unsubscribe to accelerationPedalPosition
+ *  @param airbagStatus Unsubscribe to airbagStatus
+ *  @param beltStatus Unsubscribe to beltStatus
+ *  @param bodyInformation Unsubscribe to bodyInformation
+ *  @param clusterModeStatus Unsubscribe to clusterModeStatus
+ *  @param deviceStatus Unsubscribe to deviceStatus
+ *  @param driverBraking Unsubscribe to driverBraking
+ *  @param eCallInfo Unsubscribe to eCallInfo
+ *  @param emergencyEvent Unsubscribe to emergencyEvent
+ *  @param engineTorque Unsubscribe to engineTorque
+ *  @param externalTemperature Unsubscribe to externalTemperature
+ *  @param fuelLevel Unsubscribe to fuelLevel
+ *  @param fuelLevelState Unsubscribe to fuelLevelState
+ *  @param gps Unsubscribe to gps
+ *  @param headLampStatus Unsubscribe to headLampStatus
+ *  @param instantFuelConsumption Unsubscribe to instantFuelConsumption
+ *  @param myKey Unsubscribe to myKey
+ *  @param odometer Unsubscribe to odometer
+ *  @param prndl Unsubscribe to prndl
+ *  @param rpm Unsubscribe to rpm
+ *  @param speed Unsubscribe to speed
+ *  @param steeringWheelAngle Unsubscribe to steeringWheelAngle
+ *  @param tirePressure Unsubscribe to tirePressure
+ *  @param wiperStatus Unsubscribe to wiperStatus
+ *  @return A SDLUnsubscribeVehicleData object
  */
 - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo emergencyEvent:(BOOL)emergencyEvent engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:windowStatus: instead");
 
 /**
  *  Convenience init for unsubscribing to all possible vehicle data items.
  *
- *  @param accelerationPedalPosition    Unsubscribe to accelerationPedalPosition
- *  @param airbagStatus                 Unsubscribe to airbagStatus
- *  @param beltStatus                   Unsubscribe to beltStatus
- *  @param bodyInformation              Unsubscribe to bodyInformation
- *  @param clusterModeStatus            Unsubscribe to clusterModeStatus
- *  @param deviceStatus                 Unsubscribe to deviceStatus
- *  @param driverBraking                Unsubscribe to driverBraking
- *  @param eCallInfo                    Unsubscribe to eCallInfo
- *  @param electronicParkBrakeStatus    Unsubscribe to electronicParkBrakeStatus
- *  @param emergencyEvent               Unsubscribe to emergencyEvent
- *  @param engineOilLife                Unsubscribe to engineOilLife
- *  @param engineTorque                 Unsubscribe to engineTorque
- *  @param externalTemperature          Unsubscribe to externalTemperature
- *  @param fuelLevel                    Unsubscribe to fuelLevel
- *  @param fuelLevelState               Unsubscribe to fuelLevelState
- *  @param fuelRange                    Unsubscribe to fuelRange
- *  @param gps                          Unsubscribe to gps
- *  @param headLampStatus               Unsubscribe to headLampStatus
- *  @param instantFuelConsumption       Unsubscribe to instantFuelConsumption
- *  @param myKey                        Unsubscribe to myKey
- *  @param odometer                     Unsubscribe to odometer
- *  @param prndl                        Unsubscribe to prndl
- *  @param rpm                          Unsubscribe to rpm
- *  @param speed                        Unsubscribe to speed
- *  @param steeringWheelAngle           Unsubscribe to steeringWheelAngle
- *  @param tirePressure                 Unsubscribe to tirePressure
- *  @param turnSignal                   Unsubscribe to turnSignal
- *  @param wiperStatus                  Unsubscribe to wiperStatus
- *  @return                             A SDLUnsubscribeVehicleData object
+ *  @param accelerationPedalPosition Unsubscribe to accelerationPedalPosition
+ *  @param airbagStatus Unsubscribe to airbagStatus
+ *  @param beltStatus Unsubscribe to beltStatus
+ *  @param bodyInformation Unsubscribe to bodyInformation
+ *  @param clusterModeStatus Unsubscribe to clusterModeStatus
+ *  @param deviceStatus Unsubscribe to deviceStatus
+ *  @param driverBraking Unsubscribe to driverBraking
+ *  @param eCallInfo Unsubscribe to eCallInfo
+ *  @param electronicParkBrakeStatus Unsubscribe to electronicParkBrakeStatus
+ *  @param emergencyEvent Unsubscribe to emergencyEvent
+ *  @param engineOilLife Unsubscribe to engineOilLife
+ *  @param engineTorque Unsubscribe to engineTorque
+ *  @param externalTemperature Unsubscribe to externalTemperature
+ *  @param fuelLevel Unsubscribe to fuelLevel
+ *  @param fuelLevelState Unsubscribe to fuelLevelState
+ *  @param fuelRange Unsubscribe to fuelRange
+ *  @param gps Unsubscribe to gps
+ *  @param headLampStatus Unsubscribe to headLampStatus
+ *  @param instantFuelConsumption Unsubscribe to instantFuelConsumption
+ *  @param myKey Unsubscribe to myKey
+ *  @param odometer Unsubscribe to odometer
+ *  @param prndl Unsubscribe to prndl
+ *  @param rpm Unsubscribe to rpm
+ *  @param speed Unsubscribe to speed
+ *  @param steeringWheelAngle Unsubscribe to steeringWheelAngle
+ *  @param tirePressure Unsubscribe to tirePressure
+ *  @param turnSignal Unsubscribe to turnSignal
+ *  @param wiperStatus Unsubscribe to wiperStatus
+ *  @return A SDLUnsubscribeVehicleData object
  */
 - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:windowStatus: instead");
 
 /**
  *  Convenience init for unsubscribing to all possible vehicle data items.
  *
- *  @param accelerationPedalPosition    Unsubscribe to accelerationPedalPosition
- *  @param airbagStatus                 Unsubscribe to airbagStatus
- *  @param beltStatus                   Unsubscribe to beltStatus
- *  @param bodyInformation              Unsubscribe to bodyInformation
- *  @param cloudAppVehicleID            Unsubscribe to cloudAppVehicleID
- *  @param clusterModeStatus            Unsubscribe to clusterModeStatus
- *  @param deviceStatus                 Unsubscribe to deviceStatus
- *  @param driverBraking                Unsubscribe to driverBraking
- *  @param eCallInfo                    Unsubscribe to eCallInfo
- *  @param electronicParkBrakeStatus    Unsubscribe to electronicParkBrakeStatus
- *  @param emergencyEvent               Unsubscribe to emergencyEvent
- *  @param engineOilLife                Unsubscribe to engineOilLife
- *  @param engineTorque                 Unsubscribe to engineTorque
- *  @param externalTemperature          Unsubscribe to externalTemperature
- *  @param fuelLevel                    Unsubscribe to fuelLevel
- *  @param fuelLevelState               Unsubscribe to fuelLevelState
- *  @param fuelRange                    Unsubscribe to fuelRange
- *  @param gps                          Unsubscribe to gps
- *  @param headLampStatus               Unsubscribe to headLampStatus
- *  @param instantFuelConsumption       Unsubscribe to instantFuelConsumption
- *  @param myKey                        Unsubscribe to myKey
- *  @param odometer                     Unsubscribe to odometer
- *  @param prndl                        Unsubscribe to prndl
- *  @param rpm                          Unsubscribe to rpm
- *  @param speed                        Unsubscribe to speed
- *  @param steeringWheelAngle           Unsubscribe to steeringWheelAngle
- *  @param tirePressure                 Unsubscribe to tirePressure
- *  @param turnSignal                   Unsubscribe to turnSignal
- *  @param wiperStatus                  Unsubscribe to wiperStatus
- *  @return                             A SDLUnsubscribeVehicleData object
+ *  @param accelerationPedalPosition Unsubscribe to accelerationPedalPosition
+ *  @param airbagStatus Unsubscribe to airbagStatus
+ *  @param beltStatus Unsubscribe to beltStatus
+ *  @param bodyInformation Unsubscribe to bodyInformation
+ *  @param cloudAppVehicleID Unsubscribe to cloudAppVehicleID
+ *  @param clusterModeStatus Unsubscribe to clusterModeStatus
+ *  @param deviceStatus Unsubscribe to deviceStatus
+ *  @param driverBraking Unsubscribe to driverBraking
+ *  @param eCallInfo Unsubscribe to eCallInfo
+ *  @param electronicParkBrakeStatus Unsubscribe to electronicParkBrakeStatus
+ *  @param emergencyEvent Unsubscribe to emergencyEvent
+ *  @param engineOilLife Unsubscribe to engineOilLife
+ *  @param engineTorque Unsubscribe to engineTorque
+ *  @param externalTemperature Unsubscribe to externalTemperature
+ *  @param fuelLevel Unsubscribe to fuelLevel
+ *  @param fuelLevelState Unsubscribe to fuelLevelState
+ *  @param fuelRange Unsubscribe to fuelRange
+ *  @param gps Unsubscribe to gps
+ *  @param headLampStatus Unsubscribe to headLampStatus
+ *  @param instantFuelConsumption Unsubscribe to instantFuelConsumption
+ *  @param myKey Unsubscribe to myKey
+ *  @param odometer Unsubscribe to odometer
+ *  @param prndl Unsubscribe to prndl
+ *  @param rpm Unsubscribe to rpm
+ *  @param speed Unsubscribe to speed
+ *  @param steeringWheelAngle Unsubscribe to steeringWheelAngle
+ *  @param tirePressure Unsubscribe to tirePressure
+ *  @param turnSignal Unsubscribe to turnSignal
+ *  @param wiperStatus Unsubscribe to wiperStatus
+ *  @return A SDLUnsubscribeVehicleData object
  */
 - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation  cloudAppVehicleID:(BOOL)cloudAppVehicleID clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus __deprecated_msg("Use initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:windowStatus: instead");
 
 /**
  *  Convenience init for unsubscribing to all possible vehicle data items.
  *
- *  @param accelerationPedalPosition    Unsubscribe to accelerationPedalPosition
- *  @param airbagStatus                 Unsubscribe to airbagStatus
- *  @param beltStatus                   Unsubscribe to beltStatus
- *  @param bodyInformation              Unsubscribe to bodyInformation
- *  @param cloudAppVehicleID            Unsubscribe to cloudAppVehicleID
- *  @param clusterModeStatus            Unsubscribe to clusterModeStatus
- *  @param deviceStatus                 Unsubscribe to deviceStatus
- *  @param driverBraking                Unsubscribe to driverBraking
- *  @param eCallInfo                    Unsubscribe to eCallInfo
- *  @param electronicParkBrakeStatus    Unsubscribe to electronicParkBrakeStatus
- *  @param emergencyEvent               Unsubscribe to emergencyEvent
- *  @param engineOilLife                Unsubscribe to engineOilLife
- *  @param engineTorque                 Unsubscribe to engineTorque
- *  @param externalTemperature          Unsubscribe to externalTemperature
- *  @param fuelLevel                    Unsubscribe to fuelLevel
- *  @param fuelLevelState               Unsubscribe to fuelLevelState
- *  @param fuelRange                    Unsubscribe to fuelRange
- *  @param gps                          Unsubscribe to gps
- *  @param headLampStatus               Unsubscribe to headLampStatus
- *  @param instantFuelConsumption       Unsubscribe to instantFuelConsumption
- *  @param myKey                        Unsubscribe to myKey
- *  @param odometer                     Unsubscribe to odometer
- *  @param prndl                        Unsubscribe to prndl
- *  @param rpm                          Unsubscribe to rpm
- *  @param speed                        Unsubscribe to speed
- *  @param steeringWheelAngle           Unsubscribe to steeringWheelAngle
- *  @param tirePressure                 Unsubscribe to tirePressure
- *  @param turnSignal                   Unsubscribe to turnSignal
- *  @param wiperStatus                  Unsubscribe to wiperStatus
- *  @param windowStatus                  Unsubscribe from windowStatus
- *  @return                             A SDLUnsubscribeVehicleData object
+ *  @param accelerationPedalPosition Unsubscribe to accelerationPedalPosition
+ *  @param airbagStatus Unsubscribe to airbagStatus
+ *  @param beltStatus Unsubscribe to beltStatus
+ *  @param bodyInformation Unsubscribe to bodyInformation
+ *  @param cloudAppVehicleID Unsubscribe to cloudAppVehicleID
+ *  @param clusterModeStatus Unsubscribe to clusterModeStatus
+ *  @param deviceStatus Unsubscribe to deviceStatus
+ *  @param driverBraking Unsubscribe to driverBraking
+ *  @param eCallInfo Unsubscribe to eCallInfo
+ *  @param electronicParkBrakeStatus Unsubscribe to electronicParkBrakeStatus
+ *  @param emergencyEvent Unsubscribe to emergencyEvent
+ *  @param engineOilLife Unsubscribe to engineOilLife
+ *  @param engineTorque Unsubscribe to engineTorque
+ *  @param externalTemperature Unsubscribe to externalTemperature
+ *  @param fuelLevel Unsubscribe to fuelLevel
+ *  @param fuelLevelState Unsubscribe to fuelLevelState
+ *  @param fuelRange Unsubscribe to fuelRange
+ *  @param gps Unsubscribe to gps
+ *  @param headLampStatus Unsubscribe to headLampStatus
+ *  @param instantFuelConsumption Unsubscribe to instantFuelConsumption
+ *  @param myKey Unsubscribe to myKey
+ *  @param odometer Unsubscribe to odometer
+ *  @param prndl Unsubscribe to prndl
+ *  @param rpm Unsubscribe to rpm
+ *  @param speed Unsubscribe to speed
+ *  @param steeringWheelAngle Unsubscribe to steeringWheelAngle
+ *  @param tirePressure Unsubscribe to tirePressure
+ *  @param turnSignal Unsubscribe to turnSignal
+ *  @param wiperStatus Unsubscribe to wiperStatus
+ *  @param windowStatus Unsubscribe from windowStatus
+ *  @return A SDLUnsubscribeVehicleData object
  */
 - (instancetype)initWithAccelerationPedalPosition:(BOOL)accelerationPedalPosition airbagStatus:(BOOL)airbagStatus beltStatus:(BOOL)beltStatus bodyInformation:(BOOL)bodyInformation  cloudAppVehicleID:(BOOL)cloudAppVehicleID clusterModeStatus:(BOOL)clusterModeStatus deviceStatus:(BOOL)deviceStatus driverBraking:(BOOL)driverBraking eCallInfo:(BOOL)eCallInfo electronicParkBrakeStatus:(BOOL)electronicParkBrakeStatus emergencyEvent:(BOOL)emergencyEvent engineOilLife:(BOOL)engineOilLife engineTorque:(BOOL)engineTorque externalTemperature:(BOOL)externalTemperature fuelLevel:(BOOL)fuelLevel fuelLevelState:(BOOL)fuelLevelState fuelRange:(BOOL)fuelRange gps:(BOOL)gps headLampStatus:(BOOL)headLampStatus instantFuelConsumption:(BOOL)instantFuelConsumption myKey:(BOOL)myKey odometer:(BOOL)odometer prndl:(BOOL)prndl rpm:(BOOL)rpm speed:(BOOL)speed steeringWheelAngle:(BOOL)steeringWheelAngle tirePressure:(BOOL)tirePressure turnSignal:(BOOL)turnSignal wiperStatus:(BOOL)wiperStatus windowStatus:(BOOL)windowStatus;
 
 /**
  * If true, unsubscribes from GPS
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *gps;
 
 /**
  * If true, unsubscribes from Speed
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *speed;
 
 /**
  * If true, unsubscribes from RPM
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *rpm;
 
 /**
  * If true, unsubscribes from Fuel Level
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel;
 
 /**
  * If true, unsubscribes from Fuel Level State
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel_State;
 
 /**
  * If true, unsubscribes from Fuel Range
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelRange;
 
 /**
  * If true, unsubscribes from Instant Fuel Consumption
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *instantFuelConsumption;
 
 /**
  * If true, unsubscribes from External Temperature
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *externalTemperature;
 
 /**
  * If true, unsubscribes from PRNDL
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *prndl;
 
 /**
  * If true, unsubscribes from Tire Pressure
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *tirePressure;
 
 /**
  * If true, unsubscribes from Odometer
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *odometer;
 
 /**
  * If true, unsubscribes from Belt Status
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *beltStatus;
 
 /**
  * If true, unsubscribes from Body Information
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *bodyInformation;
 
 /**
  * If true, unsubscribes from Device Status
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *deviceStatus;
 
 /**
  * If true, unsubscribes from Driver Braking
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *driverBraking;
 
 /**
  * If true, unsubscribes from Wiper Status
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *wiperStatus;
 
 /**
  * If true, unsubscribes from Head Lamp Status
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *headLampStatus;
 
 /**
  * If true, unsubscribes from Engine Oil Life
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *engineOilLife;
 
 /**
  * If true, unsubscribes from Engine Torque
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *engineTorque;
 
 /**
  * If true, unsubscribes from Acc Pedal Position
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *accPedalPosition;
 
 /**
  * If true, unsubscribes from Steering Wheel Angle data
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *steeringWheelAngle;
 
 /**
  * If true, unsubscribes from eCallInfo
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *eCallInfo;
 
 /**
  * If true, unsubscribes from Airbag Status
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *airbagStatus;
 
 /**
  * If true, unsubscribes from Emergency Event
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *emergencyEvent;
 
 /**
  * If true, unsubscribes from Cluster Mode Status
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *clusterModeStatus;
 
 /**
  * If true, unsubscribes from My Key
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *myKey;
 
 /**
  A boolean value. If true, unsubscribes to the Electronic Parking Brake Status
+
+ Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *electronicParkBrakeStatus;
 
 /**
  A boolean value. If true, unsubscribes to the Turn Signal
+
+ Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *turnSignal;
 
 /**
  A boolean value. If true, unsubscribes to the Cloud App Vehicle ID
+
+ Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *cloudAppVehicleID;
 
@@ -348,9 +406,11 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * See WindowStatus
  *
+ * Optional.
+ *
  * @since SDL 6.2.0
  */
-@property (nullable, strong, nonatomic) NSNumber<SDLBool> *windowStatus;
+@property (strong, nonatomic, nullable) NSNumber<SDLBool> *windowStatus;
 
 @end
 
diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h
index 3afceae3a..e0b8c8304 100644
--- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h
+++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h
@@ -267,9 +267,11 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * See WindowStatus
  *
+ * Optional.
+ *
  * @since SDL 6.2.0
  */
-@property (nullable, strong, nonatomic) SDLVehicleDataResult *windowStatus;
+@property (strong, nonatomic, nullable) SDLVehicleDataResult *windowStatus;
 
 @end
 
diff --git a/SmartDeviceLink/SDLWindowState.h b/SmartDeviceLink/SDLWindowState.h
index 4278a058b..cc7484962 100644
--- a/SmartDeviceLink/SDLWindowState.h
+++ b/SmartDeviceLink/SDLWindowState.h
@@ -48,16 +48,18 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  * The approximate percentage that the window is open - 0 being fully closed, 100 being fully open
- * {"default_value": null, "max_value": 100, "min_value": 0}
+ *
+ *  Optional, Integer, 0 - 100
  */
-@property (strong, nonatomic) NSNumber<SDLUInt> *approximatePosition;
+@property (strong, nonatomic, nullable) NSNumber<SDLUInt> *approximatePosition;
 
 /**
  * The percentage deviation of the approximatePosition. e.g. If the approximatePosition is 50 and the deviation is
  * 10, then the window's location is somewhere between 40 and 60.
- * {"default_value": null, "max_value": 100, "min_value": 0}
+ *
+ *  Optional, Integer, 0 - 100
  */
-@property (strong, nonatomic) NSNumber<SDLUInt> *deviation;
+@property (strong, nonatomic, nullable) NSNumber<SDLUInt> *deviation;
 
 @end
 
diff --git a/SmartDeviceLink/SDLWindowStatus.h b/SmartDeviceLink/SDLWindowStatus.h
index d8eb0e85f..f0e5b7ec4 100644
--- a/SmartDeviceLink/SDLWindowStatus.h
+++ b/SmartDeviceLink/SDLWindowStatus.h
@@ -32,8 +32,8 @@
 
 #import "SDLRPCStruct.h"
 
-@class SDLWindowState;
 @class SDLGrid;
+@class SDLWindowState;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
index 2955c8bdb..d6b994b2f 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
@@ -7,10 +7,10 @@
 
 #import <Quick/Quick.h>
 #import <Nimble/Nimble.h>
-#import "SmartDeviceLink.h"
 #import "SDLRPCParameterNames.h"
 #import "SDLRPCFunctionNames.h"
 #import "SDLWindowStatus.h"
+#import "SmartDeviceLink.h"
 
 QuickSpecBegin(SDLOnVehicleDataSpec)
 
@@ -44,7 +44,7 @@ describe(@"Getter/Setter Tests", ^ {
         myKey = [[SDLMyKey alloc] init];
         fuelRange = [[SDLFuelRange alloc] init];
         cloudAppVehicleID = @"testCloudAppVehicleID";
-        windowStatus = @[[SDLWindowStatus new], [SDLWindowStatus new], [SDLWindowStatus new]];
+        windowStatus = @[[[SDLWindowStatus alloc] init], [[SDLWindowStatus alloc] init], [[SDLWindowStatus alloc] init]];
     });
 
     it(@"should correctly initialize with init", ^ {
@@ -148,7 +148,7 @@ describe(@"Getter/Setter Tests", ^ {
                                            SDLRPCParameterNameTurnSignal:SDLTurnSignalOff,
                                            SDLRPCParameterNameVIN:@"222222222722",
                                            SDLRPCParameterNameWiperStatus:SDLWiperStatusStalled,
-                                           @"windowStatus":windowStatus
+                                           SDLRPCParameterNameWindowStatus:windowStatus
                                          },
                                      SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnVehicleData}};
 #pragma clang diagnostic push
@@ -190,7 +190,7 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should return nil if not set", ^ {
-        SDLOnVehicleData* testNotification = [SDLOnVehicleData new];
+        SDLOnVehicleData* testNotification = [[SDLOnVehicleData alloc] init];
         
         expect(testNotification.accPedalPosition).to(beNil());
         expect(testNotification.airbagStatus).to(beNil());
@@ -226,7 +226,7 @@ describe(@"Getter/Setter Tests", ^ {
     });
 
     it(@"Should set and get generic Network Signal Data", ^{
-        SDLOnVehicleData *testRequest = [SDLOnVehicleData new];
+        SDLOnVehicleData *testRequest = [[SDLOnVehicleData alloc] init];
         [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:@"oemVehicleData"];
 
         expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(equal(@"oemVehicleData"));
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m
index d04ec3d59..281d14d51 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m
@@ -4,13 +4,12 @@
 
 
 #import <Foundation/Foundation.h>
-
-#import <Quick/Quick.h>
 #import <Nimble/Nimble.h>
+#import <Quick/Quick.h>
 
 #import "SDLGetVehicleData.h"
-#import "SDLRPCParameterNames.h"
 #import "SDLRPCFunctionNames.h"
+#import "SDLRPCParameterNames.h"
 
 QuickSpecBegin(SDLGetVehicleDataSpec)
 
@@ -113,7 +112,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                                    SDLRPCParameterNameTirePressure:@YES,
                                                                    SDLRPCParameterNameTurnSignal:@NO,
                                                                    SDLRPCParameterNameWiperStatus:@YES,
-                                                                   @"windowStatus":@YES
+                                                                   SDLRPCParameterNameWindowStatus:@YES
                                                                  },
                                                              SDLRPCParameterNameOperationName:SDLRPCFunctionNameGetVehicleData}};
 #pragma clang diagnostic push
@@ -156,7 +155,7 @@ describe(@"Getter/Setter Tests", ^ {
 
 describe(@"initializers", ^{
     it(@"init", ^{
-        SDLGetVehicleData* testRequest = [SDLGetVehicleData new];
+        SDLGetVehicleData* testRequest = [[SDLGetVehicleData alloc] init];
 
         expect(testRequest.accPedalPosition).to(beNil());
         expect(testRequest.airbagStatus).to(beNil());
@@ -342,36 +341,36 @@ context(@"INIT-4", ^{
                                                      wiperStatus:YES
                                                     windowStatus:YES];
         it(@"all props set to YES", ^{
-             expect(testRequest.accPedalPosition).to(beTrue());
-             expect(testRequest.airbagStatus).to(beTrue());
-             expect(testRequest.beltStatus).to(beTrue());
-             expect(testRequest.bodyInformation).to(beTrue());
-             expect(testRequest.cloudAppVehicleID).to(beTrue());
-             expect(testRequest.clusterModeStatus).to(beTrue());
-             expect(testRequest.deviceStatus).to(beTrue());
-             expect(testRequest.driverBraking).to(beTrue());
-             expect(testRequest.eCallInfo).to(beTrue());
-             expect(testRequest.electronicParkBrakeStatus).to(beTrue());
-             expect(testRequest.emergencyEvent).to(beTrue());
-             expect(testRequest.engineOilLife).to(beTrue());
-             expect(testRequest.engineTorque).to(beTrue());
-             expect(testRequest.externalTemperature).to(beTrue());
-             expect(testRequest.fuelLevel).to(beTrue());
-             expect(testRequest.fuelLevel_State).to(beTrue());
-             expect(testRequest.fuelRange).to(beTrue());
-             expect(testRequest.gps).to(beTrue());
-             expect(testRequest.headLampStatus).to(beTrue());
-             expect(testRequest.instantFuelConsumption).to(beTrue());
-             expect(testRequest.myKey).to(beTrue());
-             expect(testRequest.odometer).to(beTrue());
-             expect(testRequest.prndl).to(beTrue());
-             expect(testRequest.rpm).to(beTrue());
-             expect(testRequest.speed).to(beTrue());
-             expect(testRequest.steeringWheelAngle).to(beTrue());
-             expect(testRequest.tirePressure).to(beTrue());
-             expect(testRequest.turnSignal).to(beTrue());
-             expect(testRequest.wiperStatus).to(beTrue());
-             expect(testRequest.windowStatus).to(beTrue());
+             expect(testRequest.accPedalPosition).to(equal(@YES));
+             expect(testRequest.airbagStatus).to(equal(@YES));
+             expect(testRequest.beltStatus).to(equal(@YES));
+             expect(testRequest.bodyInformation).to(equal(@YES));
+             expect(testRequest.cloudAppVehicleID).to(equal(@YES));
+             expect(testRequest.clusterModeStatus).to(equal(@YES));
+             expect(testRequest.deviceStatus).to(equal(@YES));
+             expect(testRequest.driverBraking).to(equal(@YES));
+             expect(testRequest.eCallInfo).to(equal(@YES));
+             expect(testRequest.electronicParkBrakeStatus).to(equal(@YES));
+             expect(testRequest.emergencyEvent).to(equal(@YES));
+             expect(testRequest.engineOilLife).to(equal(@YES));
+             expect(testRequest.engineTorque).to(equal(@YES));
+             expect(testRequest.externalTemperature).to(equal(@YES));
+             expect(testRequest.fuelLevel).to(equal(@YES));
+             expect(testRequest.fuelLevel_State).to(equal(@YES));
+             expect(testRequest.fuelRange).to(equal(@YES));
+             expect(testRequest.gps).to(equal(@YES));
+             expect(testRequest.headLampStatus).to(equal(@YES));
+             expect(testRequest.instantFuelConsumption).to(equal(@YES));
+             expect(testRequest.myKey).to(equal(@YES));
+             expect(testRequest.odometer).to(equal(@YES));
+             expect(testRequest.prndl).to(equal(@YES));
+             expect(testRequest.rpm).to(equal(@YES));
+             expect(testRequest.speed).to(equal(@YES));
+             expect(testRequest.steeringWheelAngle).to(equal(@YES));
+             expect(testRequest.tirePressure).to(equal(@YES));
+             expect(testRequest.turnSignal).to(equal(@YES));
+             expect(testRequest.wiperStatus).to(equal(@YES));
+             expect(testRequest.windowStatus).to(equal(@YES));
         });
 });
 
@@ -409,47 +408,47 @@ context(@"INIT-4", ^{
                                                               wiperStatus:NO
                                                              windowStatus:NO];
                  it(@"all props set to NO", ^{
-                      expect(testRequest.accPedalPosition).to(beFalse());
-                      expect(testRequest.airbagStatus).to(beFalse());
-                      expect(testRequest.beltStatus).to(beFalse());
-                      expect(testRequest.bodyInformation).to(beFalse());
-                      expect(testRequest.cloudAppVehicleID).to(beFalse());
-                      expect(testRequest.clusterModeStatus).to(beFalse());
-                      expect(testRequest.deviceStatus).to(beFalse());
-                      expect(testRequest.driverBraking).to(beFalse());
-                      expect(testRequest.eCallInfo).to(beFalse());
-                      expect(testRequest.electronicParkBrakeStatus).to(beFalse());
-                      expect(testRequest.emergencyEvent).to(beFalse());
-                      expect(testRequest.engineOilLife).to(beFalse());
-                      expect(testRequest.engineTorque).to(beFalse());
-                      expect(testRequest.externalTemperature).to(beFalse());
-                      expect(testRequest.fuelLevel).to(beFalse());
-                      expect(testRequest.fuelLevel_State).to(beFalse());
-                      expect(testRequest.fuelRange).to(beFalse());
-                      expect(testRequest.gps).to(beFalse());
-                      expect(testRequest.headLampStatus).to(beFalse());
-                      expect(testRequest.instantFuelConsumption).to(beFalse());
-                      expect(testRequest.myKey).to(beFalse());
-                      expect(testRequest.odometer).to(beFalse());
-                      expect(testRequest.prndl).to(beFalse());
-                      expect(testRequest.rpm).to(beFalse());
-                      expect(testRequest.speed).to(beFalse());
-                      expect(testRequest.steeringWheelAngle).to(beFalse());
-                      expect(testRequest.tirePressure).to(beFalse());
-                      expect(testRequest.turnSignal).to(beFalse());
-                      expect(testRequest.wiperStatus).to(beFalse());
-                      expect(testRequest.windowStatus).to(beFalse());
+                      expect(testRequest.accPedalPosition).to(equal(@NO));
+                      expect(testRequest.airbagStatus).to(equal(@NO));
+                      expect(testRequest.beltStatus).to(equal(@NO));
+                      expect(testRequest.bodyInformation).to(equal(@NO));
+                      expect(testRequest.cloudAppVehicleID).to(equal(@NO));
+                      expect(testRequest.clusterModeStatus).to(equal(@NO));
+                      expect(testRequest.deviceStatus).to(equal(@NO));
+                      expect(testRequest.driverBraking).to(equal(@NO));
+                      expect(testRequest.eCallInfo).to(equal(@NO));
+                      expect(testRequest.electronicParkBrakeStatus).to(equal(@NO));
+                      expect(testRequest.emergencyEvent).to(equal(@NO));
+                      expect(testRequest.engineOilLife).to(equal(@NO));
+                      expect(testRequest.engineTorque).to(equal(@NO));
+                      expect(testRequest.externalTemperature).to(equal(@NO));
+                      expect(testRequest.fuelLevel).to(equal(@NO));
+                      expect(testRequest.fuelLevel_State).to(equal(@NO));
+                      expect(testRequest.fuelRange).to(equal(@NO));
+                      expect(testRequest.gps).to(equal(@NO));
+                      expect(testRequest.headLampStatus).to(equal(@NO));
+                      expect(testRequest.instantFuelConsumption).to(equal(@NO));
+                      expect(testRequest.myKey).to(equal(@NO));
+                      expect(testRequest.odometer).to(equal(@NO));
+                      expect(testRequest.prndl).to(equal(@NO));
+                      expect(testRequest.rpm).to(equal(@NO));
+                      expect(testRequest.speed).to(equal(@NO));
+                      expect(testRequest.steeringWheelAngle).to(equal(@NO));
+                      expect(testRequest.tirePressure).to(equal(@NO));
+                      expect(testRequest.turnSignal).to(equal(@NO));
+                      expect(testRequest.wiperStatus).to(equal(@NO));
+                      expect(testRequest.windowStatus).to(equal(@NO));
                  });
          });
 
     context(@"Should set and get Generic Network Signal Data", ^{
-        SDLGetVehicleData *testRequest = [SDLGetVehicleData new];
+        SDLGetVehicleData *testRequest = [[SDLGetVehicleData alloc] init];
         [testRequest setOEMCustomVehicleData:@"OEMCustomVehicleData" withVehicleDataState:NO];
         [testRequest setOEMCustomVehicleData:@"OEMCustomVehicleData1" withVehicleDataState:YES];
 
         it(@"all set", ^{
-            expect([testRequest getOEMCustomVehicleData:@"OEMCustomVehicleData"]).to(beFalse());
-            expect([testRequest getOEMCustomVehicleData:@"OEMCustomVehicleData1"]).to(beTrue());
+            expect([testRequest getOEMCustomVehicleData:@"OEMCustomVehicleData"]).to(equal(@NO));
+            expect([testRequest getOEMCustomVehicleData:@"OEMCustomVehicleData1"]).to(equal(@YES));
             expect(testRequest.windowStatus).to(beNil());
         });
     });
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m
index bef218589..67398aa5a 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m
@@ -4,19 +4,18 @@
 
 
 #import <Foundation/Foundation.h>
-
-#import <Quick/Quick.h>
 #import <Nimble/Nimble.h>
+#import <Quick/Quick.h>
 
-#import "SDLSubscribeVehicleData.h"
-#import "SDLRPCParameterNames.h"
 #import "SDLRPCFunctionNames.h"
+#import "SDLRPCParameterNames.h"
+#import "SDLSubscribeVehicleData.h"
 
 QuickSpecBegin(SDLSubscribeVehicleDataSpec)
 
 describe(@"Getter/Setter Tests", ^ {
     it(@"Should set and get correctly", ^ {
-        SDLSubscribeVehicleData* testRequest = [SDLSubscribeVehicleData new];
+        SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] init];
 
         testRequest.accPedalPosition = @YES;
         testRequest.airbagStatus = @NO;
@@ -78,7 +77,7 @@ describe(@"Getter/Setter Tests", ^ {
         expect(testRequest.tirePressure).to(equal(@NO));
         expect(testRequest.turnSignal).to(equal(@YES));
         expect(testRequest.wiperStatus).to(equal(@NO));
-        expect(testRequest.windowStatus).to(beTrue());
+        expect(testRequest.windowStatus).to(equal(@YES));
     });
     
     it(@"Should get correctly when initialized with a dictionary", ^ {
@@ -113,7 +112,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                            SDLRPCParameterNameTirePressure:@YES,
                                                            SDLRPCParameterNameTurnSignal:@NO,
                                                            SDLRPCParameterNameWiperStatus:@NO,
-                                                           @"windowStatus":@YES
+                                                           SDLRPCParameterNameWindowStatus:@YES
                                                          },
                                                      SDLRPCParameterNameOperationName:SDLRPCFunctionNameSubscribeVehicleData}};
 #pragma clang diagnostic push
@@ -156,7 +155,7 @@ describe(@"Getter/Setter Tests", ^ {
 
 describe(@"initializers", ^{
     it(@"init", ^{
-        SDLSubscribeVehicleData* testRequest = [SDLSubscribeVehicleData new];
+        SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] init];
 
         expect(testRequest.accPedalPosition).to(beNil());
         expect(testRequest.airbagStatus).to(beNil());
@@ -190,7 +189,7 @@ describe(@"initializers", ^{
         expect(testRequest.windowStatus).to(beNil());
     });
 
-    it(@"INIT-4", ^{
+    it(@"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:cloudAppVehicleID:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:electronicParkBrakeStatus:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:fuelRange:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:turnSignal:wiperStatus:windowStatus:", ^{
     SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:YES beltStatus:YES bodyInformation:YES cloudAppVehicleID:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES electronicParkBrakeStatus:YES emergencyEvent:YES engineOilLife:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:YES fuelRange:YES gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES turnSignal:YES wiperStatus:YES windowStatus:YES];
 
         expect(testRequest.accPedalPosition).to(equal(@YES));
@@ -222,7 +221,7 @@ describe(@"initializers", ^{
         expect(testRequest.tirePressure).to(equal(@YES));
         expect(testRequest.turnSignal).to(equal(@YES));
         expect(testRequest.wiperStatus).to(equal(@YES));
-        expect(testRequest.windowStatus).to(beTrue());
+        expect(testRequest.windowStatus).to(equal(@YES));
     });
 
     it( @"initWithAccelerationPedalPosition:airbagStatus:beltStatus:bodyInformation:clusterModeStatus:deviceStatus:driverBraking:eCallInfo:emergencyEvent:engineOilLife:engineTorque:externalTemperature:fuelLevel:fuelLevelState:gps:headLampStatus:instantFuelConsumption:myKey:odometer:prndl:rpm:speed:steeringWheelAngle:tirePressure:wiperStatus:", ^{
@@ -302,13 +301,13 @@ describe(@"initializers", ^{
     });
 
     context(@"Should set and get Generic Network Signal Data", ^{
-        SDLSubscribeVehicleData *testRequest = [SDLSubscribeVehicleData new];
+        SDLSubscribeVehicleData *testRequest = [[SDLSubscribeVehicleData alloc] init];
         [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:NO];
         [testRequest setOEMCustomVehicleData:@"customVehicleData1" withVehicleDataState:YES];
 
         it(@"all set", ^{
-            expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(beFalse());
-            expect([testRequest getOEMCustomVehicleData:@"customVehicleData1"]).to(beTrue());
+            expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(equal(@NO));
+            expect([testRequest getOEMCustomVehicleData:@"customVehicleData1"]).to(equal(@YES));
             expect(testRequest.windowStatus).to(beNil());
         });
     });
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m
index c6a98f005..26ae06ea7 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m
@@ -4,19 +4,18 @@
 
 
 #import <Foundation/Foundation.h>
-
-#import <Quick/Quick.h>
 #import <Nimble/Nimble.h>
+#import <Quick/Quick.h>
 
-#import "SDLUnsubscribeVehicleData.h"
-#import "SDLRPCParameterNames.h"
 #import "SDLRPCFunctionNames.h"
+#import "SDLRPCParameterNames.h"
+#import "SDLUnsubscribeVehicleData.h"
 
 QuickSpecBegin(SDLUnsubscribeVehicleDataSpec)
 
 describe(@"Getter/Setter Tests", ^ {
     it(@"Should set and get correctly", ^ {
-        SDLUnsubscribeVehicleData* testRequest = [SDLUnsubscribeVehicleData new];
+        SDLUnsubscribeVehicleData* testRequest = [[SDLUnsubscribeVehicleData alloc] init];
         
         testRequest.accPedalPosition = @YES;
         testRequest.airbagStatus = @YES;
@@ -113,7 +112,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                            SDLRPCParameterNameTirePressure:@YES,
                                                            SDLRPCParameterNameTurnSignal:@YES,
                                                            SDLRPCParameterNameWiperStatus:@YES,
-                                                           @"windowStatus":@YES
+                                                           SDLRPCParameterNameWindowStatus:@YES
                                                          },
                                                      SDLRPCParameterNameOperationName:SDLRPCFunctionNameUnsubscribeVehicleData}};
 #pragma clang diagnostic push
@@ -156,7 +155,7 @@ describe(@"Getter/Setter Tests", ^ {
 
 describe(@"initializers", ^{
     it(@"init", ^{
-        SDLUnsubscribeVehicleData *testRequest = [SDLUnsubscribeVehicleData new];
+        SDLUnsubscribeVehicleData *testRequest = [[SDLUnsubscribeVehicleData alloc] init];
 
         expect(testRequest.accPedalPosition).to(beNil());
         expect(testRequest.airbagStatus).to(beNil());
@@ -304,13 +303,13 @@ describe(@"initializers", ^{
     });
 
     context(@"Should set and get Generic Network Signal Data", ^{
-        SDLUnsubscribeVehicleData *testRequest = [SDLUnsubscribeVehicleData new];
+        SDLUnsubscribeVehicleData *testRequest = [[SDLUnsubscribeVehicleData alloc] init];
         [testRequest setOEMCustomVehicleData:@"customVehicleData" withVehicleDataState:NO];
         [testRequest setOEMCustomVehicleData:@"customVehicleData1" withVehicleDataState:YES];
 
         it(@"all set", ^{
-            expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(beFalse());
-            expect([testRequest getOEMCustomVehicleData:@"customVehicleData1"]).to(beTrue());
+            expect([testRequest getOEMCustomVehicleData:@"customVehicleData"]).to(equal(@NO));
+            expect([testRequest getOEMCustomVehicleData:@"customVehicleData1"]).to(equal(@YES));
             expect(testRequest.windowStatus).to(beNil());
         });
     });
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m
index c7f043a3c..657d2556c 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m
@@ -4,12 +4,11 @@
 
 
 #import <Foundation/Foundation.h>
-
-#import <Quick/Quick.h>
 #import <Nimble/Nimble.h>
+#import <Quick/Quick.h>
 
-#import "SDLRPCParameterNames.h"
 #import "SDLRPCFunctionNames.h"
+#import "SDLRPCParameterNames.h"
 #import "SDLSubscribeVehicleDataResponse.h"
 #import "SDLVehicleDataResult.h"
 #import "SDLVehicleDataResultCode.h"
@@ -119,7 +118,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                                    SDLRPCParameterNameTirePressure:vehicleDataResult,
                                                                    SDLRPCParameterNameTurnSignal:vehicleDataResult,
                                                                    SDLRPCParameterNameWiperStatus:vehicleDataResult,
-                                                                   @"windowStatus":vehicleDataResult
+                                                                   SDLRPCParameterNameWindowStatus:vehicleDataResult
                                                                  },
                                                              SDLRPCParameterNameOperationName:SDLRPCFunctionNameSubscribeVehicleData}};
 #pragma clang diagnostic push
@@ -160,7 +159,7 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should return nil if not set", ^ {
-        SDLSubscribeVehicleDataResponse* testResponse = [SDLSubscribeVehicleDataResponse new];
+        SDLSubscribeVehicleDataResponse* testResponse = [[SDLSubscribeVehicleDataResponse alloc] init];
         
         expect(testResponse.accPedalPosition).to(beNil());
         expect(testResponse.airbagStatus).to(beNil());
@@ -195,7 +194,7 @@ describe(@"Getter/Setter Tests", ^ {
     });
 
     it(@"Should set and get Generic Network Signal Data", ^{
-        SDLSubscribeVehicleDataResponse* testResponse = [SDLSubscribeVehicleDataResponse new];
+        SDLSubscribeVehicleDataResponse* testResponse = [[SDLSubscribeVehicleDataResponse alloc] init];
         [testResponse setOEMCustomVehicleData:@"customOEMVehicleData" withVehicleDataState:customOEMvehicleDataResult];
 
         expect([testResponse getOEMCustomVehicleData:@"customOEMVehicleData"]).to(equal(customOEMvehicleDataResult));
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m
index 12385604e..de054f4a8 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m
@@ -4,13 +4,12 @@
 
 
 #import <Foundation/Foundation.h>
-
-#import <Quick/Quick.h>
 #import <Nimble/Nimble.h>
+#import <Quick/Quick.h>
 
-#import "SDLUnsubscribeVehicleDataResponse.h"
-#import "SDLRPCParameterNames.h"
 #import "SDLRPCFunctionNames.h"
+#import "SDLRPCParameterNames.h"
+#import "SDLUnsubscribeVehicleDataResponse.h"
 #import "SDLVehicleDataResult.h"
 #import "SDLVehicleDataResultCode.h"
 
@@ -118,7 +117,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                                    SDLRPCParameterNameElectronicParkBrakeStatus:vehicleDataResult,
                                                                    SDLRPCParameterNameTurnSignal:vehicleDataResult,
                                                                    SDLRPCParameterNameCloudAppVehicleID:vehicleDataResult,
-                                                                   @"windowStatus":vehicleDataResult
+                                                                   SDLRPCParameterNameWindowStatus:vehicleDataResult
                                                                    },
                                                              SDLRPCParameterNameOperationName:SDLRPCFunctionNameUnsubscribeVehicleData}};
 #pragma clang diagnostic push
@@ -159,7 +158,7 @@ describe(@"Getter/Setter Tests", ^ {
     });
     
     it(@"Should return nil if not set", ^ {
-        SDLUnsubscribeVehicleDataResponse* testResponse = [SDLUnsubscribeVehicleDataResponse new];
+        SDLUnsubscribeVehicleDataResponse* testResponse = [[SDLUnsubscribeVehicleDataResponse alloc] init];
         
         expect(testResponse.gps).to(beNil());
         expect(testResponse.speed).to(beNil());
@@ -194,7 +193,7 @@ describe(@"Getter/Setter Tests", ^ {
     });
 
     it(@"Should set and get Generic Network Signal Data", ^{
-        SDLUnsubscribeVehicleDataResponse* testResponse = [SDLUnsubscribeVehicleDataResponse new];
+        SDLUnsubscribeVehicleDataResponse* testResponse = [[SDLUnsubscribeVehicleDataResponse alloc] init];
         [testResponse setOEMCustomVehicleData:@"customOEMVehicleData" withVehicleDataState:customOEMvehicleDataResult];
 
         expect([testResponse getOEMCustomVehicleData:@"customOEMVehicleData"]).to(equal(customOEMvehicleDataResult));
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWindowStateSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWindowStateSpec.m
index 855a75696..b6bb356ea 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWindowStateSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWindowStateSpec.m
@@ -4,8 +4,9 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <Quick/Quick.h>
 #import <Nimble/Nimble.h>
+#import <Quick/Quick.h>
+#import "SDLRPCParameterNames.h"
 #import "SDLWindowState.h"
 
 QuickSpecBegin(SDLWindowStateSpec)
@@ -22,8 +23,8 @@ describe(@"Getter/Setter Tests", ^ {
     });
 
     it(@"Should get correctly when initialized", ^ {
-        NSDictionary *dict = @{@"deviation":@(deviation),
-                                @"approximatePosition":@(approximatePosition)
+        NSDictionary *dict = @{SDLRPCParameterNameDeviation:@(deviation),
+                                SDLRPCParameterNameApproximatePosition:@(approximatePosition)
                                 };
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
@@ -35,7 +36,7 @@ describe(@"Getter/Setter Tests", ^ {
     });
 
     it(@"Should return nil if not set", ^ {
-        SDLWindowState *testStruct = [SDLWindowState new];
+        SDLWindowState *testStruct = [[SDLWindowState alloc] init];
 
         expect(testStruct.approximatePosition).to(beNil());
         expect(testStruct.deviation).to(beNil());
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWindowStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWindowStatusSpec.m
index 94e6774c1..72254f7da 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWindowStatusSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWindowStatusSpec.m
@@ -4,11 +4,12 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <Quick/Quick.h>
 #import <Nimble/Nimble.h>
-#import "SDLWindowStatus.h"
-#import "SDLWindowState.h"
+#import <Quick/Quick.h>
 #import "SDLGrid.h"
+#import "SDLRPCParameterNames.h"
+#import "SDLWindowState.h"
+#import "SDLWindowStatus.h"
 
 const UInt8 approximatePosition = 13;
 const UInt8 deviation = 42;
@@ -18,7 +19,7 @@ QuickSpecBegin(SDLWindowStatusSpec)
 describe(@"Getter/Setter Tests", ^ {
     it(@"Should set and get correctly", ^ {
         SDLWindowState *state = [[SDLWindowState alloc] initWithApproximatePosition:approximatePosition deviation:deviation];
-        SDLGrid *location = [SDLGrid new];
+        SDLGrid *location = [[SDLGrid alloc] init];
         SDLWindowStatus *testStruct = [[SDLWindowStatus alloc] initWithLocation:location state:state];
 
         expect(testStruct.location).to(equal(location));
@@ -27,9 +28,9 @@ describe(@"Getter/Setter Tests", ^ {
 
     it(@"Should get correctly when initialized", ^ {
         SDLWindowState *state = [[SDLWindowState alloc] initWithApproximatePosition:approximatePosition deviation:deviation];
-        SDLGrid *location = [SDLGrid new];
-        NSDictionary *dict = @{@"location":location,
-                                @"state":state
+        SDLGrid *location = [[SDLGrid alloc] init];
+        NSDictionary *dict = @{SDLRPCParameterNameLocation:location,
+                                SDLRPCParameterNameState:state
                                 };
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
@@ -41,7 +42,7 @@ describe(@"Getter/Setter Tests", ^ {
     });
 
     it(@"Should return nil if not set", ^ {
-        SDLWindowStatus *testStruct = [SDLWindowStatus new];
+        SDLWindowStatus *testStruct = [[SDLWindowStatus alloc] init];
 
         expect(testStruct.location).to(beNil());
         expect(testStruct.state).to(beNil());