Merge remote-tracking branch 'origin/master' into develop

* origin/master: (30 commits)
  Remove a test focus
  Fixed test cases
  Fix podspec not updated with latest version number
  Update for v4.5.0
  Follow style guide for boolean check
  Updated formatting of README.md
  Added steps for using the lock screen manager from SDL's bundle to the readme.
  Added check when trying to upload an appIcon for a head unit that does not support graphics.
  Update for v4.5.0
  Fixed issue with trying to upload a file that is nil will cause an infinite loop.
  Fixed an issue with initializer causing infinite loop.
  Improved readability for nil-checks.
  Fixed issue relating to SDLLocationDetails' searchAddress using the wrong key for object store.
  Fixed formatting for some interfaces.
  Fixed issue with LocationDetails' properties not properly becoming initialized.
  Fixed issue with waypoints not being correctly initialized as SDLLocationDetails
  Adding in nil checks for completion handlers of Streaming Media Manager.
  Updated description to return correct control data name.
  Update changelog for v4.5.0-beta.1
  Update for v4.5.0-beta.1 release
  ...

# Conflicts:
#	SmartDeviceLink/SDLDiagnosticMessage.m
#	SmartDeviceLink/SDLGetWaypointsResponse.m
#	SmartDeviceLink/SDLKeyboardProperties.h
#	SmartDeviceLink/SDLLocationDetails.m
#	SmartDeviceLink/SDLNames.h
#	SmartDeviceLink/SDLOnWaypointChange.m
#	SmartDeviceLink/SDLPerformInteraction.h
#	SmartDeviceLink/SDLPerformInteraction.m
#	SmartDeviceLink/SDLProxy.m
#	SmartDeviceLink/SDLPutFile.h
#	SmartDeviceLink/SDLReadDID.m
#	SmartDeviceLink/SDLSetGlobalProperties.h
#	SmartDeviceLink/SDLSetMediaClockTimer.h
#	SmartDeviceLink/SDLSoftButton.h
#	SmartDeviceLink/SDLUnsubscribeWaypoints.m
#	SmartDeviceLink/SDLUpdateTurnList.m
#	SmartDeviceLink/SDLV2ProtocolHeader.m
#	SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetWaypointsSpec.m
#	SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLocationDetailsSpec.m

63 files changed, 799 insertions, 238 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 933efaae9..d73874edb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+# 4.5.0 Release Notes (Since Beta 2)
+### Bug Fixes
+* Fixed an issue attempting to upload an app icon when the head unit does not support images.
+
+# 4.5.0 Beta 2 Release Notes
+### Bug Fixes
+* Fixed an issue with printing incorrect Frame Data when logging.
+* Fixed an issue with SDLLocationDetails' properties being incorrectly stored.
+* Added in nil-checks for SDLStreamingMediaManager's startSession completionHandlers.
+* Fixed an issue with a SDLPerformInteraction initializer causing an infinite loop.
+* Fixed an issue with uploading a nil SDLFile would cause an infinite loop.
+
+# 4.5.0 Beta 1 Release Notes
+### Bug Fixes
+* Altered how Security libraries get the app id so they can start downloads faster.
+* Fixed a number of RPC initializers to have correct number sizes.
+* Fixed a video session crash in rare instances when the compression session was NULL.
+* Fixed waypoint RPCs missing response and notification dispatchers and incorrect spelling on some classes (the old classes are deprecated).
+
 # 4.4.1 Release Notes
 ### Bug Fixes
 * Subscribing to waypoints should now work (new feature & RPC in v4.4.0).
diff --git a/Cartfile.resolved b/Cartfile.resolved
index b770aa4bd..e2b082f08 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,5 +1,5 @@
 github "Quick/Nimble" "v4.1.0"
-github "AliSoftware/OHHTTPStubs" "5.2.1"
+github "AliSoftware/OHHTTPStubs" "5.2.3"
 github "Quick/Quick" "v0.9.3"
 github "facebook/ios-snapshot-test-case" "2.1.3"
-github "erikdoe/ocmock" "v3.3.1"
+github "erikdoe/ocmock" "v3.4"
diff --git a/README.md b/README.md
index 55721e600..a7f71363a 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ See the [roadmap](https://github.com/smartdevicelink/sdl_ios/wiki/Roadmap) to se
 
 You can install this library using [Cocoapods](https://cocoapods.org/pods/SmartDeviceLink-iOS). You can get started with Cocoapods by [following their install guide](https://guides.cocoapods.org/using/getting-started.html#getting-started), and learn how to use Cocoapods to install dependencies [by following this guide](https://guides.cocoapods.org/using/using-cocoapods.html).
 
-In your podfile, you want to add `pod 'SmartDeviceLink-iOS', '~> 4.4'`. Then run `pod install` inside your terminal. With Cocoapods, we support iOS 6.0+.
+In your podfile, you want to add `pod 'SmartDeviceLink-iOS', '~> 4.5'`. Then run `pod install` inside your terminal. With Cocoapods, we support iOS 6.0+.
 
 ##### Carthage
 
@@ -110,6 +110,13 @@ Your application must support a set of smartdevicelink protocol strings in order
 </array>
 ```
 
+#### Lock Screen Support
+If you used CocoaPods to install the SDL SDK, you must complete the following steps to add the default lock screen resources to your project:
+
+1. Select your application's build target, go to Build Phases, Copy Bundle Resources.
+2. Then in the Navigator window of Xcode, go to Target's Support Files, Pods-YourProjectName, and drag and drop the SmartDeviceLink.bundle file into Copy Bundle Resources.
+3. After the bundle is dropped into Copy Bundle Resources check "copy items if need" from the popup box and click "Finish."
+
 #### Continue Integrating
 Go through the [guide documentation](https://smartdevicelink.com/en/guides/iOS/getting-started/integration-basics/) to get started setting up your app to work with SDL!
 
diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec
index f8ae02a4c..07b8cc899 100644
--- a/SmartDeviceLink-iOS.podspec
+++ b/SmartDeviceLink-iOS.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name         = "SmartDeviceLink-iOS"
-s.version      = "4.4.1"
+s.version      = "4.5.0"
 s.summary      = "Connect your app with cars!"
 s.homepage     = "https://github.com/smartdevicelink/SmartDeviceLink-iOS"
 s.license      = { :type => "New BSD", :file => "LICENSE" }
diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
index e3c177ea7..c19ea0aa1 100644
--- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
+++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
@@ -4290,6 +4290,7 @@
 					};
 					5D61FA251A84237100846EE7 = {
 						CreatedOnToolsVersion = 6.1.1;
+						LastSwiftMigration = 0820;
 					};
 				};
 			};
@@ -5094,6 +5095,7 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -5133,6 +5135,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
diff --git a/SmartDeviceLink/Info.plist b/SmartDeviceLink/Info.plist
index 098bfd229..a3ebd8ae0 100644
--- a/SmartDeviceLink/Info.plist
+++ b/SmartDeviceLink/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.4.1</string>
+	<string>4.5.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/SmartDeviceLink/SDLAddSubMenu.h b/SmartDeviceLink/SDLAddSubMenu.h
index 6f7f25159..6fe0c349d 100644
--- a/SmartDeviceLink/SDLAddSubMenu.h
+++ b/SmartDeviceLink/SDLAddSubMenu.h
@@ -18,9 +18,9 @@
  */
 @interface SDLAddSubMenu : SDLRPCRequest
 
-- (instancetype)initWithId:(UInt8)menuId menuName:(NSString *)menuName;
+- (instancetype)initWithId:(UInt32)menuId menuName:(NSString *)menuName;
 
-- (instancetype)initWithId:(UInt8)menuId menuName:(NSString *)menuName position:(UInt8)position;
+- (instancetype)initWithId:(UInt32)menuId menuName:(NSString *)menuName position:(UInt8)position;
 
 /**
  * @abstract a Menu ID that identifies a sub menu
diff --git a/SmartDeviceLink/SDLAddSubMenu.m b/SmartDeviceLink/SDLAddSubMenu.m
index 41ced17a2..afd0e5cd4 100644
--- a/SmartDeviceLink/SDLAddSubMenu.m
+++ b/SmartDeviceLink/SDLAddSubMenu.m
@@ -13,7 +13,7 @@
 }
 
 
-- (instancetype)initWithId:(UInt8)menuId menuName:(NSString *)menuName position:(UInt8)position {
+- (instancetype)initWithId:(UInt32)menuId menuName:(NSString *)menuName position:(UInt8)position {
     self = [self initWithId:menuId menuName:menuName];
     if (!self) {
         return nil;
@@ -24,7 +24,7 @@
     return self;
 }
 
-- (instancetype)initWithId:(UInt8)menuId menuName:(NSString *)menuName {
+- (instancetype)initWithId:(UInt32)menuId menuName:(NSString *)menuName {
     self = [self init];
     if (!self) {
         return nil;
diff --git a/SmartDeviceLink/SDLDiagnosticMessage.h b/SmartDeviceLink/SDLDiagnosticMessage.h
index 157578406..3070a5684 100644
--- a/SmartDeviceLink/SDLDiagnosticMessage.h
+++ b/SmartDeviceLink/SDLDiagnosticMessage.h
@@ -11,7 +11,7 @@
  */
 @interface SDLDiagnosticMessage : SDLRPCRequest
 
-- (instancetype)initWithTargetId:(UInt16)targetId length:(UInt16)length data:(NSArray<NSNumber<SDLInt> *> *)data;
+- (instancetype)initWithTargetId:(UInt16)targetId length:(UInt16)length data:(NSArray<NSNumber<SDLUInt> *> *)data;
 
 /**
  * Name of target ECU
diff --git a/SmartDeviceLink/SDLFileManager.m b/SmartDeviceLink/SDLFileManager.m
index 84b20b890..86507224b 100644
--- a/SmartDeviceLink/SDLFileManager.m
+++ b/SmartDeviceLink/SDLFileManager.m
@@ -221,12 +221,17 @@ SDLFileManagerState *const SDLFileManagerStateStartupError = @"StartupError";
 
 - (void)uploadFile:(SDLFile *)file completionHandler:(nullable SDLFileManagerUploadCompletionHandler)handler {
     if (file == nil) {
-        handler(NO, self.bytesAvailable, [NSError sdl_fileManager_unableToUploadError]);
+        if (handler != nil) {
+            handler(NO, self.bytesAvailable, [NSError sdl_fileManager_unableToUploadError]);
+        }
+        return;
     }
 
     // Make sure we are able to send files
     if (![self.currentState isEqualToString:SDLFileManagerStateReady]) {
-        handler(NO, self.bytesAvailable, [NSError sdl_fileManager_unableToUploadError]);
+        if (handler != nil) {
+            handler(NO, self.bytesAvailable, [NSError sdl_fileManager_unableToUploadError]);
+        }
         return;
     }
 
diff --git a/SmartDeviceLink/SDLGetWaypoints.h b/SmartDeviceLink/SDLGetWaypoints.h
index 42c166f7c..91f95ab9f 100644
--- a/SmartDeviceLink/SDLGetWaypoints.h
+++ b/SmartDeviceLink/SDLGetWaypoints.h
@@ -1,11 +1,12 @@
-//  SDLGetWaypoints.m
+//  SDLGetWaypoints.h
 //
 
 #import "SDLRPCRequest.h"
 
 #import "SDLWaypointType.h"
 
-@interface SDLGetWaypoints : SDLRPCRequest
+
+@interface SDLGetWayPoints : SDLRPCRequest
 
 - (instancetype)initWithType:(SDLWaypointType)type;
 
@@ -18,3 +19,7 @@
 @property (strong, nonatomic) SDLWaypointType waypointType;
 
 @end
+
+__deprecated_msg("Use SDLGetWayPoints instead")
+    @interface SDLGetWaypoints : SDLGetWayPoints
+                                 @end
diff --git a/SmartDeviceLink/SDLGetWaypoints.m b/SmartDeviceLink/SDLGetWaypoints.m
index e607643c7..3733bf8d7 100644
--- a/SmartDeviceLink/SDLGetWaypoints.m
+++ b/SmartDeviceLink/SDLGetWaypoints.m
@@ -5,7 +5,7 @@
 
 #import "SDLNames.h"
 
-@implementation SDLGetWaypoints
+@implementation SDLGetWayPoints
 
 - (instancetype)init {
     if (self = [super initWithName:SDLNameGetWaypoints]) {
@@ -38,3 +38,7 @@
 }
 
 @end
+
+@implementation SDLGetWaypoints
+
+@end
diff --git a/SmartDeviceLink/SDLGetWaypointsResponse.h b/SmartDeviceLink/SDLGetWaypointsResponse.h
index 94d449886..fe1489c7d 100644
--- a/SmartDeviceLink/SDLGetWaypointsResponse.h
+++ b/SmartDeviceLink/SDLGetWaypointsResponse.h
@@ -5,7 +5,7 @@
 
 @class SDLLocationDetails;
 
-@interface SDLGetWaypointsResponse : SDLRPCResponse
+@interface SDLGetWayPointsResponse : SDLRPCResponse
 
 /**
  * @abstract Array of waypoints
@@ -17,3 +17,7 @@
 @property (strong) NSArray<SDLLocationDetails *> *waypoints;
 
 @end
+
+__deprecated_msg("Use SDLGetWayPointsResponse instead")
+    @interface SDLGetWaypointsResponse : SDLGetWayPointsResponse
+                                         @end
diff --git a/SmartDeviceLink/SDLGetWaypointsResponse.m b/SmartDeviceLink/SDLGetWaypointsResponse.m
index 7a49ad886..7deb35a09 100644
--- a/SmartDeviceLink/SDLGetWaypointsResponse.m
+++ b/SmartDeviceLink/SDLGetWaypointsResponse.m
@@ -2,9 +2,11 @@
 //
 
 #import "SDLGetWaypointsResponse.h"
+
+#import "SDLLocationDetails.h"
 #import "SDLNames.h"
 
-@implementation SDLGetWaypointsResponse
+@implementation SDLGetWayPointsResponse
 
 - (instancetype)init {
     if (self = [super initWithName:SDLNameGetWaypoints]) {
@@ -21,7 +23,20 @@
 }
 
 - (NSArray<SDLLocationDetails *> *)waypoints {
-    return parameters[SDLNameWaypoints];
+    NSMutableArray *array = [parameters objectForKey:SDLNameWaypoints];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLLocationDetails.class]) {
+        return [array copy];
+    } else {
+        NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSDictionary *dict in array) {
+            [newList addObject:[[SDLLocationDetails alloc] initWithDictionary:(NSMutableDictionary *)dict]];
+        }
+        return [newList copy];
+    }
 }
 
 @end
+
+@implementation SDLGetWaypointsResponse
+
+@end
diff --git a/SmartDeviceLink/SDLLifecycleManager.m b/SmartDeviceLink/SDLLifecycleManager.m
index 61c671182..0ddf64a03 100644
--- a/SmartDeviceLink/SDLLifecycleManager.m
+++ b/SmartDeviceLink/SDLLifecycleManager.m
@@ -14,6 +14,7 @@
 #import "SDLConfiguration.h"
 #import "SDLConnectionManagerType.h"
 #import "SDLDebugTool.h"
+#import "SDLDisplayCapabilities.h"
 #import "SDLError.h"
 #import "SDLFile.h"
 #import "SDLFileManager.h"
@@ -305,7 +306,7 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
 
 - (void)sdl_sendAppIcon:(nullable SDLFile *)appIcon withCompletion:(void (^)(void))completion {
     // If no app icon was set, just move on to ready
-    if (appIcon == nil) {
+    if (appIcon == nil || !self.registerResponse.displayCapabilities.graphicSupported.boolValue) {
         completion();
         return;
     }
diff --git a/SmartDeviceLink/SDLLocationDetails.m b/SmartDeviceLink/SDLLocationDetails.m
index 2d35664b5..e5b113fcb 100644
--- a/SmartDeviceLink/SDLLocationDetails.m
+++ b/SmartDeviceLink/SDLLocationDetails.m
@@ -19,7 +19,12 @@
 }
 
 - (SDLLocationCoordinate *)coordinate {
-    return store[SDLNameLocationCoordinate];
+    NSObject *obj = [store objectForKey: SDLNameLocationCoordinate];
+    if (obj == nil || [obj isKindOfClass:SDLLocationCoordinate.class]) {
+        return (SDLLocationCoordinate *)obj;
+    } else {
+        return [[SDLLocationCoordinate alloc] initWithDictionary:(NSMutableDictionary *)obj];
+    }
 }
 
 - (void)setLocationName:(NSString *)locationName {
@@ -79,19 +84,29 @@
 }
 
 - (SDLImage *)locationImage {
-    return store[SDLNameLocationImage];
+    NSObject *obj = [store objectForKey: SDLNameLocationImage];
+    if (obj == nil || [obj isKindOfClass:SDLImage.class]) {
+        return (SDLImage *)obj;
+    } else {
+        return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj];
+    }
 }
 
 - (void)setSearchAddress:(SDLOasisAddress *)searchAddress {
     if (searchAddress != nil) {
-        store[SDLNameAddress] = searchAddress;
+        store[SDLNameSearchAddress] = searchAddress;
     } else {
-        [store removeObjectForKey:SDLNameAddress];
+        [store removeObjectForKey:SDLNameSearchAddress];
     }
 }
 
 - (SDLOasisAddress *)searchAddress {
-    return store[SDLNameAddress];
+    NSObject *obj = [store objectForKey:SDLNameSearchAddress];
+    if (obj == nil || [obj isKindOfClass:SDLOasisAddress.class]) {
+        return (SDLOasisAddress *)obj;
+    } else {
+        return [[SDLOasisAddress alloc] initWithDictionary:(NSMutableDictionary *)obj];
+    }
 }
 
 @end
diff --git a/SmartDeviceLink/SDLNames.h b/SmartDeviceLink/SDLNames.h
index 47a9522be..f13ecb179 100644
--- a/SmartDeviceLink/SDLNames.h
+++ b/SmartDeviceLink/SDLNames.h
@@ -331,6 +331,7 @@ extern SDLName const SDLNameScreenParams;
 extern SDLName const SDLNameScrollableMessage;
 extern SDLName const SDLNameScrollableMessageBody;
 extern SDLName const SDLNameSDLVersion;
+extern SDLName const SDLNameSearchAddress;
 extern SDLName const SDLNameSecondaryGraphic;
 extern SDLName const SDLNameSecondaryImage;
 extern SDLName const SDLNameSecondaryText;
diff --git a/SmartDeviceLink/SDLNames.m b/SmartDeviceLink/SDLNames.m
index 6295598b1..112bfcdae 100644
--- a/SmartDeviceLink/SDLNames.m
+++ b/SmartDeviceLink/SDLNames.m
@@ -327,6 +327,7 @@ SDLName const SDLNameScreenParams = @"screenParams";
 SDLName const SDLNameScrollableMessage = @"ScrollableMessage";
 SDLName const SDLNameScrollableMessageBody = @"scrollableMessageBody";
 SDLName const SDLNameSDLVersion = @"sdlVersion";
+SDLName const SDLNameSearchAddress = @"searchAddress";
 SDLName const SDLNameSecondaryGraphic = @"secondaryGraphic";
 SDLName const SDLNameSecondaryImage = @"secondaryImage";
 SDLName const SDLNameSecondaryText = @"secondaryText";
diff --git a/SmartDeviceLink/SDLNotificationConstants.h b/SmartDeviceLink/SDLNotificationConstants.h
index ee1e163cd..63fad1b25 100644
--- a/SmartDeviceLink/SDLNotificationConstants.h
+++ b/SmartDeviceLink/SDLNotificationConstants.h
@@ -79,6 +79,7 @@ extern SDLNotificationName const SDLDidReceiveEndAudioPassThruResponse;
 extern SDLNotificationName const SDLDidReceiveGenericResponse;
 extern SDLNotificationName const SDLDidReceiveGetDTCsResponse;
 extern SDLNotificationName const SDLDidReceiveGetVehicleDataResponse;
+extern SDLNotificationName const SDLDidReceiveGetWaypointsResponse;
 extern SDLNotificationName const SDLDidReceiveListFilesResponse;
 extern SDLNotificationName const SDLDidReceivePerformAudioPassThruResponse;
 extern SDLNotificationName const SDLDidReceivePerformInteractionResponse;
@@ -98,11 +99,13 @@ extern SDLNotificationName const SDLDidReceiveSliderResponse;
 extern SDLNotificationName const SDLDidReceiveSpeakResponse;
 extern SDLNotificationName const SDLDidReceiveSubscribeButtonResponse;
 extern SDLNotificationName const SDLDidReceiveSubscribeVehicleDataResponse;
+extern SDLNotificationName const SDLDidReceiveSubscribeWaypointsResponse;
 extern SDLNotificationName const SDLDidReceiveSyncPDataResponse;
 extern SDLNotificationName const SDLDidReceiveUpdateTurnListResponse;
 extern SDLNotificationName const SDLDidReceiveUnregisterAppInterfaceResponse;
 extern SDLNotificationName const SDLDidReceiveUnsubscribeButtonResponse;
 extern SDLNotificationName const SDLDidReceiveUnsubscribeVehicleDataResponse;
+extern SDLNotificationName const SDLDidReceiveUnsubscribeWaypointsResponse;
 
 /**
  *  NSNotification names associated with specific RPC notifications.
@@ -126,6 +129,7 @@ extern SDLNotificationName const SDLDidReceiveSystemRequestNotification;
 extern SDLNotificationName const SDLDidChangeTurnByTurnStateNotification;
 extern SDLNotificationName const SDLDidReceiveTouchEventNotification;
 extern SDLNotificationName const SDLDidReceiveVehicleDataNotification;
+extern SDLNotificationName const SDLDidReceiveWaypointNotification;
 
 @interface SDLNotificationConstants : NSObject
 
diff --git a/SmartDeviceLink/SDLNotificationConstants.m b/SmartDeviceLink/SDLNotificationConstants.m
index 145dcb41b..8e02d6647 100644
--- a/SmartDeviceLink/SDLNotificationConstants.m
+++ b/SmartDeviceLink/SDLNotificationConstants.m
@@ -37,6 +37,7 @@ SDLNotificationName const SDLDidReceiveEndAudioPassThruResponse = @"com.sdl.resp
 SDLNotificationName const SDLDidReceiveGenericResponse = @"com.sdl.response.generic";
 SDLNotificationName const SDLDidReceiveGetDTCsResponse = @"com.sdl.response.getDTCs";
 SDLNotificationName const SDLDidReceiveGetVehicleDataResponse = @"com.sdl.response.getVehicleData";
+SDLNotificationName const SDLDidReceiveGetWaypointsResponse = @"com.sdl.response.getWaypoints";
 SDLNotificationName const SDLDidReceiveListFilesResponse = @"com.sdl.response.listFiles";
 SDLNotificationName const SDLDidReceivePerformAudioPassThruResponse = @"com.sdl.response.performAudioPassThru";
 SDLNotificationName const SDLDidReceivePerformInteractionResponse = @"com.sdl.response.performInteraction";
@@ -56,11 +57,13 @@ SDLNotificationName const SDLDidReceiveSliderResponse = @"com.sdl.response.slide
 SDLNotificationName const SDLDidReceiveSpeakResponse = @"com.sdl.response.speak";
 SDLNotificationName const SDLDidReceiveSubscribeButtonResponse = @"com.sdl.response.subscribeButton";
 SDLNotificationName const SDLDidReceiveSubscribeVehicleDataResponse = @"com.sdl.response.subscribeVehicleData";
+SDLNotificationName const SDLDidReceiveSubscribeWaypointsResponse = @"com.sdl.response.subscribeWaypoints";
 SDLNotificationName const SDLDidReceiveSyncPDataResponse = @"com.sdl.response.syncPData";
 SDLNotificationName const SDLDidReceiveUpdateTurnListResponse = @"com.sdl.response.updateTurnList";
 SDLNotificationName const SDLDidReceiveUnregisterAppInterfaceResponse = @"com.sdl.response.unregisterAppInterface";
 SDLNotificationName const SDLDidReceiveUnsubscribeButtonResponse = @"com.sdl.response.unsubscribeButton";
 SDLNotificationName const SDLDidReceiveUnsubscribeVehicleDataResponse = @"com.sdl.response.unsubscribeVehicleData";
+SDLNotificationName const SDLDidReceiveUnsubscribeWaypointsResponse = @"com.sdl.response.unsubscribeWaypoints";
 
 #pragma mark - RPC Notifications
 SDLNotificationName const SDLDidChangeDriverDistractionStateNotification = @"com.sdl.notification.changeDriverDistractionStateNotification";
@@ -80,6 +83,7 @@ SDLNotificationName const SDLDidReceiveSystemRequestNotification = @"com.sdl.not
 SDLNotificationName const SDLDidChangeTurnByTurnStateNotification = @"com.sdl.notification.changeTurnByTurnState";
 SDLNotificationName const SDLDidReceiveTouchEventNotification = @"com.sdl.notification.touchEvent";
 SDLNotificationName const SDLDidReceiveVehicleDataNotification = @"com.sdl.notification.vehicleData";
+SDLNotificationName const SDLDidReceiveWaypointNotification = @"com.sdl.notification.waypoint";
 
 
 @implementation SDLNotificationConstants
@@ -102,6 +106,7 @@ SDLNotificationName const SDLDidReceiveVehicleDataNotification = @"com.sdl.notif
              SDLDidReceiveGenericResponse,
              SDLDidReceiveGetDTCsResponse,
              SDLDidReceiveGetVehicleDataResponse,
+             SDLDidReceiveGetWaypointsResponse,
              SDLDidReceiveListFilesResponse,
              SDLDidReceivePerformAudioPassThruResponse,
              SDLDidReceivePerformInteractionResponse,
@@ -121,11 +126,13 @@ SDLNotificationName const SDLDidReceiveVehicleDataNotification = @"com.sdl.notif
              SDLDidReceiveSpeakResponse,
              SDLDidReceiveSubscribeButtonResponse,
              SDLDidReceiveSubscribeVehicleDataResponse,
+             SDLDidReceiveSubscribeWaypointsResponse,
              SDLDidReceiveSyncPDataResponse,
              SDLDidReceiveUpdateTurnListResponse,
              SDLDidReceiveUnregisterAppInterfaceResponse,
              SDLDidReceiveUnsubscribeButtonResponse,
-             SDLDidReceiveUnsubscribeVehicleDataResponse];
+             SDLDidReceiveUnsubscribeVehicleDataResponse,
+             SDLDidReceiveUnsubscribeWaypointsResponse];
 }
 
 + (NSArray<SDLNotificationName> *)allButtonEventNotifications {
diff --git a/SmartDeviceLink/SDLNotificationDispatcher.m b/SmartDeviceLink/SDLNotificationDispatcher.m
index 10e553f6c..cae44a5fd 100644
--- a/SmartDeviceLink/SDLNotificationDispatcher.m
+++ b/SmartDeviceLink/SDLNotificationDispatcher.m
@@ -146,6 +146,10 @@ NS_ASSUME_NONNULL_BEGIN
     [self postRPCResponseNotification:SDLDidReceiveGetVehicleDataResponse response:response];
 }
 
+- (void)onGetWayPointsResponse:(SDLGetWaypointsResponse *)response {
+    [self postRPCResponseNotification:SDLDidReceiveGetWaypointsResponse response:response];
+}
+
 - (void)onListFilesResponse:(SDLListFilesResponse *)response {
     [self postRPCResponseNotification:SDLDidReceiveListFilesResponse response:response];
 }
@@ -222,6 +226,10 @@ NS_ASSUME_NONNULL_BEGIN
     [self postRPCResponseNotification:SDLDidReceiveSubscribeVehicleDataResponse response:response];
 }
 
+- (void)onSubscribeWayPointsResponse:(SDLSubscribeWaypointsResponse *)response {
+    [self postRPCResponseNotification:SDLDidReceiveSubscribeWaypointsResponse response:response];
+}
+
 - (void)onSyncPDataResponse:(SDLSyncPDataResponse *)response {
     [self postRPCResponseNotification:SDLDidReceiveSyncPDataResponse response:response];
 }
@@ -242,6 +250,10 @@ NS_ASSUME_NONNULL_BEGIN
     [self postRPCResponseNotification:SDLDidReceiveUnsubscribeVehicleDataResponse response:response];
 }
 
+- (void)onUnsubscribeWayPointsResponse:(SDLUnsubscribeWaypointsResponse *)response {
+    [self postRPCResponseNotification:SDLDidReceiveUnsubscribeWaypointsResponse response:response];
+}
+
 - (void)onOnAppInterfaceUnregistered:(SDLOnAppInterfaceUnregistered *)notification {
     [self postRPCNotificationNotification:SDLDidReceiveAppUnregisteredNotification notification:notification];
 }
@@ -306,6 +318,10 @@ NS_ASSUME_NONNULL_BEGIN
     [self postRPCNotificationNotification:SDLDidReceiveVehicleDataNotification notification:notification];
 }
 
+- (void)onOnWayPointChange:(SDLOnWaypointChange *)notification {
+    [self postRPCNotificationNotification:SDLDidReceiveWaypointNotification notification:notification];
+}
+
 #pragma clang diagnostic pop
 
 @end
diff --git a/SmartDeviceLink/SDLOnWaypointChange.h b/SmartDeviceLink/SDLOnWaypointChange.h
index fb7daabd3..58b5fca81 100644
--- a/SmartDeviceLink/SDLOnWaypointChange.h
+++ b/SmartDeviceLink/SDLOnWaypointChange.h
@@ -5,7 +5,7 @@
 
 @class SDLLocationDetails;
 
-@interface SDLOnWaypointChange : SDLRPCNotification
+@interface SDLOnWayPointChange : SDLRPCNotification
 
 /**
  * @abstract Location address for display purposes only.
@@ -15,3 +15,7 @@
 @property (copy, nonatomic) NSArray<SDLLocationDetails *> *waypoints;
 
 @end
+
+__deprecated_msg("Use SDLOnWayPointChange instead")
+    @interface SDLOnWaypointChange : SDLOnWayPointChange
+                                     @end
diff --git a/SmartDeviceLink/SDLOnWaypointChange.m b/SmartDeviceLink/SDLOnWaypointChange.m
index 803ff9022..9a744b030 100644
--- a/SmartDeviceLink/SDLOnWaypointChange.m
+++ b/SmartDeviceLink/SDLOnWaypointChange.m
@@ -3,9 +3,10 @@
 
 #import "SDLOnWaypointChange.h"
 
+#import "SDLLocationDetails.h"
 #import "SDLNames.h"
 
-@implementation SDLOnWaypointChange
+@implementation SDLOnWayPointChange
 
 - (instancetype)init {
     if (self = [super initWithName:SDLNameOnWaypointChange]) {
@@ -22,7 +23,20 @@
 }
 
 - (NSArray<SDLLocationDetails *> *)waypoints {
-    return parameters[SDLNameWaypoints];
+    NSMutableArray *array = [parameters objectForKey: SDLNameWaypoints];
+    if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLLocationDetails.class]) {
+        return [array copy];
+    } else {
+        NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]];
+        for (NSDictionary *dict in array) {
+            [newList addObject:[[SDLLocationDetails alloc] initWithDictionary:(NSMutableDictionary *)dict]];
+        }
+        return [newList copy];
+    }
 }
 
 @end
+
+@implementation SDLOnWaypointChange
+
+@end
diff --git a/SmartDeviceLink/SDLPerformInteraction.h b/SmartDeviceLink/SDLPerformInteraction.h
index b0071e0ae..99d11886d 100644
--- a/SmartDeviceLink/SDLPerformInteraction.h
+++ b/SmartDeviceLink/SDLPerformInteraction.h
@@ -29,17 +29,19 @@
 
 - (instancetype)initWithInteractionChoiceSetId:(UInt16)interactionChoiceSetId;
 
-- (instancetype)initWithInteractionChoiceSetIdList:(NSArray<NSNumber<SDLInt> *> *)interactionChoiceSetIdList;
+- (instancetype)initWithInteractionChoiceSetIdList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIdList;
 
 - (instancetype)initWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(UInt16)interactionChoiceSetID;
 
 - (instancetype)initWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(UInt16)interactionChoiceSetID vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp;
 
-- (instancetype)initWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLInt> *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt16)timeout;
+- (instancetype)initWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt32)timeout;
 
-- (instancetype)initWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLInt> *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt16)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp;
+- (instancetype)initWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt32)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp;
 
-- (instancetype)initWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLInt> *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt16)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp;
+- (instancetype)initWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt32)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp;
+
+- (instancetype)initWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt32)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp interactionLayout:(SDLLayoutMode)layout;
 
 /**
  * @abstract The Text that Displayed when the interaction begins. This text may
diff --git a/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink/SDLPerformInteraction.m
index 1c98c64b5..07bb2ea51 100644
--- a/SmartDeviceLink/SDLPerformInteraction.m
+++ b/SmartDeviceLink/SDLPerformInteraction.m
@@ -31,18 +31,22 @@ static UInt16 const SDLDefaultTimeout = 10000;
     return [self initWithInitialPrompt:initialPrompt initialText:initialText interactionChoiceSetIDList:@[@(interactionChoiceSetID)] helpPrompt:nil timeoutPrompt:nil interactionMode:nil timeout:SDLDefaultTimeout vrHelp:vrHelp];
 }
 
-- (instancetype)initWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLInt> *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt16)timeout {
+- (instancetype)initWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt32)timeout {
     return [self initWithInitialPrompt:initialPrompt initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpPrompt:helpPrompt timeoutPrompt:timeoutPrompt interactionMode:interactionMode timeout:timeout vrHelp:nil];
 }
 
-- (instancetype)initWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLInt> *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt16)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp {
+- (instancetype)initWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt32)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp {
     NSMutableArray *initialChunks = [SDLTTSChunk textChunksFromString:initialPrompt];
     NSMutableArray *helpChunks = [SDLTTSChunk textChunksFromString:helpPrompt];
     NSMutableArray *timeoutChunks = [SDLTTSChunk textChunksFromString:timeoutPrompt];
     return [self initWithInitialChunks:initialChunks initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpChunks:helpChunks timeoutChunks:timeoutChunks interactionMode:interactionMode timeout:timeout vrHelp:vrHelp];
 }
 
-- (instancetype)initWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLInt> *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt16)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp {
+- (instancetype)initWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpChunks:(NSArray *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt32)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp {
+    return [self initWithInitialChunks:initialChunks initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpChunks:helpChunks timeoutChunks:timeoutChunks interactionMode:interactionMode timeout:timeout vrHelp:vrHelp interactionLayout:nil];
+}
+
+- (instancetype)initWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLUInt> *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode)interactionMode timeout:(UInt32)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp interactionLayout:(SDLLayoutMode)layout {
     self = [self initWithInteractionChoiceSetIdList:interactionChoiceSetIDList];
     if (!self) {
         return nil;
@@ -55,6 +59,7 @@ static UInt16 const SDLDefaultTimeout = 10000;
     self.interactionMode = interactionMode;
     self.timeout = @(timeout);
     self.vrHelp = [vrHelp mutableCopy];
+    self.interactionLayout = layout;
 
     return self;
 }
diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m
index 4439008c0..1c78aee12 100644
--- a/SmartDeviceLink/SDLProxy.m
+++ b/SmartDeviceLink/SDLProxy.m
@@ -46,7 +46,7 @@ typedef NSString SDLVehicleMake;
 typedef void (^URLSessionTaskCompletionHandler)(NSData *data, NSURLResponse *response, NSError *error);
 typedef void (^URLSessionDownloadTaskCompletionHandler)(NSURL *location, NSURLResponse *response, NSError *error);
 
-NSString *const SDLProxyVersion = @"4.4.0";
+NSString *const SDLProxyVersion = @"4.5.0";
 const float startSessionTime = 10.0;
 const float notifyProxyClosedDelay = 0.1;
 const int POLICIES_CORRELATION_ID = 65535;
@@ -385,6 +385,9 @@ const int POLICIES_CORRELATION_ID = 65535;
         _streamingMediaManager.displayCapabilties = registerResponse.displayCapabilities;
     }
     self.protocol.securityManager = [self securityManagerForMake:registerResponse.vehicleType.make];
+    if (self.protocol.securityManager && [self.protocol.securityManager respondsToSelector:@selector(setAppId:)]) {
+        self.protocol.securityManager.appId = self.appId;
+    }
 
     if ([SDLGlobals globals].protocolVersion >= 4) {
         [self sendMobileHMIState];
diff --git a/SmartDeviceLink/SDLProxyListener.h b/SmartDeviceLink/SDLProxyListener.h
index 4a1a1ac09..9b6f460f4 100644
--- a/SmartDeviceLink/SDLProxyListener.h
+++ b/SmartDeviceLink/SDLProxyListener.h
@@ -20,6 +20,7 @@
 @class SDLGenericResponse;
 @class SDLGetDTCsResponse;
 @class SDLGetVehicleDataResponse;
+@class SDLGetWaypointsResponse;
 @class SDLListFilesResponse;
 @class SDLOnAppInterfaceUnregistered;
 @class SDLOnAudioPassThru;
@@ -40,6 +41,7 @@
 @class SDLOnTBTClientState;
 @class SDLOnTouchEvent;
 @class SDLOnVehicleData;
+@class SDLOnWaypointChange;
 @class SDLPerformAudioPassThruResponse;
 @class SDLPerformInteractionResponse;
 @class SDLPutFileResponse;
@@ -58,11 +60,13 @@
 @class SDLSpeakResponse;
 @class SDLSubscribeButtonResponse;
 @class SDLSubscribeVehicleDataResponse;
+@class SDLSubscribeWaypointsResponse;
 @class SDLSyncPDataResponse;
 @class SDLUpdateTurnListResponse;
 @class SDLUnregisterAppInterfaceResponse;
 @class SDLUnsubscribeButtonResponse;
 @class SDLUnsubscribeVehicleDataResponse;
+@class SDLUnsubscribeWaypointsResponse;
 
 
 @protocol SDLProxyListener <NSObject>
@@ -92,6 +96,7 @@
 - (void)onGenericResponse:(SDLGenericResponse *)response;
 - (void)onGetDTCsResponse:(SDLGetDTCsResponse *)response;
 - (void)onGetVehicleDataResponse:(SDLGetVehicleDataResponse *)response;
+- (void)onGetWayPointsResponse:(SDLGetWaypointsResponse *)response;
 - (void)onListFilesResponse:(SDLListFilesResponse *)response;
 - (void)onReceivedLockScreenIcon:(UIImage *)icon;
 - (void)onOnAppInterfaceUnregistered:(SDLOnAppInterfaceUnregistered *)notification;
@@ -110,6 +115,7 @@
 - (void)onOnTBTClientState:(SDLOnTBTClientState *)notification;
 - (void)onOnTouchEvent:(SDLOnTouchEvent *)notification;
 - (void)onOnVehicleData:(SDLOnVehicleData *)notification;
+- (void)onOnWayPointChange:(SDLOnWaypointChange *)notification;
 - (void)onPerformAudioPassThruResponse:(SDLPerformAudioPassThruResponse *)response;
 - (void)onPerformInteractionResponse:(SDLPerformInteractionResponse *)response;
 - (void)onPutFileResponse:(SDLPutFileResponse *)response;
@@ -128,10 +134,12 @@
 - (void)onSpeakResponse:(SDLSpeakResponse *)response;
 - (void)onSubscribeButtonResponse:(SDLSubscribeButtonResponse *)response;
 - (void)onSubscribeVehicleDataResponse:(SDLSubscribeVehicleDataResponse *)response;
+- (void)onSubscribeWayPointsResponse:(SDLSubscribeWaypointsResponse *)response;
 - (void)onSyncPDataResponse:(SDLSyncPDataResponse *)response;
 - (void)onUpdateTurnListResponse:(SDLUpdateTurnListResponse *)response;
 - (void)onUnregisterAppInterfaceResponse:(SDLUnregisterAppInterfaceResponse *)response;
 - (void)onUnsubscribeButtonResponse:(SDLUnsubscribeButtonResponse *)response;
 - (void)onUnsubscribeVehicleDataResponse:(SDLUnsubscribeVehicleDataResponse *)response;
+- (void)onUnsubscribeWayPointsResponse:(SDLUnsubscribeWaypointsResponse *)response;
 
 @end
diff --git a/SmartDeviceLink/SDLPutFile.h b/SmartDeviceLink/SDLPutFile.h
index 390531292..63634a881 100644
--- a/SmartDeviceLink/SDLPutFile.h
+++ b/SmartDeviceLink/SDLPutFile.h
@@ -19,7 +19,7 @@
 
 - (instancetype)initWithFileName:(NSString *)fileName fileType:(SDLFileType)fileType persistentFile:(BOOL)persistentFile;
 
-- (instancetype)initWithFileName:(NSString *)fileName fileType:(SDLFileType)fileType persistentFile:(BOOL)persistentFile systemFile:(BOOL)systemFile offset:(UInt64)offset length:(UInt64)length;
+- (instancetype)initWithFileName:(NSString *)fileName fileType:(SDLFileType)fileType persistentFile:(BOOL)persistentFile systemFile:(BOOL)systemFile offset:(UInt32)offset length:(UInt32)length;
 
 /**
  * A file reference name
diff --git a/SmartDeviceLink/SDLPutFile.m b/SmartDeviceLink/SDLPutFile.m
index b004b500b..2f237cfb8 100644
--- a/SmartDeviceLink/SDLPutFile.m
+++ b/SmartDeviceLink/SDLPutFile.m
@@ -13,7 +13,7 @@
     return self;
 }
 
-- (instancetype)initWithFileName:(NSString *)fileName fileType:(SDLFileType)fileType persistentFile:(BOOL)persistentFile systemFile:(BOOL)systemFile offset:(UInt64)offset length:(UInt64)length {
+- (instancetype)initWithFileName:(NSString *)fileName fileType:(SDLFileType)fileType persistentFile:(BOOL)persistentFile systemFile:(BOOL)systemFile offset:(UInt32)offset length:(UInt32)length {
     self = [self initWithFileName:fileName fileType:fileType persistentFile:persistentFile];
     if (!self) {
         return nil;
diff --git a/SmartDeviceLink/SDLReadDID.h b/SmartDeviceLink/SDLReadDID.h
index 8cb378388..057edd488 100644
--- a/SmartDeviceLink/SDLReadDID.h
+++ b/SmartDeviceLink/SDLReadDID.h
@@ -18,7 +18,7 @@
  */
 @interface SDLReadDID : SDLRPCRequest
 
-- (instancetype)initWithECUName:(UInt16)ecuNumber didLocation:(NSArray<NSNumber<SDLInt> *> *)didLocation;
+- (instancetype)initWithECUName:(UInt16)ecuNumber didLocation:(NSArray<NSNumber<SDLUInt> *> *)didLocation;
 
 /**
  * @abstract An ID of the vehicle module
diff --git a/SmartDeviceLink/SDLSecurityType.h b/SmartDeviceLink/SDLSecurityType.h
index 86dadd52e..c459665f8 100644
--- a/SmartDeviceLink/SDLSecurityType.h
+++ b/SmartDeviceLink/SDLSecurityType.h
@@ -12,6 +12,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @protocol SDLSecurityType <NSObject>
 
+@property (copy, nonatomic) NSString *appId;
+
 - (void)initializeWithAppId:(NSString *)appId completionHandler:(void (^)(NSError *_Nullable error))completionHandler;
 - (void)stop;
 
diff --git a/SmartDeviceLink/SDLSetMediaClockTimer.h b/SmartDeviceLink/SDLSetMediaClockTimer.h
index 47cd9112a..09ba6344a 100644
--- a/SmartDeviceLink/SDLSetMediaClockTimer.h
+++ b/SmartDeviceLink/SDLSetMediaClockTimer.h
@@ -19,7 +19,7 @@
  */
 @interface SDLSetMediaClockTimer : SDLRPCRequest
 
-- (instancetype)initWithUpdateMode:(SDLUpdateMode)updateMode hours:(NSInteger)hours minutes:(NSInteger)minutes seconds:(NSInteger)seconds;
+- (instancetype)initWithUpdateMode:(SDLUpdateMode)updateMode hours:(UInt8)hours minutes:(UInt8)minutes seconds:(UInt8)seconds;
 
 - (instancetype)initWithUpdateMode:(SDLUpdateMode)updateMode;
 
diff --git a/SmartDeviceLink/SDLSetMediaClockTimer.m b/SmartDeviceLink/SDLSetMediaClockTimer.m
index 69d107213..85a1c04cd 100644
--- a/SmartDeviceLink/SDLSetMediaClockTimer.m
+++ b/SmartDeviceLink/SDLSetMediaClockTimer.m
@@ -16,7 +16,7 @@
 }
 
 
-- (instancetype)initWithUpdateMode:(SDLUpdateMode)updateMode hours:(NSInteger)hours minutes:(NSInteger)minutes seconds:(NSInteger)seconds {
+- (instancetype)initWithUpdateMode:(SDLUpdateMode)updateMode hours:(UInt8)hours minutes:(UInt8)minutes seconds:(UInt8)seconds {
     self = [self initWithUpdateMode:updateMode];
     if (!self) {
         return nil;
diff --git a/SmartDeviceLink/SDLShowConstantTBT.h b/SmartDeviceLink/SDLShowConstantTBT.h
index a8339b9ad..48601b1e8 100644
--- a/SmartDeviceLink/SDLShowConstantTBT.h
+++ b/SmartDeviceLink/SDLShowConstantTBT.h
@@ -3,8 +3,6 @@
 
 #import "SDLRPCRequest.h"
 
-#import <CoreGraphics/CGBase.h>
-
 @class SDLImage;
 @class SDLSoftButton;
 
@@ -16,7 +14,7 @@
  */
 @interface SDLShowConstantTBT : SDLRPCRequest
 
-- (instancetype)initWithNavigationText1:(NSString *)navigationText1 navigationText2:(NSString *)navigationText2 eta:(NSString *)eta timeToDestination:(NSString *)timeToDestination totalDistance:(NSString *)totalDistance turnIcon:(SDLImage *)turnIcon nextTurnIcon:(SDLImage *)nextTurnIcon distanceToManeuver:(CGFloat)distanceToManeuver distanceToManeuverScale:(CGFloat)distanceToManeuverScale maneuverComplete:(BOOL)maneuverComplete softButtons:(NSArray<SDLSoftButton *> *)softButtons;
+- (instancetype)initWithNavigationText1:(NSString *)navigationText1 navigationText2:(NSString *)navigationText2 eta:(NSString *)eta timeToDestination:(NSString *)timeToDestination totalDistance:(NSString *)totalDistance turnIcon:(SDLImage *)turnIcon nextTurnIcon:(SDLImage *)nextTurnIcon distanceToManeuver:(double)distanceToManeuver distanceToManeuverScale:(double)distanceToManeuverScale maneuverComplete:(BOOL)maneuverComplete softButtons:(NSArray<SDLSoftButton *> *)softButtons;
 
 @property (strong) NSString *navigationText1;
 @property (strong) NSString *navigationText2;
diff --git a/SmartDeviceLink/SDLShowConstantTBT.m b/SmartDeviceLink/SDLShowConstantTBT.m
index 10ccc560d..093666d6f 100644
--- a/SmartDeviceLink/SDLShowConstantTBT.m
+++ b/SmartDeviceLink/SDLShowConstantTBT.m
@@ -16,7 +16,7 @@
     return self;
 }
 
-- (instancetype)initWithNavigationText1:(NSString *)navigationText1 navigationText2:(NSString *)navigationText2 eta:(NSString *)eta timeToDestination:(NSString *)timeToDestination totalDistance:(NSString *)totalDistance turnIcon:(SDLImage *)turnIcon nextTurnIcon:(SDLImage *)nextTurnIcon distanceToManeuver:(CGFloat)distanceToManeuver distanceToManeuverScale:(CGFloat)distanceToManeuverScale maneuverComplete:(BOOL)maneuverComplete softButtons:(NSArray<SDLSoftButton *> *)softButtons {
+- (instancetype)initWithNavigationText1:(NSString *)navigationText1 navigationText2:(NSString *)navigationText2 eta:(NSString *)eta timeToDestination:(NSString *)timeToDestination totalDistance:(NSString *)totalDistance turnIcon:(SDLImage *)turnIcon nextTurnIcon:(SDLImage *)nextTurnIcon distanceToManeuver:(double)distanceToManeuver distanceToManeuverScale:(double)distanceToManeuverScale maneuverComplete:(BOOL)maneuverComplete softButtons:(NSArray<SDLSoftButton *> *)softButtons {
     self = [self init];
     if (!self) {
         return nil;
diff --git a/SmartDeviceLink/SDLSoftButton.h b/SmartDeviceLink/SDLSoftButton.h
index ccf98c612..83d3e3049 100644
--- a/SmartDeviceLink/SDLSoftButton.h
+++ b/SmartDeviceLink/SDLSoftButton.h
@@ -15,7 +15,7 @@
 
 - (instancetype)initWithHandler:(SDLRPCNotificationHandler)handler;
 
-- (instancetype)initWithType:(SDLSoftButtonType)tyle text:(NSString *)text image:(SDLImage *)image highlighted:(BOOL)highlighted buttonId:(UInt16)buttonId systemAction:(SDLSystemAction)systemAction handler:(SDLRPCNotificationHandler)handler;
+- (instancetype)initWithType:(SDLSoftButtonType)type text:(NSString *)text image:(SDLImage *)image highlighted:(BOOL)highlighted buttonId:(UInt16)buttonId systemAction:(SDLSystemAction)systemAction handler:(SDLRPCNotificationHandler)handler;
 
 @property (copy, nonatomic) SDLRPCNotificationHandler handler;
 
diff --git a/SmartDeviceLink/SDLStreamingMediaManager.m b/SmartDeviceLink/SDLStreamingMediaManager.m
index 353d0ea9f..16ca4d5f5 100644
--- a/SmartDeviceLink/SDLStreamingMediaManager.m
+++ b/SmartDeviceLink/SDLStreamingMediaManager.m
@@ -145,6 +145,10 @@ NS_ASSUME_NONNULL_BEGIN
                                     typeof(weakSelf) strongSelf = weakSelf;
                                     // If success, we will get an ACK or NACK, so those methods will handle calling the video block
                                     if (!success) {
+                                        if (strongSelf.videoStartBlock == nil) {
+                                            return;
+                                        }
+
                                         strongSelf.videoStartBlock(NO, NO, error);
                                         strongSelf.videoStartBlock = nil;
                                     }
@@ -180,6 +184,10 @@ NS_ASSUME_NONNULL_BEGIN
                                     typeof(weakSelf) strongSelf = weakSelf;
                                     // If this passes, we will get an ACK or NACK, so those methods will handle calling the audio block
                                     if (!success) {
+                                        if (strongSelf.audioStartBlock == nil) {
+                                            return;
+                                        }
+
                                         strongSelf.audioStartBlock(NO, NO, error);
                                         strongSelf.audioStartBlock = nil;
                                     }
@@ -277,6 +285,11 @@ NS_ASSUME_NONNULL_BEGIN
         case SDLServiceType_Audio: {
             self.audioSessionConnected = YES;
             self.audioSessionEncrypted = header.encrypted;
+
+            if (self.audioStartBlock == nil) {
+                return;
+            }
+
             self.audioStartBlock(YES, header.encrypted, nil);
             self.audioStartBlock = nil;
         } break;
@@ -287,6 +300,11 @@ NS_ASSUME_NONNULL_BEGIN
             if (!success) {
                 [self sdl_teardownCompressionSession];
                 [self.protocol endServiceWithType:SDLServiceType_Video];
+
+                if (self.videoStartBlock == nil) {
+                    return;
+                }
+
                 self.videoStartBlock(NO, header.encrypted, error);
                 self.videoStartBlock = nil;
 
@@ -295,6 +313,11 @@ NS_ASSUME_NONNULL_BEGIN
 
             self.videoSessionConnected = YES;
             self.videoSessionEncrypted = header.encrypted;
+
+            if (self.videoStartBlock == nil) {
+                return;
+            }
+
             self.videoStartBlock(YES, header.encrypted, nil);
             self.videoStartBlock = nil;
         } break;
@@ -307,12 +330,20 @@ NS_ASSUME_NONNULL_BEGIN
         case SDLServiceType_Audio: {
             NSError *error = [NSError errorWithDomain:SDLErrorDomainStreamingMediaAudio code:SDLStreamingAudioErrorHeadUnitNACK userInfo:nil];
 
+            if (self.audioStartBlock == nil) {
+                return;
+            }
+
             self.audioStartBlock(NO, NO, error);
             self.audioStartBlock = nil;
         } break;
         case SDLServiceType_Video: {
             NSError *error = [NSError errorWithDomain:SDLErrorDomainStreamingMediaVideo code:SDLStreamingVideoErrorHeadUnitNACK userInfo:nil];
 
+            if (self.videoStartBlock == nil) {
+                return;
+            }
+
             self.videoStartBlock(NO, NO, error);
             self.videoStartBlock = nil;
         } break;
diff --git a/SmartDeviceLink/SDLSubscribeWaypoints.h b/SmartDeviceLink/SDLSubscribeWaypoints.h
index b5127d00e..fb04caf97 100644
--- a/SmartDeviceLink/SDLSubscribeWaypoints.h
+++ b/SmartDeviceLink/SDLSubscribeWaypoints.h
@@ -4,13 +4,16 @@
 #import "SDLRPCRequest.h"
 
 /**
-* A SDLSubscribeWaypoints can be sent to subscribe
-* for any changes in waypoints/destinations
-*
-* @see SDLUnsubscribeWaypoints
-*
-*/
-
-@interface SDLSubscribeWaypoints : SDLRPCRequest
+ * A SDLSubscribeWaypoints can be sent to subscribe
+ * for any changes in waypoints/destinations
+ *
+ * @see SDLUnsubscribeWaypoints
+ *
+ */
+@interface SDLSubscribeWayPoints : SDLRPCRequest
 
 @end
+
+__deprecated_msg("Use SDLSubscribeWayPoints instead")
+    @interface SDLSubscribeWaypoints : SDLSubscribeWayPoints
+                                       @end
diff --git a/SmartDeviceLink/SDLSubscribeWaypoints.m b/SmartDeviceLink/SDLSubscribeWaypoints.m
index d99778bfb..377c92c8b 100644
--- a/SmartDeviceLink/SDLSubscribeWaypoints.m
+++ b/SmartDeviceLink/SDLSubscribeWaypoints.m
@@ -4,7 +4,7 @@
 #import "SDLSubscribeWaypoints.h"
 #import "SDLNames.h"
 
-@implementation SDLSubscribeWaypoints
+@implementation SDLSubscribeWayPoints
 
 - (instancetype)init {
     if (self = [super initWithName:SDLNameSubscribeWaypoints]) {
@@ -13,3 +13,7 @@
 }
 
 @end
+
+@implementation SDLSubscribeWaypoints
+
+@end
diff --git a/SmartDeviceLink/SDLSubscribeWaypointsResponse.h b/SmartDeviceLink/SDLSubscribeWaypointsResponse.h
index 9d4cfd967..cd13c2af6 100644
--- a/SmartDeviceLink/SDLSubscribeWaypointsResponse.h
+++ b/SmartDeviceLink/SDLSubscribeWaypointsResponse.h
@@ -3,6 +3,10 @@
 
 #import "SDLRPCResponse.h"
 
-@interface SDLSubscribeWaypointsResponse : SDLRPCResponse
+@interface SDLSubscribeWayPointsResponse : SDLRPCResponse
 
 @end
+
+__deprecated_msg("Use SDLSubscribeWayPointsResponse instead")
+    @interface SDLSubscribeWaypointsResponse : SDLSubscribeWayPointsResponse
+                                               @end
diff --git a/SmartDeviceLink/SDLSubscribeWaypointsResponse.m b/SmartDeviceLink/SDLSubscribeWaypointsResponse.m
index bdf9935b6..1c5b51cb1 100644
--- a/SmartDeviceLink/SDLSubscribeWaypointsResponse.m
+++ b/SmartDeviceLink/SDLSubscribeWaypointsResponse.m
@@ -1,10 +1,11 @@
+
 //  SDLSubscribeWaypointsResponse.m
 //
 
 #import "SDLSubscribeWaypointsResponse.h"
 #import "SDLNames.h"
 
-@implementation SDLSubscribeWaypointsResponse
+@implementation SDLSubscribeWayPointsResponse
 
 - (instancetype)init {
     if (self = [super initWithName:SDLNameSubscribeWaypoints]) {
@@ -13,3 +14,7 @@
 }
 
 @end
+
+@implementation SDLSubscribeWaypointsResponse
+
+@end
diff --git a/SmartDeviceLink/SDLSyncMsgVersion.h b/SmartDeviceLink/SDLSyncMsgVersion.h
index 6fe4ec009..873a56f53 100644
--- a/SmartDeviceLink/SDLSyncMsgVersion.h
+++ b/SmartDeviceLink/SDLSyncMsgVersion.h
@@ -11,6 +11,7 @@
  */
 @interface SDLSyncMsgVersion : SDLRPCStruct
 
+// TODO: (Alex M.)[2016-12-1] Change from NSInteger to UInt8
 - (instancetype)initWithMajorVersion:(NSInteger)majorVersion minorVersion:(NSInteger)minorVersion;
 
 /**
diff --git a/SmartDeviceLink/SDLUnsubscribeWaypoints.h b/SmartDeviceLink/SDLUnsubscribeWaypoints.h
index ff7b15296..d5e477ad7 100644
--- a/SmartDeviceLink/SDLUnsubscribeWaypoints.h
+++ b/SmartDeviceLink/SDLUnsubscribeWaypoints.h
@@ -3,6 +3,10 @@
 
 #import "SDLRPCRequest.h"
 
-@interface SDLUnsubscribeWaypoints : SDLRPCRequest
+@interface SDLUnsubscribeWayPoints : SDLRPCRequest
 
 @end
+
+__deprecated_msg("Use SDLUnsubscribeWayPoints instead")
+    @interface SDLUnsubscribeWaypoints : SDLUnsubscribeWayPoints
+                                         @end
diff --git a/SmartDeviceLink/SDLUnsubscribeWaypoints.m b/SmartDeviceLink/SDLUnsubscribeWaypoints.m
index 40adfc43a..a60ec04ab 100644
--- a/SmartDeviceLink/SDLUnsubscribeWaypoints.m
+++ b/SmartDeviceLink/SDLUnsubscribeWaypoints.m
@@ -4,7 +4,7 @@
 #import "SDLUnsubscribeWaypoints.h"
 #import "SDLNames.h"
 
-@implementation SDLUnsubscribeWaypoints
+@implementation SDLUnsubscribeWayPoints
 
 - (instancetype)init {
     if (self = [super initWithName:SDLNameUnsubscribeWaypoints]) {
@@ -13,3 +13,7 @@
 }
 
 @end
+
+@implementation SDLUnsubscribeWaypoints
+
+@end
diff --git a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h b/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h
index e64cc2d73..11a9e7961 100644
--- a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h
+++ b/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h
@@ -1,8 +1,12 @@
-//  SDLUnsubscribeWaypointsResponse.m
+//  SDLUnsubscribeWaypointsResponse.h
 //
 
 #import "SDLRPCResponse.h"
 
-@interface SDLUnsubscribeWaypointsResponse : SDLRPCResponse
+@interface SDLUnsubscribeWayPointsResponse : SDLRPCResponse
 
 @end
+
+__deprecated_msg("Use SDLUnsubscribeWayPointsResponse instead")
+    @interface SDLUnsubscribeWaypointsResponse : SDLUnsubscribeWayPointsResponse
+                                                 @end
diff --git a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.m b/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.m
index e0bdcbc30..63e232900 100644
--- a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.m
+++ b/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.m
@@ -4,7 +4,7 @@
 #import "SDLUnsubscribeWaypointsResponse.h"
 #import "SDLNames.h"
 
-@implementation SDLUnsubscribeWaypointsResponse
+@implementation SDLUnsubscribeWayPointsResponse
 
 - (instancetype)init {
     if (self = [super initWithName:SDLNameUnsubscribeWaypoints]) {
@@ -13,3 +13,7 @@
 }
 
 @end
+
+@implementation SDLUnsubscribeWaypointsResponse
+
+@end
diff --git a/SmartDeviceLink/SDLV2ProtocolHeader.m b/SmartDeviceLink/SDLV2ProtocolHeader.m
index 0cb690eb4..f61df2e8d 100644
--- a/SmartDeviceLink/SDLV2ProtocolHeader.m
+++ b/SmartDeviceLink/SDLV2ProtocolHeader.m
@@ -95,7 +95,7 @@ const int V2PROTOCOL_HEADERSIZE = 12;
     NSString *frameDataString = nil;
     if (self.frameType == SDLFrameType_Control) {
         if (self.frameData >= 0 && self.frameData <= 5) {
-            NSArray<NSString *> *controlFrameDataNames = @[@"Heartbeat", @"StartSession", @"StartSessionACK", @"StartSessionNACK", @"EndSession", @"EndSessionNACK"];
+            NSArray *controlFrameDataNames = @[@"Heartbeat", @"StartSession", @"StartSessionACK", @"StartSessionNACK", @"EndSession", @"EndSessionACK", @"EndSessionNACK"];
             frameDataString = controlFrameDataNames[self.frameData];
         } else {
             frameDataString = @"Reserved";
diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLNotificationDispatcherSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLNotificationDispatcherSpec.m
index ba3b2f1c1..f43a8535b 100644
--- a/SmartDeviceLinkTests/DevAPISpecs/SDLNotificationDispatcherSpec.m
+++ b/SmartDeviceLinkTests/DevAPISpecs/SDLNotificationDispatcherSpec.m
@@ -38,6 +38,7 @@ describe(@"a notification dispatcher", ^{
         expect(@([testDispatcher respondsToSelector:@selector(onGenericResponse:)])).to(beTruthy());
         expect(@([testDispatcher respondsToSelector:@selector(onGetDTCsResponse:)])).to(beTruthy());
         expect(@([testDispatcher respondsToSelector:@selector(onGetVehicleDataResponse:)])).to(beTruthy());
+        expect(@([testDispatcher respondsToSelector:@selector(onGetWayPointsResponse:)])).to(beTruthy());
         expect(@([testDispatcher respondsToSelector:@selector(onReceivedLockScreenIcon:)])).to(beTruthy());
         expect(@([testDispatcher respondsToSelector:@selector(onOnAppInterfaceUnregistered:)])).to(beTruthy());
         expect(@([testDispatcher respondsToSelector:@selector(onOnAudioPassThru:)])).to(beTruthy());
@@ -53,6 +54,7 @@ describe(@"a notification dispatcher", ^{
         expect(@([testDispatcher respondsToSelector:@selector(onOnTBTClientState:)])).to(beTruthy());
         expect(@([testDispatcher respondsToSelector:@selector(onOnTouchEvent:)])).to(beTruthy());
         expect(@([testDispatcher respondsToSelector:@selector(onOnVehicleData:)])).to(beTruthy());
+        expect(@([testDispatcher respondsToSelector:@selector(onOnWayPointChange:)])).to(beTruthy());
         expect(@([testDispatcher respondsToSelector:@selector(onPerformAudioPassThruResponse:)])).to(beTruthy());
         expect(@([testDispatcher respondsToSelector:@selector(onPerformInteractionResponse:)])).to(beTruthy());
         expect(@([testDispatcher respondsToSelector:@selector(onPutFileResponse:)])).to(beTruthy());
@@ -71,11 +73,13 @@ describe(@"a notification dispatcher", ^{
         expect(@([testDispatcher respondsToSelector:@selector(onSpeakResponse:)])).to(beTruthy());
         expect(@([testDispatcher respondsToSelector:@selector(onSubscribeButtonResponse:)])).to(beTruthy());
         expect(@([testDispatcher respondsToSelector:@selector(onSubscribeVehicleDataResponse:)])).to(beTruthy());
+        expect(@([testDispatcher respondsToSelector:@selector(onSubscribeWayPointsResponse:)])).to(beTruthy());
         expect(@([testDispatcher respondsToSelector:@selector(onSyncPDataResponse:)])).to(beTruthy());
         expect(@([testDispatcher respondsToSelector:@selector(onUpdateTurnListResponse:)])).to(beTruthy());
         expect(@([testDispatcher respondsToSelector:@selector(onUnregisterAppInterfaceResponse:)])).to(beTruthy());
         expect(@([testDispatcher respondsToSelector:@selector(onUnsubscribeButtonResponse:)])).to(beTruthy());
         expect(@([testDispatcher respondsToSelector:@selector(onUnsubscribeVehicleDataResponse:)])).to(beTruthy());
+        expect(@([testDispatcher respondsToSelector:@selector(onUnsubscribeWayPointsResponse:)])).to(beTruthy());
     });
     
     describe(@"when told to post a notification", ^{
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnWaypointChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnWaypointChangeSpec.m
index ddbdf4dc1..7bf1ff54d 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnWaypointChangeSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnWaypointChangeSpec.m
@@ -17,12 +17,12 @@
 QuickSpecBegin(SDLOnWaypointChangeSpec)
 
 describe(@"Getter/Setter Tests", ^ {
-    __block SDLOnWaypointChange* testNotification = nil;
+    __block SDLOnWayPointChange* testNotification = nil;
     __block NSArray<SDLLocationDetails *>* someWaypoints = nil;
     
     describe(@"when initialized with init", ^{
         beforeEach(^{
-            testNotification = [[SDLOnWaypointChange alloc] init];
+            testNotification = [[SDLOnWayPointChange alloc] init];
         });
         
         context(@"when parameters are set correctly", ^{
@@ -71,7 +71,7 @@ describe(@"Getter/Setter Tests", ^ {
                                            SDLNameOperationName:SDLNameOnWaypointChange
                                            };
                 
-                testNotification = [[SDLOnWaypointChange alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]];
+                testNotification = [[SDLOnWayPointChange alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]];
             });
             
             // Since all the properties are immutable, a copy should be executed as a retain, which means they should be identical
@@ -89,7 +89,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                    }
                                            };
                 
-                testNotification = [[SDLOnWaypointChange alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]];
+                testNotification = [[SDLOnWayPointChange alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]];
             });
             
             it(@"should return nil for waypoints", ^{
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetWaypointsSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetWaypointsSpec.m
index b1397c24c..677a09e16 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetWaypointsSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetWaypointsSpec.m
@@ -15,7 +15,7 @@ QuickSpecBegin(SDLGetWaypointsSpec)
 
 describe(@"Getter/Setter Tests", ^ {
     it(@"Should set and get correctly", ^ {
-        SDLGetWaypoints* testRequest = [[SDLGetWaypoints alloc] init];
+        SDLGetWayPoints* testRequest = [[SDLGetWayPoints alloc] init];
         
         testRequest.waypointType = SDLWaypointTypeAll;
         
@@ -27,13 +27,13 @@ describe(@"Getter/Setter Tests", ^ {
                                            @{SDLNameParameters:
                                                  @{SDLNameWaypointType:SDLWaypointTypeAll},
                                              SDLNameOperationName:SDLNameGetWaypoints}} mutableCopy];
-        SDLGetWaypoints* testRequest = [[SDLGetWaypoints alloc] initWithDictionary:dict];
+        SDLGetWayPoints* testRequest = [[SDLGetWayPoints alloc] initWithDictionary:dict];
         
         expect(testRequest.waypointType).to(equal(SDLWaypointTypeAll));
     });
     
     it(@"Should return nil if not set", ^ {
-        SDLGetWaypoints* testRequest = [[SDLGetWaypoints alloc] init];
+        SDLGetWayPoints* testRequest = [[SDLGetWayPoints alloc] init];
         
         expect(testRequest.waypointType).to(beNil());
     });
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetWaypointsResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetWaypointsResponseSpec.m
index 29eb2921e..54e557050 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetWaypointsResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetWaypointsResponseSpec.m
@@ -17,12 +17,12 @@
 QuickSpecBegin(SDLGetWaypointsResponseSpec)
 
 describe(@"Getter/Setter Tests", ^ {
-    __block SDLGetWaypointsResponse* testResponse = nil;
+    __block SDLGetWayPointsResponse* testResponse = nil;
     __block NSArray<SDLLocationDetails *>* someWaypoints = nil;
     
     describe(@"when initialized with init", ^{
         beforeEach(^{
-            testResponse = [[SDLGetWaypointsResponse alloc] init];
+            testResponse = [[SDLGetWayPointsResponse alloc] init];
         });
         
         context(@"when parameters are set correctly", ^{
@@ -70,7 +70,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                    }
                                            };
                 
-                testResponse = [[SDLGetWaypointsResponse alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]];
+                testResponse = [[SDLGetWayPointsResponse alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]];
             });
             
             // Since all the properties are immutable, a copy should be executed as a retain, which means they should be identical
@@ -88,7 +88,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                    }
                                            };
                 
-                testResponse = [[SDLGetWaypointsResponse alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]];
+                testResponse = [[SDLGetWayPointsResponse alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]];
             });
             
             it(@"should return nil for waypoints", ^{
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLocationDetailsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLocationDetailsSpec.m
index cfc2c7867..de18bb501 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLocationDetailsSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLocationDetailsSpec.m
@@ -94,9 +94,10 @@ describe(@"Getter/Setter Tests", ^ {
                 someCoordinate = [[SDLLocationCoordinate alloc] init];
                 someLocation = @"Livio";
                 someLocationDescription = @"A great place to work";
-                someAddressLines = @[@"3136 Hilton Rd", @"Ferndale, MI", @"48220"];
+                someAddressLines = @[@"332 E Lincoln Ave", @"Royal Oak, MI", @"48067"];
                 somePhoneNumber = @"248-591-0333";
                 someImage = [[SDLImage alloc] init];
+                someAddress = [[SDLOasisAddress alloc] initWithSubThoroughfare:@"test" thoroughfare:@"1" locality:@"local" administrativeArea:@"admin" postalCode:@"48067" countryCode:@"12345"];
                 NSDictionary *initDict = @{
                                            SDLNameLocationCoordinate: someCoordinate,
                                            SDLNameLocationName: someLocation,
@@ -104,7 +105,7 @@ describe(@"Getter/Setter Tests", ^ {
                                            SDLNameAddressLines: someAddressLines,
                                            SDLNamePhoneNumber: somePhoneNumber,
                                            SDLNameLocationImage: someImage,
-                                           SDLNameAddress: someAddress
+                                           SDLNameSearchAddress: someAddress
                                            };
                 
                 testStruct = [[SDLLocationDetails alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]];
diff --git a/SmartDeviceLink_Example/Info.plist b/SmartDeviceLink_Example/Info.plist
index 351821d0a..a9677a973 100644
--- a/SmartDeviceLink_Example/Info.plist
+++ b/SmartDeviceLink_Example/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.4.0</string>
+	<string>4.5.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/docs/Classes.html b/docs/Classes.html
index 93b93e95f..160cf74d8 100644
--- a/docs/Classes.html
+++ b/docs/Classes.html
@@ -83,7 +83,9 @@
   <li><a href="#section-SDLGetDTCsResponse">SDLGetDTCsResponse</a></li>
   <li><a href="#section-SDLGetVehicleData">SDLGetVehicleData</a></li>
   <li><a href="#section-SDLGetVehicleDataResponse">SDLGetVehicleDataResponse</a></li>
+  <li><a href="#section-SDLGetWayPoints">SDLGetWayPoints</a></li>
   <li><a href="#section-SDLGetWaypoints">SDLGetWaypoints</a></li>
+  <li><a href="#section-SDLGetWayPointsResponse">SDLGetWayPointsResponse</a></li>
   <li><a href="#section-SDLGetWaypointsResponse">SDLGetWaypointsResponse</a></li>
   <li><a href="#section-SDLGlobalProperty">SDLGlobalProperty</a></li>
   <li><a href="#section-SDLHMICapabilities">SDLHMICapabilities</a></li>
@@ -140,6 +142,7 @@
   <li><a href="#section-SDLOnTBTClientState">SDLOnTBTClientState</a></li>
   <li><a href="#section-SDLOnTouchEvent">SDLOnTouchEvent</a></li>
   <li><a href="#section-SDLOnVehicleData">SDLOnVehicleData</a></li>
+  <li><a href="#section-SDLOnWayPointChange">SDLOnWayPointChange</a></li>
   <li><a href="#section-SDLOnWaypointChange">SDLOnWaypointChange</a></li>
   <li><a href="#section-SDLPRNDL">SDLPRNDL</a></li>
   <li><a href="#section-SDLParameterPermissions">SDLParameterPermissions</a></li>
@@ -213,7 +216,9 @@
   <li><a href="#section-SDLSubscribeButtonResponse">SDLSubscribeButtonResponse</a></li>
   <li><a href="#section-SDLSubscribeVehicleData">SDLSubscribeVehicleData</a></li>
   <li><a href="#section-SDLSubscribeVehicleDataResponse">SDLSubscribeVehicleDataResponse</a></li>
+  <li><a href="#section-SDLSubscribeWayPoints">SDLSubscribeWayPoints</a></li>
   <li><a href="#section-SDLSubscribeWaypoints">SDLSubscribeWaypoints</a></li>
+  <li><a href="#section-SDLSubscribeWayPointsResponse">SDLSubscribeWayPointsResponse</a></li>
   <li><a href="#section-SDLSubscribeWaypointsResponse">SDLSubscribeWaypointsResponse</a></li>
   <li><a href="#section-SDLSyncMsgVersion">SDLSyncMsgVersion</a></li>
   <li><a href="#section-SDLSyncPData">SDLSyncPData</a></li>
@@ -242,7 +247,9 @@
   <li><a href="#section-SDLUnsubscribeButtonResponse">SDLUnsubscribeButtonResponse</a></li>
   <li><a href="#section-SDLUnsubscribeVehicleData">SDLUnsubscribeVehicleData</a></li>
   <li><a href="#section-SDLUnsubscribeVehicleDataResponse">SDLUnsubscribeVehicleDataResponse</a></li>
+  <li><a href="#section-SDLUnsubscribeWayPoints">SDLUnsubscribeWayPoints</a></li>
   <li><a href="#section-SDLUnsubscribeWaypoints">SDLUnsubscribeWaypoints</a></li>
+  <li><a href="#section-SDLUnsubscribeWayPointsResponse">SDLUnsubscribeWayPointsResponse</a></li>
   <li><a href="#section-SDLUnsubscribeWaypointsResponse">SDLUnsubscribeWaypointsResponse</a></li>
   <li><a href="#section-SDLUpdateMode">SDLUpdateMode</a></li>
   <li><a href="#section-SDLUpdateTurnList">SDLUpdateTurnList</a></li>
@@ -2039,13 +2046,36 @@ Function Group: ProprietaryData
   
   
   
+  <h3 id="section-SDLGetWayPoints">
+      SDLGetWayPoints
+  </h3>
+  
+  <p>Undocumented</p>
+
+  <a href="Classes/SDLGetWayPoints.html" class="slightly-smaller">See more</a>
+  
+  
+  
+  
+  
   <h3 id="section-SDLGetWaypoints">
       SDLGetWaypoints
   </h3>
   
   <p>Undocumented</p>
 
-  <a href="Classes/SDLGetWaypoints.html" class="slightly-smaller">See more</a>
+  
+  
+  
+  
+  
+  <h3 id="section-SDLGetWayPointsResponse">
+      SDLGetWayPointsResponse
+  </h3>
+  
+  <p>Undocumented</p>
+
+  <a href="Classes/SDLGetWayPointsResponse.html" class="slightly-smaller">See more</a>
   
   
   
@@ -2057,7 +2087,6 @@ Function Group: ProprietaryData
   
   <p>Undocumented</p>
 
-  <a href="Classes/SDLGetWaypointsResponse.html" class="slightly-smaller">See more</a>
   
   
   
@@ -3157,13 +3186,24 @@ The call back also includes details regarding the current HMI_Status level, driv
   
   
   
+  <h3 id="section-SDLOnWayPointChange">
+      SDLOnWayPointChange
+  </h3>
+  
+  <p>Undocumented</p>
+
+  <a href="Classes/SDLOnWayPointChange.html" class="slightly-smaller">See more</a>
+  
+  
+  
+  
+  
   <h3 id="section-SDLOnWaypointChange">
       SDLOnWaypointChange
   </h3>
   
   <p>Undocumented</p>
 
-  <a href="Classes/SDLOnWaypointChange.html" class="slightly-smaller">See more</a>
   
   
   
@@ -4664,8 +4704,8 @@ Function Group: ScrollableMessage
   
   
   
-  <h3 id="section-SDLSubscribeWaypoints">
-      SDLSubscribeWaypoints
+  <h3 id="section-SDLSubscribeWayPoints">
+      SDLSubscribeWayPoints
   </h3>
   
   <p>A SDLSubscribeWaypoints can be sent to subscribe
@@ -4680,15 +4720,37 @@ Function Group: ScrollableMessage
   
   
   <h4>Objective-C</h4>
-  <pre class="highlight"><code><span class="k">@interface</span> <span class="nc">SDLSubscribeWaypoints</span> <span class="p">:</span> <span class="nc">SDLRPCRequest</span></code></pre>
+  <pre class="highlight"><code><span class="k">@interface</span> <span class="nc">SDLSubscribeWayPoints</span> <span class="p">:</span> <span class="nc">SDLRPCRequest</span></code></pre>
 
   
   <h4>Swift</h4>
-  <pre class="highlight"><code><span class="kd">class</span> <span class="kt">SDLSubscribeWaypoints</span> <span class="p">:</span> <span class="kt"><a href="Classes/SDLRPCRequest.html">SDLRPCRequest</a></span></code></pre>
+  <pre class="highlight"><code><span class="kd">class</span> <span class="kt">SDLSubscribeWayPoints</span> <span class="p">:</span> <span class="kt"><a href="Classes/SDLRPCRequest.html">SDLRPCRequest</a></span></code></pre>
 
   
   
   
+  <h3 id="section-SDLSubscribeWaypoints">
+      SDLSubscribeWaypoints
+  </h3>
+  
+  <p>Undocumented</p>
+
+  
+  
+  
+  
+  
+  <h3 id="section-SDLSubscribeWayPointsResponse">
+      SDLSubscribeWayPointsResponse
+  </h3>
+  
+  <p>Undocumented</p>
+
+  
+  
+  
+  
+  
   <h3 id="section-SDLSubscribeWaypointsResponse">
       SDLSubscribeWaypointsResponse
   </h3>
@@ -5243,6 +5305,17 @@ See SDLSubscribeButton</p>
   
   
   
+  <h3 id="section-SDLUnsubscribeWayPoints">
+      SDLUnsubscribeWayPoints
+  </h3>
+  
+  <p>Undocumented</p>
+
+  
+  
+  
+  
+  
   <h3 id="section-SDLUnsubscribeWaypoints">
       SDLUnsubscribeWaypoints
   </h3>
@@ -5254,6 +5327,17 @@ See SDLSubscribeButton</p>
   
   
   
+  <h3 id="section-SDLUnsubscribeWayPointsResponse">
+      SDLUnsubscribeWayPointsResponse
+  </h3>
+  
+  <p>Undocumented</p>
+
+  
+  
+  
+  
+  
   <h3 id="section-SDLUnsubscribeWaypointsResponse">
       SDLUnsubscribeWaypointsResponse
   </h3>
diff --git a/docs/Classes/SDLGetWaypoints.html b/docs/Classes/SDLGetWaypoints.html
index 17ea3202a..eccd857b1 100644
--- a/docs/Classes/SDLGetWaypoints.html
+++ b/docs/Classes/SDLGetWaypoints.html
@@ -1,4 +1,4 @@
-<h1>SDLGetWaypoints Class Reference</h1>
+<h1>SDLGetWayPoints Class Reference</h1>
 
 <h3>Section Contents</h3>
 
diff --git a/docs/Classes/SDLGetWaypointsResponse.html b/docs/Classes/SDLGetWaypointsResponse.html
index 24d98c36e..b485b1739 100644
--- a/docs/Classes/SDLGetWaypointsResponse.html
+++ b/docs/Classes/SDLGetWaypointsResponse.html
@@ -1,4 +1,4 @@
-<h1>SDLGetWaypointsResponse Class Reference</h1>
+<h1>SDLGetWayPointsResponse Class Reference</h1>
 
 <h3>Section Contents</h3>
 
diff --git a/docs/Classes/SDLOnWaypointChange.html b/docs/Classes/SDLOnWaypointChange.html
index 31f7a4e0f..be37a886f 100644
--- a/docs/Classes/SDLOnWaypointChange.html
+++ b/docs/Classes/SDLOnWaypointChange.html
@@ -1,4 +1,4 @@
-<h1>SDLOnWaypointChange Class Reference</h1>
+<h1>SDLOnWayPointChange Class Reference</h1>
 
 <h3>Section Contents</h3>
 
diff --git a/docs/Classes/SDLPerformInteraction.html b/docs/Classes/SDLPerformInteraction.html
index 3af74c633..b0927195e 100644
--- a/docs/Classes/SDLPerformInteraction.html
+++ b/docs/Classes/SDLPerformInteraction.html
@@ -12,6 +12,7 @@
   <li><a href="#section--initWithInitialPrompt:initialText:interactionChoiceSetIDList:helpPrompt:timeoutPrompt:interactionMode:timeout:">-initWithInitialPrompt:initialText:interactionChoiceSetIDList:helpPrompt:timeoutPrompt:interactionMode:timeout:</a></li>
   <li><a href="#section--initWithInitialPrompt:initialText:interactionChoiceSetIDList:helpPrompt:timeoutPrompt:interactionMode:timeout:vrHelp:">-initWithInitialPrompt:initialText:interactionChoiceSetIDList:helpPrompt:timeoutPrompt:interactionMode:timeout:vrHelp:</a></li>
   <li><a href="#section--initWithInitialChunks:initialText:interactionChoiceSetIDList:helpChunks:timeoutChunks:interactionMode:timeout:vrHelp:">-initWithInitialChunks:initialText:interactionChoiceSetIDList:helpChunks:timeoutChunks:interactionMode:timeout:vrHelp:</a></li>
+  <li><a href="#section--initWithInitialChunks:initialText:interactionChoiceSetIDList:helpChunks:timeoutChunks:interactionMode:timeout:vrHelp:interactionLayout:">-initWithInitialChunks:initialText:interactionChoiceSetIDList:helpChunks:timeoutChunks:interactionMode:timeout:vrHelp:interactionLayout:</a></li>
   <li><a href="#section-initialText">initialText</a></li>
   <li><a href="#section-initialPrompt">initialPrompt</a></li>
   <li><a href="#section-interactionMode">interactionMode</a></li>
@@ -189,6 +190,21 @@
   
   
   
+  <h3 id="section--initWithInitialChunks:initialText:interactionChoiceSetIDList:helpChunks:timeoutChunks:interactionMode:timeout:vrHelp:interactionLayout:">
+      -initWithInitialChunks:initialText:interactionChoiceSetIDList:helpChunks:timeoutChunks:interactionMode:timeout:vrHelp:interactionLayout:
+  </h3>
+  
+  <p>Undocumented</p>
+
+  
+  
+  <h4>Objective-C</h4>
+  <pre class="highlight"><code><span class="k">@interface</span> <span class="nc">SDLPerformInteraction</span> <span class="p">:</span> <span class="nc">SDLRPCRequest</span></code></pre>
+
+  
+  
+  
+  
   <h3 id="section-initialText">
       initialText
   </h3>
diff --git a/docs/Constants.html b/docs/Constants.html
index d1563e76e..f006b9b76 100644
--- a/docs/Constants.html
+++ b/docs/Constants.html
@@ -26,6 +26,7 @@
   <li><a href="#section-SDLDidReceiveGenericResponse">SDLDidReceiveGenericResponse</a></li>
   <li><a href="#section-SDLDidReceiveGetDTCsResponse">SDLDidReceiveGetDTCsResponse</a></li>
   <li><a href="#section-SDLDidReceiveGetVehicleDataResponse">SDLDidReceiveGetVehicleDataResponse</a></li>
+  <li><a href="#section-SDLDidReceiveGetWaypointsResponse">SDLDidReceiveGetWaypointsResponse</a></li>
   <li><a href="#section-SDLDidReceiveListFilesResponse">SDLDidReceiveListFilesResponse</a></li>
   <li><a href="#section-SDLDidReceivePerformAudioPassThruResponse">SDLDidReceivePerformAudioPassThruResponse</a></li>
   <li><a href="#section-SDLDidReceivePerformInteractionResponse">SDLDidReceivePerformInteractionResponse</a></li>
@@ -45,11 +46,13 @@
   <li><a href="#section-SDLDidReceiveSpeakResponse">SDLDidReceiveSpeakResponse</a></li>
   <li><a href="#section-SDLDidReceiveSubscribeButtonResponse">SDLDidReceiveSubscribeButtonResponse</a></li>
   <li><a href="#section-SDLDidReceiveSubscribeVehicleDataResponse">SDLDidReceiveSubscribeVehicleDataResponse</a></li>
+  <li><a href="#section-SDLDidReceiveSubscribeWaypointsResponse">SDLDidReceiveSubscribeWaypointsResponse</a></li>
   <li><a href="#section-SDLDidReceiveSyncPDataResponse">SDLDidReceiveSyncPDataResponse</a></li>
   <li><a href="#section-SDLDidReceiveUpdateTurnListResponse">SDLDidReceiveUpdateTurnListResponse</a></li>
   <li><a href="#section-SDLDidReceiveUnregisterAppInterfaceResponse">SDLDidReceiveUnregisterAppInterfaceResponse</a></li>
   <li><a href="#section-SDLDidReceiveUnsubscribeButtonResponse">SDLDidReceiveUnsubscribeButtonResponse</a></li>
   <li><a href="#section-SDLDidReceiveUnsubscribeVehicleDataResponse">SDLDidReceiveUnsubscribeVehicleDataResponse</a></li>
+  <li><a href="#section-SDLDidReceiveUnsubscribeWaypointsResponse">SDLDidReceiveUnsubscribeWaypointsResponse</a></li>
   <li><a href="#section-SDLDidChangeDriverDistractionStateNotification">SDLDidChangeDriverDistractionStateNotification</a></li>
   <li><a href="#section-SDLDidChangeHMIStatusNotification">SDLDidChangeHMIStatusNotification</a></li>
   <li><a href="#section-SDLDidReceiveAudioPassThruNotification">SDLDidReceiveAudioPassThruNotification</a></li>
@@ -68,6 +71,7 @@
   <li><a href="#section-SDLDidChangeTurnByTurnStateNotification">SDLDidChangeTurnByTurnStateNotification</a></li>
   <li><a href="#section-SDLDidReceiveTouchEventNotification">SDLDidReceiveTouchEventNotification</a></li>
   <li><a href="#section-SDLDidReceiveVehicleDataNotification">SDLDidReceiveVehicleDataNotification</a></li>
+  <li><a href="#section-SDLDidReceiveWaypointNotification">SDLDidReceiveWaypointNotification</a></li>
   <li><a href="#section-SDLProtocolSecurityErrorDomain">SDLProtocolSecurityErrorDomain</a></li>
   <li><a href="#section-SDLErrorDomainStreamingMediaVideo">SDLErrorDomainStreamingMediaVideo</a></li>
   <li><a href="#section-SDLErrorDomainStreamingMediaAudio">SDLErrorDomainStreamingMediaAudio</a></li>
@@ -335,6 +339,17 @@
   
   
   
+  <h3 id="section-SDLDidReceiveGetWaypointsResponse">
+      SDLDidReceiveGetWaypointsResponse
+  </h3>
+  
+  <p>Undocumented</p>
+
+  
+  
+  
+  
+  
   <h3 id="section-SDLDidReceiveListFilesResponse">
       SDLDidReceiveListFilesResponse
   </h3>
@@ -544,6 +559,17 @@
   
   
   
+  <h3 id="section-SDLDidReceiveSubscribeWaypointsResponse">
+      SDLDidReceiveSubscribeWaypointsResponse
+  </h3>
+  
+  <p>Undocumented</p>
+
+  
+  
+  
+  
+  
   <h3 id="section-SDLDidReceiveSyncPDataResponse">
       SDLDidReceiveSyncPDataResponse
   </h3>
@@ -599,6 +625,17 @@
   
   
   
+  <h3 id="section-SDLDidReceiveUnsubscribeWaypointsResponse">
+      SDLDidReceiveUnsubscribeWaypointsResponse
+  </h3>
+  
+  <p>Undocumented</p>
+
+  
+  
+  
+  
+  
   <h3 id="section-SDLDidChangeDriverDistractionStateNotification">
       SDLDidChangeDriverDistractionStateNotification
   </h3>
@@ -797,6 +834,17 @@
   
   
   
+  <h3 id="section-SDLDidReceiveWaypointNotification">
+      SDLDidReceiveWaypointNotification
+  </h3>
+  
+  <p>Undocumented</p>
+
+  
+  
+  
+  
+  
   <h3 id="section-SDLProtocolSecurityErrorDomain">
       SDLProtocolSecurityErrorDomain
   </h3>
diff --git a/docs/Protocols/SDLProxyListener.html b/docs/Protocols/SDLProxyListener.html
index efb3a93c8..75a3e820b 100644
--- a/docs/Protocols/SDLProxyListener.html
+++ b/docs/Protocols/SDLProxyListener.html
@@ -25,6 +25,7 @@
   <li><a href="#section--onGenericResponse:">-onGenericResponse:</a></li>
   <li><a href="#section--onGetDTCsResponse:">-onGetDTCsResponse:</a></li>
   <li><a href="#section--onGetVehicleDataResponse:">-onGetVehicleDataResponse:</a></li>
+  <li><a href="#section--onGetWayPointsResponse:">-onGetWayPointsResponse:</a></li>
   <li><a href="#section--onListFilesResponse:">-onListFilesResponse:</a></li>
   <li><a href="#section--onReceivedLockScreenIcon:">-onReceivedLockScreenIcon:</a></li>
   <li><a href="#section--onOnAppInterfaceUnregistered:">-onOnAppInterfaceUnregistered:</a></li>
@@ -43,6 +44,7 @@
   <li><a href="#section--onOnTBTClientState:">-onOnTBTClientState:</a></li>
   <li><a href="#section--onOnTouchEvent:">-onOnTouchEvent:</a></li>
   <li><a href="#section--onOnVehicleData:">-onOnVehicleData:</a></li>
+  <li><a href="#section--onOnWayPointChange:">-onOnWayPointChange:</a></li>
   <li><a href="#section--onPerformAudioPassThruResponse:">-onPerformAudioPassThruResponse:</a></li>
   <li><a href="#section--onPerformInteractionResponse:">-onPerformInteractionResponse:</a></li>
   <li><a href="#section--onPutFileResponse:">-onPutFileResponse:</a></li>
@@ -61,11 +63,13 @@
   <li><a href="#section--onSpeakResponse:">-onSpeakResponse:</a></li>
   <li><a href="#section--onSubscribeButtonResponse:">-onSubscribeButtonResponse:</a></li>
   <li><a href="#section--onSubscribeVehicleDataResponse:">-onSubscribeVehicleDataResponse:</a></li>
+  <li><a href="#section--onSubscribeWayPointsResponse:">-onSubscribeWayPointsResponse:</a></li>
   <li><a href="#section--onSyncPDataResponse:">-onSyncPDataResponse:</a></li>
   <li><a href="#section--onUpdateTurnListResponse:">-onUpdateTurnListResponse:</a></li>
   <li><a href="#section--onUnregisterAppInterfaceResponse:">-onUnregisterAppInterfaceResponse:</a></li>
   <li><a href="#section--onUnsubscribeButtonResponse:">-onUnsubscribeButtonResponse:</a></li>
   <li><a href="#section--onUnsubscribeVehicleDataResponse:">-onUnsubscribeVehicleDataResponse:</a></li>
+  <li><a href="#section--onUnsubscribeWayPointsResponse:">-onUnsubscribeWayPointsResponse:</a></li>
 </ul>
 
 <h3>Overview</h3>
@@ -316,6 +320,17 @@
   
   
   
+  <h3 id="section--onGetWayPointsResponse:">
+      -onGetWayPointsResponse:
+  </h3>
+  
+  <p>Undocumented</p>
+
+  
+  
+  
+  
+  
   <h3 id="section--onListFilesResponse:">
       -onListFilesResponse:
   </h3>
@@ -514,6 +529,17 @@
   
   
   
+  <h3 id="section--onOnWayPointChange:">
+      -onOnWayPointChange:
+  </h3>
+  
+  <p>Undocumented</p>
+
+  
+  
+  
+  
+  
   <h3 id="section--onPerformAudioPassThruResponse:">
       -onPerformAudioPassThruResponse:
   </h3>
@@ -712,6 +738,17 @@
   
   
   
+  <h3 id="section--onSubscribeWayPointsResponse:">
+      -onSubscribeWayPointsResponse:
+  </h3>
+  
+  <p>Undocumented</p>
+
+  
+  
+  
+  
+  
   <h3 id="section--onSyncPDataResponse:">
       -onSyncPDataResponse:
   </h3>
@@ -767,4 +804,15 @@
   
   
   
+  <h3 id="section--onUnsubscribeWayPointsResponse:">
+      -onUnsubscribeWayPointsResponse:
+  </h3>
+  
+  <p>Undocumented</p>
+
+  
+  
+  
+  
+  
 </section>
diff --git a/docs/Protocols/SDLSecurityType.html b/docs/Protocols/SDLSecurityType.html
index a3ad3061f..b19263ba7 100644
--- a/docs/Protocols/SDLSecurityType.html
+++ b/docs/Protocols/SDLSecurityType.html
@@ -3,6 +3,7 @@
 <h3>Section Contents</h3>
 
 <ul>
+  <li><a href="#section-appId">appId</a></li>
   <li><a href="#section--initializeWithAppId:completionHandler:">-initializeWithAppId:completionHandler:</a></li>
   <li><a href="#section--stop">-stop</a></li>
   <li><a href="#section--runHandshakeWithClientData:error:">-runHandshakeWithClientData:error:</a></li>
@@ -17,6 +18,17 @@
 
 
 <section class="section task-group-section">
+  <h3 id="section-appId">
+      appId
+  </h3>
+  
+  <p>Undocumented</p>
+
+  
+  
+  
+  
+  
   <h3 id="section--initializeWithAppId:completionHandler:">
       -initializeWithAppId:completionHandler:
   </h3>
diff --git a/docs/index.html b/docs/index.html
index 64f7fd2bb..82ef49f34 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -164,10 +164,14 @@
       url: Classes/SDLGetVehicleData.html
     - name: SDLGetVehicleDataResponse
       url: Classes/SDLGetVehicleDataResponse.html
+    - name: SDLGetWayPoints
+      url: Classes/SDLGetWayPoints.html
+    - name: SDLGetWayPointsResponse
+      url: Classes/SDLGetWayPointsResponse.html
     - name: SDLGetWaypoints
-      url: Classes/SDLGetWaypoints.html
+      url: Classes.html#/c:objc(cs)SDLGetWaypoints
     - name: SDLGetWaypointsResponse
-      url: Classes/SDLGetWaypointsResponse.html
+      url: Classes.html#/c:objc(cs)SDLGetWaypointsResponse
     - name: SDLGlobalProperty
       url: Classes/SDLGlobalProperty.html
     - name: SDLHMICapabilities
@@ -278,8 +282,10 @@
       url: Classes/SDLOnTouchEvent.html
     - name: SDLOnVehicleData
       url: Classes/SDLOnVehicleData.html
+    - name: SDLOnWayPointChange
+      url: Classes/SDLOnWayPointChange.html
     - name: SDLOnWaypointChange
-      url: Classes/SDLOnWaypointChange.html
+      url: Classes.html#/c:objc(cs)SDLOnWaypointChange
     - name: SDLPRNDL
       url: Classes/SDLPRNDL.html
     - name: SDLParameterPermissions
@@ -424,6 +430,10 @@
       url: Classes/SDLSubscribeVehicleData.html
     - name: SDLSubscribeVehicleDataResponse
       url: Classes/SDLSubscribeVehicleDataResponse.html
+    - name: SDLSubscribeWayPoints
+      url: Classes.html#/c:objc(cs)SDLSubscribeWayPoints
+    - name: SDLSubscribeWayPointsResponse
+      url: Classes.html#/c:objc(cs)SDLSubscribeWayPointsResponse
     - name: SDLSubscribeWaypoints
       url: Classes.html#/c:objc(cs)SDLSubscribeWaypoints
     - name: SDLSubscribeWaypointsResponse
@@ -482,6 +492,10 @@
       url: Classes/SDLUnsubscribeVehicleData.html
     - name: SDLUnsubscribeVehicleDataResponse
       url: Classes/SDLUnsubscribeVehicleDataResponse.html
+    - name: SDLUnsubscribeWayPoints
+      url: Classes.html#/c:objc(cs)SDLUnsubscribeWayPoints
+    - name: SDLUnsubscribeWayPointsResponse
+      url: Classes.html#/c:objc(cs)SDLUnsubscribeWayPointsResponse
     - name: SDLUnsubscribeWaypoints
       url: Classes.html#/c:objc(cs)SDLUnsubscribeWaypoints
     - name: SDLUnsubscribeWaypointsResponse
@@ -584,6 +598,8 @@
       url: Constants.html#/c:@SDLDidReceiveGetDTCsResponse
     - name: SDLDidReceiveGetVehicleDataResponse
       url: Constants.html#/c:@SDLDidReceiveGetVehicleDataResponse
+    - name: SDLDidReceiveGetWaypointsResponse
+      url: Constants.html#/c:@SDLDidReceiveGetWaypointsResponse
     - name: SDLDidReceiveKeyboardInputNotification
       url: Constants.html#/c:@SDLDidReceiveKeyboardInputNotification
     - name: SDLDidReceiveListFilesResponse
@@ -628,6 +644,8 @@
       url: Constants.html#/c:@SDLDidReceiveSubscribeButtonResponse
     - name: SDLDidReceiveSubscribeVehicleDataResponse
       url: Constants.html#/c:@SDLDidReceiveSubscribeVehicleDataResponse
+    - name: SDLDidReceiveSubscribeWaypointsResponse
+      url: Constants.html#/c:@SDLDidReceiveSubscribeWaypointsResponse
     - name: SDLDidReceiveSyncPDataResponse
       url: Constants.html#/c:@SDLDidReceiveSyncPDataResponse
     - name: SDLDidReceiveSystemRequestNotification
@@ -640,12 +658,16 @@
       url: Constants.html#/c:@SDLDidReceiveUnsubscribeButtonResponse
     - name: SDLDidReceiveUnsubscribeVehicleDataResponse
       url: Constants.html#/c:@SDLDidReceiveUnsubscribeVehicleDataResponse
+    - name: SDLDidReceiveUnsubscribeWaypointsResponse
+      url: Constants.html#/c:@SDLDidReceiveUnsubscribeWaypointsResponse
     - name: SDLDidReceiveUpdateTurnListResponse
       url: Constants.html#/c:@SDLDidReceiveUpdateTurnListResponse
     - name: SDLDidReceiveVehicleDataNotification
       url: Constants.html#/c:@SDLDidReceiveVehicleDataNotification
     - name: SDLDidReceiveVehicleIconNotification
       url: Constants.html#/c:@SDLDidReceiveVehicleIconNotification
+    - name: SDLDidReceiveWaypointNotification
+      url: Constants.html#/c:@SDLDidReceiveWaypointNotification
     - name: SDLErrorDomainStreamingMediaAudio
       url: Constants.html#/c:@SDLErrorDomainStreamingMediaAudio
     - name: SDLErrorDomainStreamingMediaVideo
diff --git a/docs/undocumented.json b/docs/undocumented.json
index bca17f283..f044b929d 100644
--- a/docs/undocumented.json
+++ b/docs/undocumented.json
@@ -1997,21 +1997,35 @@
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLGetWaypoints.h",
-      "line": 8,
-      "symbol": "SDLGetWaypoints",
+      "line": 9,
+      "symbol": "SDLGetWayPoints",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.class",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLGetWaypoints.h",
-      "line": 10,
-      "symbol": "SDLGetWaypoints.-initWithType:",
+      "line": 11,
+      "symbol": "SDLGetWayPoints.-initWithType:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLGetWaypoints.h",
+      "line": 24,
+      "symbol": "SDLGetWaypoints",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.class",
+      "warning": "undocumented"
+    },
+    {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLGetWaypointsResponse.h",
       "line": 8,
+      "symbol": "SDLGetWayPointsResponse",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.class",
+      "warning": "undocumented"
+    },
+    {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLGetWaypointsResponse.h",
+      "line": 22,
       "symbol": "SDLGetWaypointsResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.class",
       "warning": "undocumented"
@@ -2319,42 +2333,42 @@
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLKeyboardProperties.h",
-      "line": 17,
+      "line": 18,
       "symbol": "SDLKeyboardProperties.-initWithLanguage:layout:keypressMode:limitedCharacterList:autoCompleteText:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLKeyboardProperties.h",
-      "line": 19,
+      "line": 20,
       "symbol": "SDLKeyboardProperties.language",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLKeyboardProperties.h",
-      "line": 20,
+      "line": 21,
       "symbol": "SDLKeyboardProperties.keyboardLayout",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLKeyboardProperties.h",
-      "line": 21,
+      "line": 22,
       "symbol": "SDLKeyboardProperties.keypressMode",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLKeyboardProperties.h",
-      "line": 22,
+      "line": 23,
       "symbol": "SDLKeyboardProperties.limitedCharacterList",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLKeyboardProperties.h",
-      "line": 23,
+      "line": 24,
       "symbol": "SDLKeyboardProperties.autoCompleteText",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
@@ -2775,314 +2789,342 @@
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 82,
-      "symbol": "SDLDidReceiveListFilesResponse",
+      "symbol": "SDLDidReceiveGetWaypointsResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 83,
-      "symbol": "SDLDidReceivePerformAudioPassThruResponse",
+      "symbol": "SDLDidReceiveListFilesResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 84,
-      "symbol": "SDLDidReceivePerformInteractionResponse",
+      "symbol": "SDLDidReceivePerformAudioPassThruResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 85,
-      "symbol": "SDLDidReceivePutFileResponse",
+      "symbol": "SDLDidReceivePerformInteractionResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 86,
-      "symbol": "SDLDidReceiveReadDIDResponse",
+      "symbol": "SDLDidReceivePutFileResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 87,
-      "symbol": "SDLDidReceiveRegisterAppInterfaceResponse",
+      "symbol": "SDLDidReceiveReadDIDResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 88,
-      "symbol": "SDLDidReceiveResetGlobalPropertiesResponse",
+      "symbol": "SDLDidReceiveRegisterAppInterfaceResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 89,
-      "symbol": "SDLDidReceiveScrollableMessageResponse",
+      "symbol": "SDLDidReceiveResetGlobalPropertiesResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 90,
-      "symbol": "SDLDidReceiveSendLocationResponse",
+      "symbol": "SDLDidReceiveScrollableMessageResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 91,
-      "symbol": "SDLDidReceiveSetAppIconResponse",
+      "symbol": "SDLDidReceiveSendLocationResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 92,
-      "symbol": "SDLDidReceiveSetDisplayLayoutResponse",
+      "symbol": "SDLDidReceiveSetAppIconResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 93,
-      "symbol": "SDLDidReceiveSetGlobalPropertiesResponse",
+      "symbol": "SDLDidReceiveSetDisplayLayoutResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 94,
-      "symbol": "SDLDidReceiveSetMediaClockTimerResponse",
+      "symbol": "SDLDidReceiveSetGlobalPropertiesResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 95,
-      "symbol": "SDLDidReceiveShowConstantTBTResponse",
+      "symbol": "SDLDidReceiveSetMediaClockTimerResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 96,
-      "symbol": "SDLDidReceiveShowResponse",
+      "symbol": "SDLDidReceiveShowConstantTBTResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 97,
-      "symbol": "SDLDidReceiveSliderResponse",
+      "symbol": "SDLDidReceiveShowResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 98,
-      "symbol": "SDLDidReceiveSpeakResponse",
+      "symbol": "SDLDidReceiveSliderResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 99,
-      "symbol": "SDLDidReceiveSubscribeButtonResponse",
+      "symbol": "SDLDidReceiveSpeakResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 100,
-      "symbol": "SDLDidReceiveSubscribeVehicleDataResponse",
+      "symbol": "SDLDidReceiveSubscribeButtonResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 101,
-      "symbol": "SDLDidReceiveSyncPDataResponse",
+      "symbol": "SDLDidReceiveSubscribeVehicleDataResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 102,
-      "symbol": "SDLDidReceiveUpdateTurnListResponse",
+      "symbol": "SDLDidReceiveSubscribeWaypointsResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 103,
-      "symbol": "SDLDidReceiveUnregisterAppInterfaceResponse",
+      "symbol": "SDLDidReceiveSyncPDataResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 104,
-      "symbol": "SDLDidReceiveUnsubscribeButtonResponse",
+      "symbol": "SDLDidReceiveUpdateTurnListResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
       "line": 105,
+      "symbol": "SDLDidReceiveUnregisterAppInterfaceResponse",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
+      "warning": "undocumented"
+    },
+    {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
+      "line": 106,
+      "symbol": "SDLDidReceiveUnsubscribeButtonResponse",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
+      "warning": "undocumented"
+    },
+    {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
+      "line": 107,
       "symbol": "SDLDidReceiveUnsubscribeVehicleDataResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 111,
+      "line": 108,
+      "symbol": "SDLDidReceiveUnsubscribeWaypointsResponse",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
+      "warning": "undocumented"
+    },
+    {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
+      "line": 114,
       "symbol": "SDLDidChangeDriverDistractionStateNotification",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 112,
+      "line": 115,
       "symbol": "SDLDidChangeHMIStatusNotification",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 113,
+      "line": 116,
       "symbol": "SDLDidReceiveAudioPassThruNotification",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 114,
+      "line": 117,
       "symbol": "SDLDidReceiveAppUnregisteredNotification",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 115,
+      "line": 118,
       "symbol": "SDLDidReceiveButtonEventNotification",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 116,
+      "line": 119,
       "symbol": "SDLDidReceiveButtonPressNotification",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 117,
+      "line": 120,
       "symbol": "SDLDidReceiveCommandNotification",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 118,
+      "line": 121,
       "symbol": "SDLDidReceiveEncodedDataNotification",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 119,
+      "line": 122,
       "symbol": "SDLDidReceiveKeyboardInputNotification",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 120,
+      "line": 123,
       "symbol": "SDLDidChangeLanguageNotification",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 121,
+      "line": 124,
       "symbol": "SDLDidChangeLockScreenStatusNotification",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 122,
+      "line": 125,
       "symbol": "SDLDidReceiveNewHashNotification",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 123,
+      "line": 126,
       "symbol": "SDLDidReceiveVehicleIconNotification",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 124,
+      "line": 127,
       "symbol": "SDLDidChangePermissionsNotification",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 125,
+      "line": 128,
       "symbol": "SDLDidReceiveSystemRequestNotification",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 126,
+      "line": 129,
       "symbol": "SDLDidChangeTurnByTurnStateNotification",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 127,
+      "line": 130,
       "symbol": "SDLDidReceiveTouchEventNotification",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 128,
+      "line": 131,
       "symbol": "SDLDidReceiveVehicleDataNotification",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 130,
+      "line": 132,
+      "symbol": "SDLDidReceiveWaypointNotification",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.constant",
+      "warning": "undocumented"
+    },
+    {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
+      "line": 134,
       "symbol": "SDLNotificationConstants",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.class",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 132,
+      "line": 136,
       "symbol": "SDLNotificationConstants.+allResponseNames",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.class",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLNotificationConstants.h",
-      "line": 133,
+      "line": 137,
       "symbol": "SDLNotificationConstants.+allButtonEventNotifications",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.class",
       "warning": "undocumented"
@@ -3426,6 +3468,13 @@
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLOnWaypointChange.h",
       "line": 8,
+      "symbol": "SDLOnWayPointChange",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.class",
+      "warning": "undocumented"
+    },
+    {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLOnWaypointChange.h",
+      "line": 20,
       "symbol": "SDLOnWaypointChange",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.class",
       "warning": "undocumented"
@@ -3488,14 +3537,21 @@
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLPerformInteraction.h",
-      "line": 53,
+      "line": 54,
       "symbol": "SDLPerformInteraction.-initWithInitialChunks:initialText:interactionChoiceSetIDList:helpChunks:timeoutChunks:interactionMode:timeout:vrHelp:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLPerformInteraction.h",
-      "line": 99,
+      "line": 56,
+      "symbol": "SDLPerformInteraction.-initWithInitialChunks:initialText:interactionChoiceSetIDList:helpChunks:timeoutChunks:interactionMode:timeout:vrHelp:interactionLayout:",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
+      "warning": "undocumented"
+    },
+    {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLPerformInteraction.h",
+      "line": 102,
       "symbol": "SDLPerformInteraction.interactionLayout",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
@@ -4671,453 +4727,481 @@
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 68,
+      "line": 72,
       "symbol": "SDLProxyListener",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.protocol",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 70,
+      "line": 74,
       "symbol": "SDLProxyListener.-onOnDriverDistraction:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 71,
+      "line": 75,
       "symbol": "SDLProxyListener.-onOnHMIStatus:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 72,
+      "line": 76,
       "symbol": "SDLProxyListener.-onProxyClosed",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 73,
+      "line": 77,
       "symbol": "SDLProxyListener.-onProxyOpened",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 77,
+      "line": 81,
       "symbol": "SDLProxyListener.-onAddCommandResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 78,
+      "line": 82,
       "symbol": "SDLProxyListener.-onAddSubMenuResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 79,
+      "line": 83,
       "symbol": "SDLProxyListener.-onAlertManeuverResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 80,
+      "line": 84,
       "symbol": "SDLProxyListener.-onAlertResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 81,
+      "line": 85,
       "symbol": "SDLProxyListener.-onChangeRegistrationResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 82,
+      "line": 86,
       "symbol": "SDLProxyListener.-onCreateInteractionChoiceSetResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 83,
+      "line": 87,
       "symbol": "SDLProxyListener.-onDeleteCommandResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 84,
+      "line": 88,
       "symbol": "SDLProxyListener.-onDeleteFileResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 85,
+      "line": 89,
       "symbol": "SDLProxyListener.-onDeleteInteractionChoiceSetResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 86,
+      "line": 90,
       "symbol": "SDLProxyListener.-onDeleteSubMenuResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 87,
+      "line": 91,
       "symbol": "SDLProxyListener.-onDiagnosticMessageResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 88,
+      "line": 92,
       "symbol": "SDLProxyListener.-onDialNumberResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 89,
+      "line": 93,
       "symbol": "SDLProxyListener.-onEncodedSyncPDataResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 90,
+      "line": 94,
       "symbol": "SDLProxyListener.-onEndAudioPassThruResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 91,
+      "line": 95,
       "symbol": "SDLProxyListener.-onError:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 92,
+      "line": 96,
       "symbol": "SDLProxyListener.-onGenericResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 93,
+      "line": 97,
       "symbol": "SDLProxyListener.-onGetDTCsResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 94,
+      "line": 98,
       "symbol": "SDLProxyListener.-onGetVehicleDataResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 95,
+      "line": 99,
+      "symbol": "SDLProxyListener.-onGetWayPointsResponse:",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
+      "warning": "undocumented"
+    },
+    {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
+      "line": 100,
       "symbol": "SDLProxyListener.-onListFilesResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 96,
+      "line": 101,
       "symbol": "SDLProxyListener.-onReceivedLockScreenIcon:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 97,
+      "line": 102,
       "symbol": "SDLProxyListener.-onOnAppInterfaceUnregistered:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 98,
+      "line": 103,
       "symbol": "SDLProxyListener.-onOnAudioPassThru:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 99,
+      "line": 104,
       "symbol": "SDLProxyListener.-onOnButtonEvent:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 100,
+      "line": 105,
       "symbol": "SDLProxyListener.-onOnButtonPress:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 101,
+      "line": 106,
       "symbol": "SDLProxyListener.-onOnCommand:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 102,
+      "line": 107,
       "symbol": "SDLProxyListener.-onOnEncodedSyncPData:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 103,
+      "line": 108,
       "symbol": "SDLProxyListener.-onOnHashChange:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 104,
+      "line": 109,
       "symbol": "SDLProxyListener.-onOnKeyboardInput:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 105,
+      "line": 110,
       "symbol": "SDLProxyListener.-onOnLanguageChange:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 106,
+      "line": 111,
       "symbol": "SDLProxyListener.-onOnLockScreenNotification:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 107,
+      "line": 112,
       "symbol": "SDLProxyListener.-onOnPermissionsChange:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 108,
+      "line": 113,
       "symbol": "SDLProxyListener.-onOnSyncPData:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 109,
+      "line": 114,
       "symbol": "SDLProxyListener.-onOnSystemRequest:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 110,
+      "line": 115,
       "symbol": "SDLProxyListener.-onOnTBTClientState:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 111,
+      "line": 116,
       "symbol": "SDLProxyListener.-onOnTouchEvent:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 112,
+      "line": 117,
       "symbol": "SDLProxyListener.-onOnVehicleData:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 113,
+      "line": 118,
+      "symbol": "SDLProxyListener.-onOnWayPointChange:",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
+      "warning": "undocumented"
+    },
+    {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
+      "line": 119,
       "symbol": "SDLProxyListener.-onPerformAudioPassThruResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 114,
+      "line": 120,
       "symbol": "SDLProxyListener.-onPerformInteractionResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 115,
+      "line": 121,
       "symbol": "SDLProxyListener.-onPutFileResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 116,
+      "line": 122,
       "symbol": "SDLProxyListener.-onReadDIDResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 117,
+      "line": 123,
       "symbol": "SDLProxyListener.-onRegisterAppInterfaceResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 118,
+      "line": 124,
       "symbol": "SDLProxyListener.-onResetGlobalPropertiesResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 119,
+      "line": 125,
       "symbol": "SDLProxyListener.-onScrollableMessageResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 120,
+      "line": 126,
       "symbol": "SDLProxyListener.-onSendLocationResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 121,
+      "line": 127,
       "symbol": "SDLProxyListener.-onSetAppIconResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 122,
+      "line": 128,
       "symbol": "SDLProxyListener.-onSetDisplayLayoutResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 123,
+      "line": 129,
       "symbol": "SDLProxyListener.-onSetGlobalPropertiesResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 124,
+      "line": 130,
       "symbol": "SDLProxyListener.-onSetMediaClockTimerResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 125,
+      "line": 131,
       "symbol": "SDLProxyListener.-onShowConstantTBTResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 126,
+      "line": 132,
       "symbol": "SDLProxyListener.-onShowResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 127,
+      "line": 133,
       "symbol": "SDLProxyListener.-onSliderResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 128,
+      "line": 134,
       "symbol": "SDLProxyListener.-onSpeakResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 129,
+      "line": 135,
       "symbol": "SDLProxyListener.-onSubscribeButtonResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 130,
+      "line": 136,
       "symbol": "SDLProxyListener.-onSubscribeVehicleDataResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 131,
+      "line": 137,
+      "symbol": "SDLProxyListener.-onSubscribeWayPointsResponse:",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
+      "warning": "undocumented"
+    },
+    {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
+      "line": 138,
       "symbol": "SDLProxyListener.-onSyncPDataResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 132,
+      "line": 139,
       "symbol": "SDLProxyListener.-onUpdateTurnListResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 133,
+      "line": 140,
       "symbol": "SDLProxyListener.-onUnregisterAppInterfaceResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 134,
+      "line": 141,
       "symbol": "SDLProxyListener.-onUnsubscribeButtonResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
-      "line": 135,
+      "line": 142,
       "symbol": "SDLProxyListener.-onUnsubscribeVehicleDataResponse:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLProxyListener.h",
+      "line": 143,
+      "symbol": "SDLProxyListener.-onUnsubscribeWayPointsResponse:",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
+      "warning": "undocumented"
+    },
+    {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLPutFile.h",
       "line": 32,
       "symbol": "SDLPutFile.-initWithFileName:fileType:",
@@ -5133,7 +5217,7 @@
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLPutFile.h",
-      "line": 36,
+      "line": 37,
       "symbol": "SDLPutFile.-initWithFileName:fileType:persistentFile:systemFile:offset:length:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
@@ -6177,41 +6261,48 @@
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLSecurityType.h",
       "line": 15,
+      "symbol": "SDLSecurityType.appId",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
+      "warning": "undocumented"
+    },
+    {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLSecurityType.h",
+      "line": 17,
       "symbol": "SDLSecurityType.-initializeWithAppId:completionHandler:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLSecurityType.h",
-      "line": 16,
+      "line": 18,
       "symbol": "SDLSecurityType.-stop",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLSecurityType.h",
-      "line": 18,
+      "line": 20,
       "symbol": "SDLSecurityType.-runHandshakeWithClientData:error:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLSecurityType.h",
-      "line": 20,
+      "line": 22,
       "symbol": "SDLSecurityType.-encryptData:withError:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLSecurityType.h",
-      "line": 21,
+      "line": 23,
       "symbol": "SDLSecurityType.-decryptData:withError:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLSecurityType.h",
-      "line": 23,
+      "line": 25,
       "symbol": "SDLSecurityType.+availableMakes",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.class",
       "warning": "undocumented"
@@ -6337,49 +6428,49 @@
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLSetGlobalProperties.h",
-      "line": 36,
+      "line": 37,
       "symbol": "SDLSetGlobalProperties.-initWithHelpText:timeoutText:vrHelpTitle:vrHelp:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLSetGlobalProperties.h",
-      "line": 38,
+      "line": 40,
       "symbol": "SDLSetGlobalProperties.-initWithHelpText:timeoutText:vrHelpTitle:vrHelp:menuTitle:menuIcon:keyboardProperties:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLSetGlobalProperties.h",
-      "line": 98,
+      "line": 100,
       "symbol": "SDLSetGlobalProperties.menuTitle",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLSetGlobalProperties.h",
-      "line": 99,
+      "line": 101,
       "symbol": "SDLSetGlobalProperties.menuIcon",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLSetGlobalProperties.h",
-      "line": 100,
+      "line": 102,
       "symbol": "SDLSetGlobalProperties.keyboardProperties",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLSetMediaClockTimer.h",
-      "line": 34,
+      "line": 35,
       "symbol": "SDLSetMediaClockTimer.-initWithUpdateMode:hours:minutes:seconds:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLSetMediaClockTimer.h",
-      "line": 36,
+      "line": 37,
       "symbol": "SDLSetMediaClockTimer.-initWithUpdateMode:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
@@ -6414,98 +6505,98 @@
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLShowConstantTBT.h",
-      "line": 21,
+      "line": 19,
       "symbol": "SDLShowConstantTBT.-init",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLShowConstantTBT.h",
-      "line": 22,
+      "line": 20,
       "symbol": "SDLShowConstantTBT.-initWithDictionary:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLShowConstantTBT.h",
-      "line": 24,
+      "line": 22,
       "symbol": "SDLShowConstantTBT.-initWithNavigationText1:navigationText2:eta:timeToDestination:totalDistance:turnIcon:nextTurnIcon:distanceToManeuver:distanceToManeuverScale:maneuverComplete:softButtons:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLShowConstantTBT.h",
-      "line": 26,
+      "line": 24,
       "symbol": "SDLShowConstantTBT.navigationText1",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLShowConstantTBT.h",
-      "line": 27,
+      "line": 25,
       "symbol": "SDLShowConstantTBT.navigationText2",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLShowConstantTBT.h",
-      "line": 28,
+      "line": 26,
       "symbol": "SDLShowConstantTBT.eta",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLShowConstantTBT.h",
-      "line": 29,
+      "line": 27,
       "symbol": "SDLShowConstantTBT.timeToDestination",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLShowConstantTBT.h",
-      "line": 30,
+      "line": 28,
       "symbol": "SDLShowConstantTBT.totalDistance",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLShowConstantTBT.h",
-      "line": 31,
+      "line": 29,
       "symbol": "SDLShowConstantTBT.turnIcon",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLShowConstantTBT.h",
-      "line": 32,
+      "line": 30,
       "symbol": "SDLShowConstantTBT.nextTurnIcon",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLShowConstantTBT.h",
-      "line": 33,
+      "line": 31,
       "symbol": "SDLShowConstantTBT.distanceToManeuver",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLShowConstantTBT.h",
-      "line": 34,
+      "line": 32,
       "symbol": "SDLShowConstantTBT.distanceToManeuverScale",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLShowConstantTBT.h",
-      "line": 35,
+      "line": 33,
       "symbol": "SDLShowConstantTBT.maneuverComplete",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLShowConstantTBT.h",
-      "line": 36,
+      "line": 34,
       "symbol": "SDLShowConstantTBT.softButtons",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.property",
       "warning": "undocumented"
@@ -7043,15 +7134,29 @@
       "warning": "undocumented"
     },
     {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLSubscribeWaypoints.h",
+      "line": 18,
+      "symbol": "SDLSubscribeWaypoints",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.class",
+      "warning": "undocumented"
+    },
+    {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLSubscribeWaypointsResponse.h",
       "line": 6,
+      "symbol": "SDLSubscribeWayPointsResponse",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.class",
+      "warning": "undocumented"
+    },
+    {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLSubscribeWaypointsResponse.h",
+      "line": 11,
       "symbol": "SDLSubscribeWaypointsResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.class",
       "warning": "undocumented"
     },
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLSyncMsgVersion.h",
-      "line": 26,
+      "line": 27,
       "symbol": "SDLSyncMsgVersion.-initWithMajorVersion:minorVersion:",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.method.instance",
       "warning": "undocumented"
@@ -7717,6 +7822,13 @@
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLUnsubscribeWaypoints.h",
       "line": 6,
+      "symbol": "SDLUnsubscribeWayPoints",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.class",
+      "warning": "undocumented"
+    },
+    {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLUnsubscribeWaypoints.h",
+      "line": 11,
       "symbol": "SDLUnsubscribeWaypoints",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.class",
       "warning": "undocumented"
@@ -7724,6 +7836,13 @@
     {
       "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h",
       "line": 6,
+      "symbol": "SDLUnsubscribeWayPointsResponse",
+      "symbol_kind": "sourcekitten.source.lang.objc.decl.class",
+      "warning": "undocumented"
+    },
+    {
+      "file": "/Users/joel/Projects/SDL/sdl_ios/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h",
+      "line": 11,
       "symbol": "SDLUnsubscribeWaypointsResponse",
       "symbol_kind": "sourcekitten.source.lang.objc.decl.class",
       "warning": "undocumented"