diff --git a/lib/HanToJson/src/HanToJson.cpp b/lib/HanToJson/src/HanToJson.cpp
index 6aea6cf3..3b084861 100644
--- a/lib/HanToJson/src/HanToJson.cpp
+++ b/lib/HanToJson/src/HanToJson.cpp
@@ -25,6 +25,7 @@ static void hanToJsonKaifa3phase(int listSize, JsonObject& data, HanReader& hanR
 
     if (listSize >=  (int)Kaifa::List3PhaseLong)
     {
+        data["rtc"]  = hanReader.getTime(         (int)Kaifa_List3Phase::MeterClock);
         data["tPI"]  = hanReader.getInt(          (int)Kaifa_List3Phase::CumulativeActiveImportEnergy);
         data["tPO"]  = hanReader.getInt(          (int)Kaifa_List3Phase::CumulativeActiveExportEnergy);
         data["tQI"]  = hanReader.getInt(          (int)Kaifa_List3Phase::CumulativeReactiveImportEnergy);
@@ -49,6 +50,7 @@ static void hanToJsonKaifa1phase(int listSize, JsonObject& data, HanReader& hanR
 
     if (listSize >=  (int)Kaifa::List1PhaseLong)
     {
+        data["rtc"]  = hanReader.getTime(         (int)Kaifa_List1Phase::MeterClock);
         data["tPI"]  = hanReader.getInt(          (int)Kaifa_List1Phase::CumulativeActiveImportEnergy);
         data["tPO"]  = hanReader.getInt(          (int)Kaifa_List1Phase::CumulativeActiveExportEnergy);
         data["tQI"]  = hanReader.getInt(          (int)Kaifa_List1Phase::CumulativeReactiveImportEnergy);
@@ -81,10 +83,8 @@ static void hanToJsonKaifa(JsonObject& data, HanReader& hanReader, Stream *debug
 }
 
 
-static void hanToJsonAidon3phase(int listSize, JsonObject& data, HanReader& hanReader, Stream *debugger)
-{
-    if (listSize >= (int)Aidon::List3PhaseShort)
-    {
+static void hanToJsonAidon3phase(int listSize, JsonObject& data, HanReader& hanReader, Stream *debugger) {
+    if (listSize >= (int)Aidon::List3PhaseShort) {
         data["lv"]      = hanReader.getString(          (int)Aidon_List3Phase::ListVersionIdentifier);
         data["id"]      = hanReader.getString(          (int)Aidon_List3Phase::MeterID);
         data["type"]    = hanReader.getString(          (int)Aidon_List3Phase::MeterType);
@@ -100,8 +100,8 @@ static void hanToJsonAidon3phase(int listSize, JsonObject& data, HanReader& hanR
         data["U3"]      = ((double) hanReader.getInt(   (int)Aidon_List3Phase::VoltageL3)) / 10;
     }
 
-    if (listSize >= (int)Aidon::List3PhaseLong)
-    {
+    if (listSize >= (int)Aidon::List3PhaseLong) {
+        data["rtc"]     = hanReader.getTime(            (int)Aidon_List3Phase::Timestamp);
         data["tPI"]     = hanReader.getInt(             (int)Aidon_List3Phase::CumulativeActiveImportEnergy);
         data["tPO"]     = hanReader.getInt(             (int)Aidon_List3Phase::CumulativeActiveExportEnergy);
         data["tQI"]     = hanReader.getInt(             (int)Aidon_List3Phase::CumulativeReactiveImportEnergy);
@@ -126,6 +126,7 @@ static void hanToJsonAidon1phase(int listSize, JsonObject& data, HanReader& hanR
 
     if (listSize >= (int)Aidon::List1PhaseLong)
     {
+        data["rtc"]     = hanReader.getTime(            (int)Aidon_List1Phase::Timestamp);
         data["tPI"]     = hanReader.getInt(             (int)Aidon_List1Phase::CumulativeActiveImportEnergy);
         data["tPO"]     = hanReader.getInt(             (int)Aidon_List1Phase::CumulativeActiveExportEnergy);
         data["tQI"]     = hanReader.getInt(             (int)Aidon_List1Phase::CumulativeReactiveImportEnergy);
@@ -154,6 +155,7 @@ static void hanToJsonAidon3phaseIT(int listSize, JsonObject& data, HanReader& ha
 
     if (listSize >= (int)Aidon::List3PhaseITLong)
     {
+        data["rtc"]     = hanReader.getTime(            (int)Aidon_List3PhaseIT::Timestamp);
         data["tPI"]     = hanReader.getInt(             (int)Aidon_List3PhaseIT::CumulativeActiveImportEnergy);
         data["tPO"]     = hanReader.getInt(             (int)Aidon_List3PhaseIT::CumulativeActiveExportEnergy);
         data["tQI"]     = hanReader.getInt(             (int)Aidon_List3PhaseIT::CumulativeReactiveImportEnergy);
@@ -190,11 +192,8 @@ static void hanToJsonAidon(JsonObject& data, HanReader& hanReader, Stream *debug
     }
 }
 
-static void hanToJsonKamstrup3phase(int listSize, JsonObject& data, HanReader& hanReader, Stream *debugger)
-{
-    if (listSize >= (int)Kamstrup::List3PhaseShort)
-    {
-        data["ls"]      = listSize;
+static void hanToJsonKamstrup3phase(int listSize, JsonObject& data, HanReader& hanReader, Stream *debugger) {
+    if (listSize >= (int)Kamstrup::List3PhaseShort) {
         data["lv"]      = hanReader.getString(       (int)Kamstrup_List3Phase::ListVersionIdentifier);
         data["id"]      = hanReader.getString(       (int)Kamstrup_List3Phase::MeterID);
         data["type"]    = hanReader.getString(       (int)Kamstrup_List3Phase::MeterType);
@@ -210,8 +209,8 @@ static void hanToJsonKamstrup3phase(int listSize, JsonObject& data, HanReader& h
         data["U3"]      = hanReader.getInt(          (int)Kamstrup_List3Phase::VoltageL3);
     }
 
-    if (listSize >= (int)Kamstrup::List3PhaseLong)
-    {
+    if (listSize >= (int)Kamstrup::List3PhaseLong) {
+        data["rtc"]     = hanReader.getTime(         (int)Kamstrup_List3Phase::MeterClock);
         data["tPI"]     = hanReader.getInt(          (int)Kamstrup_List3Phase::CumulativeActiveImportEnergy);
         data["tPO"]     = hanReader.getInt(          (int)Kamstrup_List3Phase::CumulativeActiveExportEnergy);
         data["tQI"]     = hanReader.getInt(          (int)Kamstrup_List3Phase::CumulativeReactiveImportEnergy);
@@ -219,10 +218,8 @@ static void hanToJsonKamstrup3phase(int listSize, JsonObject& data, HanReader& h
     }
 }
 
-static void hanToJsonKamstrup1phase(int listSize, JsonObject& data, HanReader& hanReader, Stream *debugger)
-{
-    if (listSize >= (int)Kamstrup::List1PhaseShort)
-    {
+static void hanToJsonKamstrup1phase(int listSize, JsonObject& data, HanReader& hanReader, Stream *debugger) {
+    if (listSize >= (int)Kamstrup::List1PhaseShort) {
         data["lv"]      = hanReader.getString(       (int)Kamstrup_List1Phase::ListVersionIdentifier);
         data["id"]      = hanReader.getString(       (int)Kamstrup_List1Phase::MeterID);
         data["type"]    = hanReader.getString(       (int)Kamstrup_List1Phase::MeterType);
@@ -234,8 +231,8 @@ static void hanToJsonKamstrup1phase(int listSize, JsonObject& data, HanReader& h
         data["U1"]      = hanReader.getInt(          (int)Kamstrup_List1Phase::VoltageL1);
     }
 
-    if (listSize >= (int)Kamstrup::List1PhaseLong)
-    {
+    if (listSize >= (int)Kamstrup::List1PhaseLong) {
+        data["rtc"]     = hanReader.getTime(         (int)Kamstrup_List1Phase::MeterClock);
         data["tPI"]     = hanReader.getInt(          (int)Kamstrup_List1Phase::CumulativeActiveImportEnergy);
         data["tPO"]     = hanReader.getInt(          (int)Kamstrup_List1Phase::CumulativeActiveExportEnergy);
         data["tQI"]     = hanReader.getInt(          (int)Kamstrup_List1Phase::CumulativeReactiveImportEnergy);
@@ -243,8 +240,7 @@ static void hanToJsonKamstrup1phase(int listSize, JsonObject& data, HanReader& h
     }
 }
 
-static void hanToJsonKamstrup(JsonObject& data, HanReader& hanReader, Stream *debugger)
-{
+static void hanToJsonKamstrup(JsonObject& data, HanReader& hanReader, Stream *debugger) {
     int listSize = hanReader.getListSize();
 
     switch (listSize) {