diff --git a/doc/Aidon_OBIS.txt b/doc/Aidon_OBIS.txt
index ad091abc..d1ebe77a 100644
--- a/doc/Aidon_OBIS.txt
+++ b/doc/Aidon_OBIS.txt
@@ -1,6 +1,6 @@
-1.1.0.2.129.255
-0.0.96.1.0.255
-0.0.96.1.7.255
+1.1.0.2.129.255 - List version identifier
+0.0.96.1.0.255 - Meter ID
+0.0.96.1.7.255 - Meter Model
 1.0.1.7.0.255 - Active+ Instantaneous value 
 1.0.2.7.0.255 - Active- Instantaneous value
 1.0.3.7.0.255 - Reactive+ Instantaneous value
diff --git a/doc/Kamstrup_encrypted_OBIS.txt b/doc/Kamstrup_encrypted_OBIS.txt
index 346a3483..50bd7aff 100644
--- a/doc/Kamstrup_encrypted_OBIS.txt
+++ b/doc/Kamstrup_encrypted_OBIS.txt
@@ -2,12 +2,12 @@
 1.1.2.8.0.255 - Active- Energy
 1.1.3.8.0.255 - Reactive+ Energy
 1.1.4.8.0.255 - Reactive- Energy
-1.1.0.0.1.255
+1.1.0.0.1.255 - Electricity ID?
 1.1.1.7.0.255 - Active+ Instantaneous value
 1.1.2.7.0.255 - Active- Instantaneous value
 1.1.3.7.0.255 - Reactive+ Instantaneous value
 1.1.4.7.0.255 - Reactive- Instantaneous value
-0.1.1.0.0.255
+0.1.1.0.0.255 - Current date/time
 1.1.32.7.0.255 - L1 Voltage Instantaneous value
 1.1.52.7.0.255 - L2 Voltage Instantaneous value
 1.1.72.7.0.255 - L3 Voltage Instantaneous value
diff --git a/doc/Kamstrup_encrypted_data.xml b/doc/Kamstrup_encrypted_data.xml
new file mode 100644
index 00000000..4474e3b4
--- /dev/null
+++ b/doc/Kamstrup_encrypted_data.xml
@@ -0,0 +1,112 @@
+<GatewayRequest>
+  <NetworkId Value="231" />
+  <PhysicalDeviceAddress Value="" />
+  <DataNotification>
+    <LongInvokeIdAndPriority Value="40000000" />
+    <DateTime Value="" />
+    <NotificationBody>
+      <DataValue>
+        <Structure Qty="41" >
+          <String Value="Kamstrup_V0001" />
+          <!--1.1.1.8.0.255-->
+          <OctetString Value="0101010800FF" />
+          <UInt32 Value="001194CA" />
+          <!--1.1.2.8.0.255-->
+          <OctetString Value="0101020800FF" />
+          <UInt32 Value="00000000" />
+          <!--1.1.3.8.0.255-->
+          <OctetString Value="0101030800FF" />
+          <UInt32 Value="0000127E" />
+          <!--1.1.4.8.0.255-->
+          <OctetString Value="0101040800FF" />
+          <UInt32 Value="0009550E" />
+          <!--1.1.0.0.1.255-->
+          <OctetString Value="0101000001FF" />
+          <UInt32 Value="0144ADE1" />
+          <!--1.1.1.7.0.255-->
+          <OctetString Value="0101010700FF" />
+          <UInt32 Value="00000531" />
+          <!--1.1.2.7.0.255-->
+          <OctetString Value="0101020700FF" />
+          <UInt32 Value="00000000" />
+          <!--1.1.3.7.0.255-->
+          <OctetString Value="0101030700FF" />
+          <UInt32 Value="00000000" />
+          <!--1.1.4.7.0.255-->
+          <OctetString Value="0101040700FF" />
+          <UInt32 Value="00000054" />
+          <!--0.1.1.0.0.255-->
+          <OctetString Value="0001010000FF" />
+          <!--2020-05-12 10:24:50-->
+          <OctetString Value="07E4050C020A1832FF800080" />
+          <!--1.1.32.7.0.255-->
+          <OctetString Value="0101200700FF" />
+          <UInt16 Value="00E4" />
+          <!--1.1.52.7.0.255-->
+          <OctetString Value="0101340700FF" />
+          <UInt16 Value="00E5" />
+          <!--1.1.72.7.0.255-->
+          <OctetString Value="0101480700FF" />
+          <UInt16 Value="00E3" />
+          <!--1.1.31.7.0.255-->
+          <OctetString Value="01011F0700FF" />
+          <UInt32 Value="0000004B" />
+          <!--1.1.51.7.0.255-->
+          <OctetString Value="0101330700FF" />
+          <UInt32 Value="00000070" />
+          <!--1.1.71.7.0.255-->
+          <OctetString Value="0101470700FF" />
+          <UInt32 Value="000001E4" />
+          <!--1.1.21.7.0.255-->
+          <OctetString Value="0101150700FF" />
+          <UInt32 Value="00000070" />
+          <!--1.1.41.7.0.255-->
+          <OctetString Value="0101290700FF" />
+          <UInt32 Value="000000B5" />
+          <!--1.1.61.7.0.255-->
+          <OctetString Value="01013D0700FF" />
+          <UInt32 Value="0000040C" />
+          <!--1.1.33.7.0.255-->
+          <OctetString Value="0101210700FF" />
+          <UInt16 Value="004D" />
+          <!--1.1.53.7.0.255-->
+          <OctetString Value="0101350700FF" />
+          <UInt16 Value="004E" />
+          <!--1.1.73.7.0.255-->
+          <OctetString Value="0101490700FF" />
+          <UInt16 Value="0062" />
+          <!--1.1.13.7.0.255-->
+          <OctetString Value="01010D0700FF" />
+          <UInt16 Value="0063" />
+          <!--1.1.22.7.0.255-->
+          <OctetString Value="0101160700FF" />
+          <UInt32 Value="00000000" />
+          <!--1.1.42.7.0.255-->
+          <OctetString Value="01012A0700FF" />
+          <UInt32 Value="00000000" />
+          <!--1.1.62.7.0.255-->
+          <OctetString Value="01013E0700FF" />
+          <UInt32 Value="00000000" />
+          <!--1.1.22.8.0.255-->
+          <OctetString Value="0101160800FF" />
+          <UInt32 Value="00000000" />
+          <!--1.1.42.8.0.255-->
+          <OctetString Value="01012A0800FF" />
+          <UInt32 Value="00000000" />
+          <!--1.1.62.8.0.255-->
+          <OctetString Value="01013E0800FF" />
+          <UInt32 Value="00000000" />
+          <!--1.1.21.8.0.255-->
+          <OctetString Value="0101150800FF" />
+          <UInt32 Value="000A8F97" />
+          <!--1.1.41.8.0.255-->
+          <OctetString Value="0101290800FF" />
+          <UInt32 Value="0004C152" />
+          <!--1.1.61.8.0.255-->
+          <OctetString Value="01013D0800FF" />
+          <UInt32 Value="000243DF" />
+        </Structure>
+      </DataValue>
+    </NotificationBody>
+  </DataNotification>
+</GatewayRequest>
diff --git a/src/AmsData.cpp b/src/AmsData.cpp
index b4f70160..1b7625f8 100644
--- a/src/AmsData.cpp
+++ b/src/AmsData.cpp
@@ -4,7 +4,7 @@
 uint8_t AMS_OBIS_VERSION[6]                 = { 1, 1,  0, 2, 129, 255 };
 uint8_t AMS_OBIS_METER_MODEL[6]             = { 0, 0, 96, 1, 7,   255 };
 uint8_t AMS_OBIS_METER_ID[6]                = { 0, 0, 96, 1, 0,   255 };
-uint8_t AMS_OBIS_METER_TIMESTAMP[6]         = { 0, 0,  1, 0, 0,   255 };
+uint8_t AMS_OBIS_METER_TIMESTAMP[6]         = {  1, 0, 0, 255 };
 uint8_t AMS_OBIS_ACTIVE_IMPORT[6]           = {  1, 7, 0, 255 };
 uint8_t AMS_OBIS_ACTIVE_IMPORT_L1[6]        = { 21, 7, 0, 255 };
 uint8_t AMS_OBIS_ACTIVE_IMPORT_L2[6]        = { 41, 7, 0, 255 };