diff --git a/libtgvoip.UWP.vcxproj b/libtgvoip.UWP.vcxproj
index 0d1951c..98c44e7 100644
--- a/libtgvoip.UWP.vcxproj
+++ b/libtgvoip.UWP.vcxproj
@@ -247,9 +247,12 @@
     <ClInclude Include="os\windows\AudioOutputWASAPI.h" />
     <ClInclude Include="os\windows\NetworkSocketWinsock.h" />
     <ClInclude Include="os\windows\WindowsSandboxUtils.h" />
+    <ClInclude Include="os\windows\WindowsSpecific.h" />
     <ClInclude Include="PacketReassembler.h" />
     <ClInclude Include="threading.h" />
     <ClInclude Include="utils.h" />
+    <ClInclude Include="video\VideoRenderer.h" />
+    <ClInclude Include="video\VideoSource.h" />
     <ClInclude Include="VoIPController.h" />
     <ClInclude Include="os\windows\CXWrapper.h" />
     <ClInclude Include="VoIPServerConfig.h" />
@@ -332,7 +335,10 @@
     <ClCompile Include="os\windows\AudioOutputWASAPI.cpp" />
     <ClCompile Include="os\windows\NetworkSocketWinsock.cpp" />
     <ClCompile Include="os\windows\WindowsSandboxUtils.cpp" />
+    <ClCompile Include="os\windows\WindowsSpecific.cpp" />
     <ClCompile Include="PacketReassembler.cpp" />
+    <ClCompile Include="video\VideoRenderer.cpp" />
+    <ClCompile Include="video\VideoSource.cpp" />
     <ClCompile Include="VoIPController.cpp" />
     <ClCompile Include="os\windows\CXWrapper.cpp" />
     <ClCompile Include="VoIPGroupController.cpp" />
diff --git a/libtgvoip.UWP.vcxproj.filters b/libtgvoip.UWP.vcxproj.filters
index d4b8705..32b2683 100644
--- a/libtgvoip.UWP.vcxproj.filters
+++ b/libtgvoip.UWP.vcxproj.filters
@@ -14,6 +14,9 @@
     <Filter Include="webrtc_dsp">
       <UniqueIdentifier>{3b15701a-65dd-4d52-92d4-a7b64a73b293}</UniqueIdentifier>
     </Filter>
+    <Filter Include="video">
+      <UniqueIdentifier>{e4d2de92-03ad-43d9-8861-d69f64610ba5}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="VoIPController.cpp" />
@@ -277,6 +280,15 @@
     <ClCompile Include="audio\AudioIO.cpp">
       <Filter>audio</Filter>
     </ClCompile>
+    <ClCompile Include="os\windows\WindowsSpecific.cpp">
+      <Filter>windows</Filter>
+    </ClCompile>
+    <ClCompile Include="video\VideoRenderer.cpp">
+      <Filter>video</Filter>
+    </ClCompile>
+    <ClCompile Include="video\VideoSource.cpp">
+      <Filter>video</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="VoIPController.h" />
@@ -496,5 +508,14 @@
       <Filter>audio</Filter>
     </ClInclude>
     <ClInclude Include="utils.h" />
+    <ClInclude Include="os\windows\WindowsSpecific.h">
+      <Filter>windows</Filter>
+    </ClInclude>
+    <ClInclude Include="video\VideoRenderer.h">
+      <Filter>video</Filter>
+    </ClInclude>
+    <ClInclude Include="video\VideoSource.h">
+      <Filter>video</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/os/windows/CXWrapper.cpp b/os/windows/CXWrapper.cpp
index 33aee04..a4d3427 100755
--- a/os/windows/CXWrapper.cpp
+++ b/os/windows/CXWrapper.cpp
@@ -65,7 +65,7 @@ void VoIPControllerWrapper::SetPublicEndpoints(const Platform::Array<libtgvoip::
 		libtgvoip::Endpoint^ _ep = endpoints[i];
 		tgvoip::Endpoint ep;
 		ep.id = _ep->id;
-		ep.type = tgvoip::Endpoint::TYPE_UDP_RELAY;
+		ep.type = tgvoip::Endpoint::Type::UDP_RELAY;
 		char buf[128];
 		if (_ep->ipv4){
 			WideCharToMultiByte(CP_UTF8, 0, _ep->ipv4->Data(), -1, buf, sizeof(buf), NULL, NULL);