diff --git a/Thunder.sln b/Thunder.sln
index 97a16c5..503a993 100644
--- a/Thunder.sln
+++ b/Thunder.sln
@@ -97,75 +97,86 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "com", "Thunder\Source\com\c
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DeviceInfo", "ThunderNanoServicesRDK\DeviceInfo\DeviceInfo.vcxproj", "{6C8E75AE-796C-4598-9CFF-4F462F968955}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0CA4C3EA-2DD4-4BB3-804C-331D09CC3402} = {0CA4C3EA-2DD4-4BB3-804C-331D09CC3402}
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
 		{577A83B6-66B6-4A98-A3D6-4EBA066A1772} = {577A83B6-66B6-4A98-A3D6-4EBA066A1772}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Commander", "ThunderNanoServices\Commander\Commander.vcxproj", "{6C8E75A7-796C-4598-9CFF-4F462F998355}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
 		{577A83B6-66B6-4A98-A3D6-4EBA066A1772} = {577A83B6-66B6-4A98-A3D6-4EBA066A1772}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DHCPServer", "ThunderNanoServices\DHCPServer\DHCPServer.vcxproj", "{614AEA75-493F-4DB4-897C-6A31238C5781}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
 		{577A83B6-66B6-4A98-A3D6-4EBA066A1772} = {577A83B6-66B6-4A98-A3D6-4EBA066A1772}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DIALServer", "ThunderNanoServices\DIALServer\DIALServer.vcxproj", "{43EAC8C4-B127-4F65-B621-BC14F9C65243}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
 		{577A83B6-66B6-4A98-A3D6-4EBA066A1772} = {577A83B6-66B6-4A98-A3D6-4EBA066A1772}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dictionary", "ThunderNanoServices\Dictionary\Dictionary.vcxproj", "{51CD3B12-3CCC-4345-92F3-832D23F98F70}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
 		{577A83B6-66B6-4A98-A3D6-4EBA066A1772} = {577A83B6-66B6-4A98-A3D6-4EBA066A1772}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LocationSync", "ThunderNanoServicesRDK\LocationSync\LocationSync.vcxproj", "{43EAC8C4-C127-4F65-B621-AC64F9C65223}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
 		{577A83B6-66B6-4A98-A3D6-4EBA066A1772} = {577A83B6-66B6-4A98-A3D6-4EBA066A1772}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Messenger", "ThunderNanoServicesRDK\Messenger\Messenger.vcxproj", "{51CD3B12-3C87-424A-92C3-832D11F98F70}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
 		{577A83B6-66B6-4A98-A3D6-4EBA066A1772} = {577A83B6-66B6-4A98-A3D6-4EBA066A1772}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monitor", "ThunderNanoServicesRDK\Monitor\Monitor.vcxproj", "{614AEA75-493F-4DB4-897C-6A3EAF8C5781}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
 		{577A83B6-66B6-4A98-A3D6-4EBA066A1772} = {577A83B6-66B6-4A98-A3D6-4EBA066A1772}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenCDMi", "ThunderNanoServicesRDK\OpenCDMi\OpenCDMi.vcxproj", "{7E7E9E39-AAA8-4A95-A53F-D1C6E88E97E8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
 		{577A83B6-66B6-4A98-A3D6-4EBA066A1772} = {577A83B6-66B6-4A98-A3D6-4EBA066A1772}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetworkControl", "ThunderNanoServices\NetworkControl\NetworkControl.vcxproj", "{612AEF75-493F-4AB4-897C-6A31238C5781}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
 		{577A83B6-66B6-4A98-A3D6-4EBA066A1772} = {577A83B6-66B6-4A98-A3D6-4EBA066A1772}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OutOfProcessPlugin", "ThunderNanoServices\examples\OutOfProcessPlugin\OutOfProcessPlugin.vcxproj", "{D93FD85B-F6AC-4387-9C61-5625899CECFD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
 		{577A83B6-66B6-4A98-A3D6-4EBA066A1772} = {577A83B6-66B6-4A98-A3D6-4EBA066A1772}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemoteControl", "ThunderNanoServices\RemoteControl\RemoteControl.vcxproj", "{2CD4DE2B-7064-41E9-892E-6F249C7E6BF5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
 		{577A83B6-66B6-4A98-A3D6-4EBA066A1772} = {577A83B6-66B6-4A98-A3D6-4EBA066A1772}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 		{DEBD9452-DA29-4C28-8800-32E1484EA16F} = {DEBD9452-DA29-4C28-8800-32E1484EA16F}
 	EndProjectSection
 EndProject
@@ -173,12 +184,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SecurityAgent", "ThunderNan
 	ProjectSection(ProjectDependencies) = postProject
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
 		{577A83B6-66B6-4A98-A3D6-4EBA066A1772} = {577A83B6-66B6-4A98-A3D6-4EBA066A1772}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SubsystemControl", "ThunderNanoServices\SubsystemController\SubsystemControl.vcxproj", "{628D7AD7-796C-4598-9CFD-2F362FAB8755}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
 		{577A83B6-66B6-4A98-A3D6-4EBA066A1772} = {577A83B6-66B6-4A98-A3D6-4EBA066A1772}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Svalbard", "ThunderNanoServices\Svalbard\Svalbard.vcxproj", "{628D7997-796C-4598-9CFD-4F362FAB8755}"
@@ -186,18 +199,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Svalbard", "ThunderNanoServ
 		{38D878FD-FAAD-4620-B1AF-5CB4AB5385F2} = {38D878FD-FAAD-4620-B1AF-5CB4AB5385F2}
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
 		{577A83B6-66B6-4A98-A3D6-4EBA066A1772} = {577A83B6-66B6-4A98-A3D6-4EBA066A1772}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TimeSync", "ThunderNanoServices\TimeSync\TimeSync.vcxproj", "{3B2AABD2-060F-4C2C-8633-4005645564F2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
 		{577A83B6-66B6-4A98-A3D6-4EBA066A1772} = {577A83B6-66B6-4A98-A3D6-4EBA066A1772}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebServer", "ThunderNanoServices\WebServer\WebServer.vcxproj", "{6B9091EB-E0CA-4FE5-9FF1-69DE4D749F00}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
 		{577A83B6-66B6-4A98-A3D6-4EBA066A1772} = {577A83B6-66B6-4A98-A3D6-4EBA066A1772}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptography", "ThunderClientLibraries\Source\cryptography\Cryptography.vcxproj", "{38D878FD-FAAD-4620-B1AF-5CB4AB5385F2}"
@@ -229,11 +245,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MessageControl", "ThunderNa
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
 		{577A83B6-66B6-4A98-A3D6-4EBA066A1772} = {577A83B6-66B6-4A98-A3D6-4EBA066A1772}
 		{68388CCB-365D-443A-A435-2F1940790836} = {68388CCB-365D-443A-A435-2F1940790836}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSONRPCClient", "ThunderNanoServices\examples\JSONRPC\Client\JSONRPCClient.vcxproj", "{DFA83275-7232-4F2B-912A-BD362AA228B3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 		{A8D816F5-7314-466F-B1AF-B388AB538502} = {A8D816F5-7314-466F-B1AF-B388AB538502}
 	EndProjectSection
 EndProject
@@ -241,6 +259,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSONRPCPlugin", "ThunderNan
 	ProjectSection(ProjectDependencies) = postProject
 		{3DA3B4B6-916E-4F21-88C6-512DF0C0A38C} = {3DA3B4B6-916E-4F21-88C6-512DF0C0A38C}
 		{577A83B6-66B6-4A98-A3D6-4EBA066A1772} = {577A83B6-66B6-4A98-A3D6-4EBA066A1772}
+		{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001} = {7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "Thunder\Source\common\common.vcxproj", "{7A8D8C63-0A8D-4EBA-9C84-8BB0E8F8E001}"