diff --git a/run_tests.sh b/run_tests.sh
index 3ca4f808..dadfadc4 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -11,6 +11,7 @@ NUMBER_2="$2"
 TEST_PIN_1=456test_pin_foo123
 NATIVE=0
 JSON_RPC=0
+DBUS=0
 TEST_REGISTER=0
 
 PATH_TEST_CONFIG="$PWD/test-config"
@@ -41,6 +42,8 @@ run() {
   set -x
   if [ "$JSON_RPC" -eq 1 ]; then
     "$SIGNAL_CLI" $@
+  elif [ "$DBUS" -eq 1 ]; then
+    "$SIGNAL_CLI" --dbus --verbose --verbose $@ | grep -v '^Warning:' | grep -v 'at org'
   else
     "$SIGNAL_CLI" --service-environment="staging" --verbose --verbose $@ | grep -v '^Warning:' | grep -v 'at org'
   fi
diff --git a/src/main/resources/META-INF/native-image/org.asamk/signal-cli/reachability-metadata.json b/src/main/resources/META-INF/native-image/org.asamk/signal-cli/reachability-metadata.json
index 5144ea1b..18f5dba1 100644
--- a/src/main/resources/META-INF/native-image/org.asamk/signal-cli/reachability-metadata.json
+++ b/src/main/resources/META-INF/native-image/org.asamk/signal-cli/reachability-metadata.json
@@ -1846,6 +1846,12 @@
         }
       ]
     },
+    {
+      "type": "org.asamk.Signal.Error$Failure"
+    },
+    {
+      "type": "org.asamk.Signal.Error.Failure"
+    },
     {
       "type": "org.asamk.SignalControl",
       "allDeclaredMethods": true
@@ -1861,6 +1867,23 @@
         }
       ]
     },
+    {
+      "type": "org.asamk.SignalControl$Error$InvalidNumber",
+      "methods": [
+        {
+          "name": "<init>",
+          "parameterTypes": [
+            "java.lang.String"
+          ]
+        }
+      ]
+    },
+    {
+      "type": "org.asamk.SignalControl.Error$InvalidNumber"
+    },
+    {
+      "type": "org.asamk.SignalControl.Error.InvalidNumber"
+    },
     {
       "type": "org.asamk.signal.Main",
       "jniAccessible": true,
@@ -9410,6 +9433,41 @@
         ]
       }
     },
+    {
+      "type": {
+        "proxy": [
+          "org.asamk.Signal"
+        ]
+      }
+    },
+    {
+      "type": {
+        "proxy": [
+          "org.asamk.Signal$Device"
+        ]
+      }
+    },
+    {
+      "type": {
+        "proxy": [
+          "org.asamk.Signal$Group"
+        ]
+      }
+    },
+    {
+      "type": {
+        "proxy": [
+          "org.asamk.Signal$Identity"
+        ]
+      }
+    },
+    {
+      "type": {
+        "proxy": [
+          "org.asamk.SignalControl"
+        ]
+      }
+    },
     {
       "type": {
         "proxy": [