diff --git a/radio/src/storage/datacopy.cpp b/radio/src/storage/datacopy.cpp
index 8b4d95cdd..ebbca4595 100644
--- a/radio/src/storage/datacopy.cpp
+++ b/radio/src/storage/datacopy.cpp
@@ -1,4 +1,4 @@
-//This file was auto-generated by generate_datacopy.py script on Mon Jul  2 14:20:48 2018. Do not edit this file!
+//This file was auto-generated by generate_datacopy.py script on Tue Mar 19 19:58:50 2019. Do not edit this file!
 
 
 
@@ -193,6 +193,27 @@ void copyTelemetrySensor(A * dest, B * src)
   dest->param = src->param;
 }
 
+template <class A, class B>
+void copyTrainerModuleData(A * dest, B * src)
+{
+  dest->mode = src->mode;
+  dest->spare = src->spare;
+  dest->channelsStart = src->channelsStart;
+  dest->channelsCount = src->channelsCount;
+  dest->frameLength = src->frameLength;
+  dest->delay = src->delay;
+  dest->pulsePol = src->pulsePol;
+}
+
+template <class A, class B>
+void copyReceiverData(A * dest, B * src)
+{
+  dest->used = src->used;
+  dest->telemetry = src->telemetry;
+  dest->dirty = src->dirty;
+  memcpy(dest->name, src->name, sizeof(dest->name));
+}
+
 template <class A, class B>
 void copyModuleData(A * dest, B * src)
 {
@@ -200,10 +221,7 @@ void copyModuleData(A * dest, B * src)
   dest->rfProtocol = src->rfProtocol;
   dest->channelsStart = src->channelsStart;
   dest->channelsCount = src->channelsCount;
-  dest->failsafeMode = src->failsafeMode;
-  dest->subType = src->subType;
-  dest->invertedSerial = src->invertedSerial;
-  memcpy(dest->failsafeChannels, src->failsafeChannels, sizeof(dest->failsafeChannels));
+  copyModuleData_r9m(&dest->r9m, &src->r9m);
   copyModuleData_ppm(&dest->ppm, &src->ppm);
 }
 
@@ -266,9 +284,15 @@ void copyModelData(A * dest, B * src)
   for (int i=0; i<9; i++) {
     copyGVarData(&dest->gvars[i], &src->gvars[i]);
   }
-  for (int i=0; i<3; i++) {
+  for (int i=0; i<2; i++) {
     copyModuleData(&dest->moduleData[i], &src->moduleData[i]);
   }
+  for (int i=0; i<10; i++) {
+    copyReceiverData(&dest->receiverData[i], &src->receiverData[i]);
+  }
+  memcpy(dest->failsafeChannels, src->failsafeChannels, sizeof(dest->failsafeChannels));
+  copyTrainerModuleData(&dest->trainerData, &src->trainerData);
+  memcpy(dest->modelRegistrationID, src->modelRegistrationID, sizeof(dest->modelRegistrationID));
 }
 
 template <class A, class B>
@@ -306,6 +330,7 @@ void copyRadioData(A * dest, B * src)
   for (int i=0; i<13; i++) {
     copyCalibData(&dest->calib[i], &src->calib[i]);
   }
+  dest->spareRadio = src->spareRadio;
   dest->stickMode = src->stickMode;
   dest->telemetryBaudrate = src->telemetryBaudrate;
   dest->splashSpares = src->splashSpares;
@@ -316,6 +341,7 @@ void copyRadioData(A * dest, B * src)
   dest->slidersConfig = src->slidersConfig;
   dest->switchConfig = src->switchConfig;
   dest->potsConfig = src->potsConfig;
+  memcpy(dest->ownerRegistrationID, src->ownerRegistrationID, sizeof(dest->ownerRegistrationID));
 }
 
 template <class A, class B>
@@ -326,6 +352,14 @@ void copyCustomFunctionData_all(A * dest, B * src)
   dest->param = src->param;
 }
 
+template <class A, class B>
+void copyModuleData_r9m(A * dest, B * src)
+{
+  dest->failsafeMode = src->failsafeMode;
+  dest->freq = src->freq;
+  dest->region = src->region;
+}
+
 template <class A, class B>
 void copyModuleData_ppm(A * dest, B * src)
 {