diff --git a/cli/aitbc_cli/utils/__init__.py b/cli/aitbc_cli/utils/__init__.py
index 7b185a08..ddb39537 100644
--- a/cli/aitbc_cli/utils/__init__.py
+++ b/cli/aitbc_cli/utils/__init__.py
@@ -16,11 +16,18 @@ from .wallet import decrypt_private_key
 from .blockchain import get_chain_info, get_network_status, get_blockchain_analytics
 
 
-def output(message, **kwargs):
+def output(message, format=None, title=None, **kwargs):
     """Print a regular output message (handles strings and structured data)"""
     if not isinstance(message, str):
         import json
-        message = json.dumps(message, indent=2)
+        if format == 'json' or format == 'yaml':
+            message = json.dumps(message, indent=2)
+        else:
+            # Table format — just JSON for now
+            message = json.dumps(message, indent=2)
+    if title:
+        echo(f"\n{title}")
+        echo("=" * len(title))
     echo(message, **kwargs)
 
 
diff --git a/cli/utils/dual_mode_wallet_adapter.py b/cli/utils/dual_mode_wallet_adapter.py
index 0f6e138f..37ab8833 100755
--- a/cli/utils/dual_mode_wallet_adapter.py
+++ b/cli/utils/dual_mode_wallet_adapter.py
@@ -13,7 +13,7 @@ from datetime import datetime
 
 sys.path.insert(0, "/opt/aitbc/cli")
 from utils.wallet_daemon_client import WalletDaemonClient, WalletInfo, WalletBalance, ChainInfo, WalletMigrationResult
-from config import Config
+from aitbc_cli.config import CLIConfig as Config
 from utils import error, success, output