diff --git a/asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj b/asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj
index 3629ca8b..b5915b28 100644
--- a/asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj
+++ b/asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj
@@ -54,7 +54,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-	  <CompileAs>Default</CompileAs>
+      <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -100,6 +100,8 @@ del converter-sample.c
     </Link>
     <PreBuildEvent>
       <Command>cd ..
+del *.c
+del *.h
 asn1c -gen-PER -fincludes-quoted -fcompound-names -pdu=PEP.Message pEp.asn1 devicegroup.asn1
 del converter-sample.c
 </Command>
@@ -130,6 +132,7 @@ del converter-sample.c
     <ClCompile Include="..\ber_tlv_length.c" />
     <ClCompile Include="..\ber_tlv_tag.c" />
     <ClCompile Include="..\BIT_STRING.c" />
+    <ClCompile Include="..\BOOLEAN.c" />
     <ClCompile Include="..\constraints.c" />
     <ClCompile Include="..\constr_CHOICE.c" />
     <ClCompile Include="..\constr_SEQUENCE.c" />
@@ -141,20 +144,21 @@ del converter-sample.c
     <ClCompile Include="..\GroupKeys.c" />
     <ClCompile Include="..\HandshakeRequest.c" />
     <ClCompile Include="..\Hash.c" />
-    <ClCompile Include="..\Header.c" />
     <ClCompile Include="..\Hex.c" />
     <ClCompile Include="..\Identity.c" />
+    <ClCompile Include="..\IdentityList.c" />
     <ClCompile Include="..\INTEGER.c" />
     <ClCompile Include="..\ISO639-1.c" />
-    <ClCompile Include="..\KeyList.c" />
     <ClCompile Include="..\NativeEnumerated.c" />
     <ClCompile Include="..\NativeInteger.c" />
+    <ClCompile Include="..\NULL.c" />
     <ClCompile Include="..\OCTET_STRING.c" />
     <ClCompile Include="..\per_decoder.c" />
     <ClCompile Include="..\per_encoder.c" />
     <ClCompile Include="..\per_opentype.c" />
     <ClCompile Include="..\per_support.c" />
     <ClCompile Include="..\PrintableString.c" />
+    <ClCompile Include="..\Sync-Protocols.c" />
     <ClCompile Include="..\UTF8String.c" />
     <ClCompile Include="..\Version.c" />
     <ClCompile Include="..\xer_decoder.c" />
@@ -174,6 +178,7 @@ del converter-sample.c
     <ClInclude Include="..\ber_tlv_length.h" />
     <ClInclude Include="..\ber_tlv_tag.h" />
     <ClInclude Include="..\BIT_STRING.h" />
+    <ClInclude Include="..\BOOLEAN.h" />
     <ClInclude Include="..\constraints.h" />
     <ClInclude Include="..\constr_CHOICE.h" />
     <ClInclude Include="..\constr_SEQUENCE.h" />
@@ -185,21 +190,21 @@ del converter-sample.c
     <ClInclude Include="..\GroupKeys.h" />
     <ClInclude Include="..\HandshakeRequest.h" />
     <ClInclude Include="..\Hash.h" />
-    <ClInclude Include="..\Header.h" />
     <ClInclude Include="..\Hex.h" />
     <ClInclude Include="..\Identity.h" />
+    <ClInclude Include="..\IdentityList.h" />
     <ClInclude Include="..\INTEGER.h" />
     <ClInclude Include="..\ISO639-1.h" />
-    <ClInclude Include="..\KeyList.h" />
     <ClInclude Include="..\NativeEnumerated.h" />
     <ClInclude Include="..\NativeInteger.h" />
+    <ClInclude Include="..\NULL.h" />
     <ClInclude Include="..\OCTET_STRING.h" />
-    <ClInclude Include="..\OwnKeys.h" />
     <ClInclude Include="..\per_decoder.h" />
     <ClInclude Include="..\per_encoder.h" />
     <ClInclude Include="..\per_opentype.h" />
     <ClInclude Include="..\per_support.h" />
     <ClInclude Include="..\PrintableString.h" />
+    <ClInclude Include="..\Sync-Protocols.h" />
     <ClInclude Include="..\UTF8String.h" />
     <ClInclude Include="..\Version.h" />
     <ClInclude Include="..\xer_decoder.h" />
diff --git a/asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj.filters b/asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj.filters
index f9a277d6..efd2d09f 100644
--- a/asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj.filters
+++ b/asn.1/pEpEngineASN1/pEpEngineASN1.vcxproj.filters
@@ -72,9 +72,6 @@
     <ClCompile Include="..\Hash.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Header.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\Hex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -87,9 +84,6 @@
     <ClCompile Include="..\ISO639-1.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\KeyList.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\NativeEnumerated.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -132,6 +126,18 @@
     <ClCompile Include="..\GroupKeys.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\BOOLEAN.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\IdentityList.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\NULL.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Sync-Protocols.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\DeviceGroup-Protocol.h">
@@ -200,9 +206,6 @@
     <ClInclude Include="..\Hash.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Header.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\Hex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -215,9 +218,6 @@
     <ClInclude Include="..\ISO639-1.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\KeyList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\NativeEnumerated.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -227,9 +227,6 @@
     <ClInclude Include="..\OCTET_STRING.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\OwnKeys.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\per_decoder.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -263,5 +260,17 @@
     <ClInclude Include="..\GroupKeys.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\BOOLEAN.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\IdentityList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\NULL.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Sync-Protocols.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file