diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
index 38a394e..471168e 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
@@ -1675,6 +1675,18 @@ nn::Result ExportCalData()
             GET_CFG_KEY(NN_CFG_HID, NN_CFG_HID_CAL_RIGHT_STICK));
     COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
 
+    result = nn::cfg::CTR::init::GetConfig(&cfgCalData.analogStickCfgData, sizeof(AnalogStickCfgData),
+            GET_CFG_KEY(NN_CFG_HID, NN_CFG_HID_CAL_ANALOGSTICK));
+    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
+
+    result = nn::cfg::CTR::init::GetConfig(&cfgCalData.cameraCfgData, sizeof(CameraCfgData),
+            GET_CFG_KEY(NN_CFG_CAMERA, NN_CFG_CAMERA_CAL));
+    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
+
+    result = nn::cfg::CTR::init::GetConfig(&cfgCalData.surroundCfgData, sizeof(SurroundCfgData),
+            GET_CFG_KEY(NN_CFG_SOUND, NN_CFG_SOUND_SURROUND_CAL));
+    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
+
     result = sdWriter.WriteBufWithCmac(common::CFG_CALIBRATION_PATHNAME, &cfgCalData, sizeof(cfgCalData));
     COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
 
@@ -1773,6 +1785,17 @@ nn::Result InitializeHardwareDependentSetting()
             &cfgCalData.rightStickCfgData, sizeof(RightStickCfgData));
     COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
 
+    result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_HID, NN_CFG_HID_CAL_ANALOGSTICK),
+            &cfgCalData.analogStickCfgData, sizeof(AnalogStickCfgData));
+    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
+
+    result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_CAMERA, NN_CFG_CAMERA_CAL),
+            &cfgCalData.cameraCfgData, sizeof(CameraCfgData));
+    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
+
+    result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_SOUND, NN_CFG_SOUND_SURROUND_CAL),
+            &cfgCalData.surroundCfgData, sizeof(SurroundCfgData));
+    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
 
     NN_LOG("Set cfgCalData\n");
 
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h
index 182bcac..62b59e7 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h
@@ -31,8 +31,14 @@ struct CfgCalData
     nn::cfg::CTR::detail::CodecCfgData codecCfgData;
     nn::cfg::CTR::detail::McuSlideVolumeRangeCfgData mcuSlideVolumeRangeCfgData;
     NN_PADDING2;
+
     nn::cfg::CTR::detail::QtmCameraCfgData qtmCameraCfgData;
     nn::cfg::CTR::detail::RightStickCfgData rightStickCfgData;
+    nn::cfg::CTR::detail::AnalogStickCfgData analogStickCfgData;
+    nn::cfg::CTR::detail::CameraCfgData cameraCfgData;
+    NN_PADDING2;
+
+    nn::cfg::CTR::detail::SurroundCfgData surroundCfgData;
 };
 
 }