diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp
index 3e2f204..b165be6 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp
@@ -38,7 +38,7 @@ do {                                     \
         COMMON_LOGGER("CSCode: %d\n", csc);                     \
         COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);       \
         NN_DBG_PRINT_RESULT(result);                             \
-        COMMON_LOGGER_DEBUG("Result = %08X\n", result.GetPrintableBits());   \
+        COMMON_LOGGER_DETAIL("Result = %08X\n", result.GetPrintableBits());   \
         s_ShopResult = result;                                  \
         return;                                                \
     }                                                           \
@@ -81,7 +81,7 @@ bool operator!=(
 }
 
 // TitleState の文字列を取得
-#ifdef NN_BUILD_VERBOSE
+#ifdef COMMON_LOGGER_DETAIL_ENABLE
 const char* GetTitleStateString(nn::nim::TitleState state)
 {
     switch (state)
@@ -112,7 +112,7 @@ const char* GetTitleStateString(nn::nim::TitleState state)
 
 
 // 空文字列と NULL ポインタをそれぞれ <empty> と NULL として返す
-#ifdef NN_BUILD_VERBOSE
+#ifdef COMMON_LOGGER_DETAIL_ENABLE
 const char* Cstr(const char* p)
 {
     return p ? (p[0] ? p : "<empty>") : "NULL";
@@ -124,75 +124,75 @@ void PrintECTicketVersions(const ECTicketVersions& ticketVersions)
 {
     if (ticketVersions.nTicketVersions == 0)
     {
-        COMMON_LOGGER_DEBUG("No TicketVersions\n");
+        COMMON_LOGGER_DETAIL("No TicketVersions\n");
         return;
     }
 
-    COMMON_LOGGER_DEBUG("----- ECTicketVersions -----\n");
+    COMMON_LOGGER_DETAIL("----- ECTicketVersions -----\n");
     for (u32 i = 0; i < ticketVersions.nTicketVersions; i++)
     {
-#ifdef NN_BUILD_VERBOSE
+#ifdef COMMON_LOGGER_DETAIL_ENABLE
         ECTicketVersion version = ticketVersions.ticketVersions[i];
 #endif
-        COMMON_LOGGER_DEBUG("%03d: 0x%016llx v%d\n", i, version.ticketId, version.version);
+        COMMON_LOGGER_DETAIL("%03d: 0x%016llx v%d\n", i, version.ticketId, version.version);
     }
-    COMMON_LOGGER_DEBUG("---------------------------\n");
+    COMMON_LOGGER_DETAIL("---------------------------\n");
 }
 
 // ECAccountInfo の情報を出力
 void PrintECAccountInfo(const ECAccountInfo& accountInfo)
 {
-    COMMON_LOGGER_DEBUG("========== ECAccountInfo ==========\n");
+    COMMON_LOGGER_DETAIL("========== ECAccountInfo ==========\n");
 
-    COMMON_LOGGER_DEBUG("accountId\n  %s\n", Cstr(accountInfo.accountId));
+    COMMON_LOGGER_DETAIL("accountId\n  %s\n", Cstr(accountInfo.accountId));
 
-    COMMON_LOGGER_DEBUG("accountStatus\n  %s\n", Cstr(accountInfo.accountStatus));
+    COMMON_LOGGER_DETAIL("accountStatus\n  %s\n", Cstr(accountInfo.accountStatus));
 
     if (accountInfo.accountBalance == NULL)
     {
-        COMMON_LOGGER_DEBUG("accountBalance\n  NULL\n");
+        COMMON_LOGGER_DETAIL("accountBalance\n  NULL\n");
     }
     else
     {
-        COMMON_LOGGER_DEBUG("accountBalance->amount\n  %s\n",
+        COMMON_LOGGER_DETAIL("accountBalance->amount\n  %s\n",
             Cstr(accountInfo.accountBalance->amount));
-        COMMON_LOGGER_DEBUG("accountBalance->currency\n  %s\n",
+        COMMON_LOGGER_DETAIL("accountBalance->currency\n  %s\n",
             Cstr(accountInfo.accountBalance->currency));
     }
 
     if (accountInfo.agreedEULAVersion == NULL)
     {
-        COMMON_LOGGER_DEBUG("agreedEULAVersion\n  NULL\n");
+        COMMON_LOGGER_DETAIL("agreedEULAVersion\n  NULL\n");
     }
     else
     {
-        COMMON_LOGGER_DEBUG("agreedEULAVersion\n  %lld\n",
+        COMMON_LOGGER_DETAIL("agreedEULAVersion\n  %lld\n",
             *accountInfo.agreedEULAVersion);
     }
 
     if (accountInfo.latestEULAVersion == NULL)
     {
-        COMMON_LOGGER_DEBUG("latestEULAVersion\n  NULL\n");
+        COMMON_LOGGER_DETAIL("latestEULAVersion\n  NULL\n");
     }
     else
     {
-        COMMON_LOGGER_DEBUG("latestEULAVersion\n  %lld\n",
+        COMMON_LOGGER_DETAIL("latestEULAVersion\n  %lld\n",
             *accountInfo.latestEULAVersion);
     }
 
-    COMMON_LOGGER_DEBUG("country\n  %s\n", Cstr(accountInfo.country));
+    COMMON_LOGGER_DETAIL("country\n  %s\n", Cstr(accountInfo.country));
 
-    COMMON_LOGGER_DEBUG("extAccountId\n  %s\n", Cstr(accountInfo.extAccountId));
+    COMMON_LOGGER_DETAIL("extAccountId\n  %s\n", Cstr(accountInfo.extAccountId));
 
-    COMMON_LOGGER_DEBUG("deviceToken\n  %s\n", Cstr(accountInfo.deviceToken));
+    COMMON_LOGGER_DETAIL("deviceToken\n  %s\n", Cstr(accountInfo.deviceToken));
 
-    COMMON_LOGGER_DEBUG("weakToken\n  %s\n", Cstr(accountInfo.weakToken));
+    COMMON_LOGGER_DETAIL("weakToken\n  %s\n", Cstr(accountInfo.weakToken));
 
-    COMMON_LOGGER_DEBUG("isStandbyMode\n  %d\n", accountInfo.isStandbyMode);
+    COMMON_LOGGER_DETAIL("isStandbyMode\n  %d\n", accountInfo.isStandbyMode);
 
     if (accountInfo.owned == NULL)
     {
-        COMMON_LOGGER_DEBUG("owned\n  NULL\n");
+        COMMON_LOGGER_DETAIL("owned\n  NULL\n");
     }
     else
     {
@@ -226,7 +226,7 @@ nn::Result ConnectNetwork()
     COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
     NN_UTIL_RETURN_IF_FAILED(result);
 
-    COMMON_LOGGER_DEBUG("Success nn::ac::ConnectWithoutEula\n");
+    COMMON_LOGGER_DETAIL("Success nn::ac::ConnectWithoutEula\n");
 
     result = PrintNetworkSetting();
     COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
@@ -292,14 +292,14 @@ nn::Result ShopOperationConnect(ECAccountInfo** pAccountInfo)
     /* -------------------------------------------------------------------
      Connect
      -------------------------------------------------------------------- */
-    COMMON_LOGGER_DEBUG("nim::Shop::Connect\n");
+    COMMON_LOGGER_DETAIL("nim::Shop::Connect\n");
     result = nn::nim::Shop::Connect(pAccountInfo, s_EcBufffer, EC_BUFFER_SIZE);
     NN_UTIL_RETURN_IF_FAILED(result);
     result = CheckStandbyMode((*pAccountInfo)->isStandbyMode);
     NN_UTIL_RETURN_IF_FAILED(result);
 
     PrintECAccountInfo(**pAccountInfo);
-    COMMON_LOGGER_DEBUG("\n");
+    COMMON_LOGGER_DETAIL("\n");
 
     return result;
 }
@@ -313,7 +313,7 @@ nn::Result ShopOperationInitialize()
     -------------------------------------------------------------------- */
     if (!s_IsNimShopInitialized)
     {
-        COMMON_LOGGER_DEBUG("nim::InitializeForShop\n");
+        COMMON_LOGGER_DETAIL("nim::InitializeForShop\n");
         result = nn::nim::InitializeForShop();
         NN_UTIL_RETURN_IF_FAILED(result);
         s_IsNimShopInitialized = true;
@@ -322,12 +322,12 @@ nn::Result ShopOperationInitialize()
     /* -------------------------------------------------------------------
         SetParameter
     -------------------------------------------------------------------- */
-    COMMON_LOGGER_DEBUG("nim::Shop::SetApplication Id\n");
+    COMMON_LOGGER_DETAIL("nim::Shop::SetApplication Id\n");
 
     nn::nim::Shop::SetApplicationId();
     NN_UTIL_RETURN_IF_FAILED(result);
 
-    COMMON_LOGGER_DEBUG("nim::Shop::SetTIN\n");
+    COMMON_LOGGER_DETAIL("nim::Shop::SetTIN\n");
     result = nn::nim::Shop::SetTin(CONSOLE_RESTORE_TIN);
     NN_UTIL_RETURN_IF_FAILED(result);
 
@@ -357,12 +357,12 @@ nn::Result ShopOperationFinalize()
     /* -------------------------------------------------------------------
         Finalize
     -------------------------------------------------------------------- */
-    COMMON_LOGGER_DEBUG("nim::FinalizeForShop\n");
+    COMMON_LOGGER_DETAIL("nim::FinalizeForShop\n");
     result = nn::nim::FinalizeForShop();
     NN_UTIL_RETURN_IF_FAILED(result);
     s_IsNimShopInitialized = false;
 
-    COMMON_LOGGER_DEBUG("util::ac::Finalize\n");
+    COMMON_LOGGER_DETAIL("util::ac::Finalize\n");
     result = FinalizeInternal();
     NN_UTIL_RETURN_IF_FAILED(result);
 
@@ -385,7 +385,7 @@ void ShopOperationUnregisterCore(bool force)
     if (pAccountInfo->accountStatus && (pAccountInfo->accountStatus[0] == 'R' ||
             pAccountInfo->accountStatus[0] == 'T'))
         {
-            COMMON_LOGGER_DEBUG("nim::Shop::Unregister\n");
+            COMMON_LOGGER_DETAIL("nim::Shop::Unregister\n");
             result = nn::nim::Shop::Unregister();
             NIM_SHOP_RESULT_CHECK(result);
         }
@@ -394,13 +394,13 @@ void ShopOperationUnregisterCore(bool force)
     {
     if (pAccountInfo->accountStatus && (pAccountInfo->accountStatus[0] == 'R'))
         {
-            COMMON_LOGGER_DEBUG("nim::Shop::Unregister\n");
+            COMMON_LOGGER_DETAIL("nim::Shop::Unregister\n");
             result = nn::nim::Shop::Unregister();
             NIM_SHOP_RESULT_CHECK(result);
         }
         else
         {
-            COMMON_LOGGER_DEBUG("Not registered.\n");
+            COMMON_LOGGER_DETAIL("Not registered.\n");
         }
     }
 }
@@ -412,7 +412,7 @@ void ShopOperationSingleThreadFunc(ShopThreadParam param)
 
     s_ShopResult = nn::ResultSuccess();
 
-    COMMON_LOGGER_DEBUG("util::ac::Initialize\n");
+    COMMON_LOGGER_DETAIL("util::ac::Initialize\n");
     result = InitializeInternal();
     COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
     NIM_SHOP_RESULT_CHECK(result);
@@ -458,7 +458,7 @@ void ShopOperationSingleThreadFunc(ShopThreadParam param)
 
         {
         case SHOP_OPERATION_DOWNLOAD_TITLE:
-            COMMON_LOGGER_DEBUG("Try Download %016llx\n", param.config.titleId);
+            COMMON_LOGGER_DETAIL("Try Download %016llx\n", param.config.titleId);
             result = nn::nim::Shop::StartDownload(param.config);
 
             if (result == nn::nim::ResultBusy() || result == nn::nim::ResultAlreadyDone())
@@ -478,7 +478,7 @@ void ShopOperationSingleThreadFunc(ShopThreadParam param)
              GetProgress
              -------------------------------------------------------------------- */
 
-            COMMON_LOGGER_DEBUG("nim::Shop::GetProgress()\n");
+            COMMON_LOGGER_DETAIL("nim::Shop::GetProgress()\n");
             nn::nim::TitleProgress before;
             nn::nim::TitleProgress latest;
             while (true)
@@ -491,7 +491,7 @@ void ShopOperationSingleThreadFunc(ShopThreadParam param)
                 // Print progress
                 if (latest != before)
                 {
-                    COMMON_LOGGER_DEBUG("%8lld / %8lld (%d:%s)\n",
+                    COMMON_LOGGER_DETAIL("%8lld / %8lld (%d:%s)\n",
                             latest.downloadedSize,
                             latest.totalSize,
                             latest.state.Get(),
@@ -499,7 +499,7 @@ void ShopOperationSingleThreadFunc(ShopThreadParam param)
 
                     if (latest.state == nn::nim::TITLE_STATE_FINISHED)
                     {
-                        COMMON_LOGGER_DEBUG("Finished Download\n");
+                        COMMON_LOGGER_DETAIL("Finished Download\n");
                         break;
                     }
 
@@ -523,7 +523,7 @@ void ShopOperationSingleThreadFunc(ShopThreadParam param)
 
 void StartShopOperationSingle(ShopOperation op, nn::nim::TitleConfig config)
 {
-    COMMON_LOGGER_DEBUG("Start ShopOperationSingle, %s\n", SHOP_OPERATION_STR[op]);
+    COMMON_LOGGER_DETAIL("Start ShopOperationSingle, %s\n", SHOP_OPERATION_STR[op]);
 
     ShopThreadParam param;
     param.op = op;
@@ -536,13 +536,13 @@ void StartShopOperationSingle(ShopOperation op)
     ShopThreadParam param;
     param.op = op;
 
-    COMMON_LOGGER_DEBUG("Start ShopOperationSingle, %s\n", SHOP_OPERATION_STR[op]);
+    COMMON_LOGGER_DETAIL("Start ShopOperationSingle, %s\n", SHOP_OPERATION_STR[op]);
     s_ShopOperationThread.Start(ShopOperationSingleThreadFunc, param,  s_ShopOperationThreadStack);
 }
 
 void FinalizeShopOperationSingle()
 {
-    COMMON_LOGGER_DEBUG("Finalize ShopOperationSingle\n");
+    COMMON_LOGGER_DETAIL("Finalize ShopOperationSingle\n");
     s_ShopOperationThread.Join();
     s_ShopOperationThread.Finalize();
 }
diff --git a/trunk/ConsoleDataMigration/sources/common/CommonLogger.h b/trunk/ConsoleDataMigration/sources/common/CommonLogger.h
index 1891295..daacfed 100644
--- a/trunk/ConsoleDataMigration/sources/common/CommonLogger.h
+++ b/trunk/ConsoleDataMigration/sources/common/CommonLogger.h
@@ -33,6 +33,15 @@
 #define COMMON_LOGGER_DEBUG( ... )  ((void)0)
 #endif  // ifndef NN_SWITCH_DISABLE_DEBUG_PRINT else
 
+#ifndef NN_SWITCH_DISABLE_DEBUG_PRINT
+#ifdef COMMON_LOGGER_DETAIL_ENABLE
+#define COMMON_LOGGER_DETAIL(...)  COMMON_LOGGER(__VA_ARGS__)
+#else
+#define COMMON_LOGGER_DETAIL( ... ) ((void)0)
+#endif
+#endif
+
+
 #define COMMON_LOGGER_RESULT_WITH_LINE(result, line, func)  \
     NN_LOG("%s\n", func); \
     NN_LOG("%d\n", line); \