diff --git a/gamdl/cli/cli.py b/gamdl/cli/cli.py
index 8eb115e..b8d96f7 100644
--- a/gamdl/cli/cli.py
+++ b/gamdl/cli/cli.py
@@ -142,6 +142,8 @@ async def main(config: CliConfig):
         apple_music_api=apple_music_api,
         cover_format=config.cover_format,
         cover_size=config.cover_size,
+        use_wrapper=config.use_wrapper,
+        wrapper_m3u8_ip=config.wrapper_m3u8_ip,
         wvd_path=config.wvd_path,
     )
 
@@ -184,7 +186,6 @@ async def main(config: CliConfig):
         mp4decrypt_path=config.mp4decrypt_path,
         ffmpeg_path=config.ffmpeg_path,
         mp4box_path=config.mp4box_path,
-        use_wrapper=config.use_wrapper,
         wrapper_decrypt_ip=config.wrapper_decrypt_ip,
         download_mode=config.download_mode,
         album_folder_template=config.album_folder_template,
diff --git a/gamdl/cli/cli_config.py b/gamdl/cli/cli_config.py
index 0049fcf..8b9d3a1 100644
--- a/gamdl/cli/cli_config.py
+++ b/gamdl/cli/cli_config.py
@@ -210,6 +210,22 @@ class CliConfig:
             ),
         ),
     ]
+    use_wrapper: Annotated[
+        bool,
+        option(
+            "--use-wrapper",
+            help="Use wrapper for decrypting songs",
+            is_flag=True,
+        ),
+    ]
+    wrapper_m3u8_ip: Annotated[
+        str,
+        option(
+            "--wrapper-m3u8-ip",
+            help="Wrapper m3u8 IP address and port",
+            default=base_interface_create_sig.parameters["wrapper_m3u8_ip"].default,
+        ),
+    ]
     # Song Interface Options
     synced_lyrics_format: Annotated[
         SyncedLyricsFormat,
@@ -328,14 +344,6 @@ class CliConfig:
             default=base_downloader_sig.parameters["mp4box_path"].default,
         ),
     ]
-    use_wrapper: Annotated[
-        bool,
-        option(
-            "--use-wrapper",
-            help="Use wrapper for decrypting songs",
-            is_flag=True,
-        ),
-    ]
     wrapper_decrypt_ip: Annotated[
         str,
         option(