diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7a59d3cf..23e19225 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,14 @@
 name: signal-cli CI
 
-on: [ push, pull_request, workflow_call ]
+on:
+  push:
+    branches:
+      - '**'
+  pull_request:
+  workflow_call:
+
+permissions:
+  contents: write # to fetch code (actions/checkout) and submit dependency graph (gradle/gradle-build-action)
 
 jobs:
   build:
@@ -8,20 +16,81 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '17', '18' ]
+        java: [ '21', '24' ]
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: ${{ matrix.java }}
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          dependency-graph: generate-and-submit
+      - name: Install asciidoc
+        run: sudo apt update && sudo apt --no-install-recommends install -y asciidoc-base
       - name: Build with Gradle
-        run: ./gradlew build
+        run: ./gradlew --no-daemon build
+      - name: Build man page
+        run: |
+          cd man
+          make install
+      - name: Add man page to archive
+        run: |
+          version=$(tar tf build/distributions/signal-cli-*.tar | head -n1 | sed 's|signal-cli-\([^/]*\)/.*|\1|')
+          echo $version
+          tar --transform="flags=r;s|man|signal-cli-${version}/man|" -rf build/distributions/signal-cli-${version}.tar man/man{1,5}
       - name: Compress archive
         run: gzip -n -9 build/distributions/signal-cli-*.tar
       - name: Archive production artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: signal-cli-archive-${{ matrix.java }}
           path: build/distributions/signal-cli-*.tar.gz
+
+  build-graalvm:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: graalvm/setup-graalvm@v1
+        with:
+          version: 'latest'
+          java-version: '21'
+          cache: 'gradle'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build with Gradle
+        run: ./gradlew --no-daemon nativeCompile
+      - name: Archive production artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: signal-cli-native
+          path: build/native/nativeCompile/signal-cli
+
+  build-client:
+    strategy:
+      matrix:
+        os:
+          - ubuntu
+          - macos
+          - windows
+    runs-on: ${{ matrix.os }}-latest
+    defaults:
+      run:
+        working-directory: ./client
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install rust
+        run: rustup default stable
+      - name: Build client
+        run: cargo build --release --verbose
+      - name: Archive production artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: signal-cli-client-${{ matrix.os }}
+          path: |
+            client/target/release/signal-cli-client
+            client/target/release/signal-cli-client.exe
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 0ef62f7e..f778268a 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -9,6 +9,10 @@ on:
   schedule:
     - cron: '0 7 * * 4'
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+  security-events: write
+
 jobs:
   analyse:
     name: Analyse
@@ -17,12 +21,13 @@ jobs:
     steps:
 
       - name: Setup Java JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 17
+          distribution: 'zulu'
+          java-version: 21
 
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           # We must fetch at least the immediate parents so that if this is
           # a pull request then we can checkout the head.
@@ -30,7 +35,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v3
         # Override language selection by uncommenting this and choosing your languages
         # with:
         #   languages: go, javascript, csharp, python, cpp, java
@@ -38,7 +43,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v3
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -52,4 +57,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000..b7ce03f1
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,257 @@
+name: release
+
+on:
+  push:
+    tags:
+      - v*
+
+permissions:
+  contents: write # to fetch code (actions/checkout) and create release
+
+env:
+  IMAGE_NAME: signal-cli
+  IMAGE_REGISTRY: ghcr.io/asamk
+  REGISTRY_USER: ${{ github.actor }}
+  REGISTRY_PASSWORD: ${{ github.token }}
+
+jobs:
+
+  ci_wf:
+    permissions:
+      contents: write
+    uses: AsamK/signal-cli/.github/workflows/ci.yml@master
+    # ${{ github.repository }} not accepted here
+
+  lib_to_jar:
+    needs: ci_wf
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    outputs:
+      signal_cli_version: ${{ steps.cli_ver.outputs.version }}
+      release_id: ${{ steps.create_release.outputs.id }}
+
+    steps:
+
+      - name: Download signal-cli build from CI workflow
+        uses: actions/download-artifact@v4
+
+      - name: Get signal-cli version
+        id: cli_ver
+        run: |
+          ver="${GITHUB_REF_NAME#v}"
+          echo "version=${ver}" >> $GITHUB_OUTPUT
+
+      - name: Extract archive
+        run: |
+          tree .
+          ARCHIVE_DIR=$(ls signal-cli-archive-*/ -d | tail -n1)
+          tar -xzf ./"${ARCHIVE_DIR}"/*.tar.gz
+          mv ./"${ARCHIVE_DIR}"/*.tar.gz signal-cli-${{ steps.cli_ver.outputs.version }}.tar.gz
+          rm -rf signal-cli-archive-*/
+
+#      - name: Get signal-client jar version
+#        id: lib_ver
+#        run: |
+#          JAR_PREFIX=libsignal-client-
+#          jar_file=$(find ./signal-cli-*/lib/ -name "$JAR_PREFIX*.jar")
+#          jar_version=$(echo "$jar_file" | xargs basename | sed "s/$JAR_PREFIX//; s/.jar//")
+#          echo "$jar_version"
+#          echo "signal_client_version=${jar_version}" >> $GITHUB_OUTPUT
+#
+#      - name: Download signal-client builds
+#        env:
+#          RELEASES_URL: https://github.com/signalapp/libsignal/releases/download/
+#          FILE_NAMES: signal_jni.dll libsignal_jni.dylib
+#          SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
+#        run: |
+#          for file_name in $FILE_NAMES; do
+#            curl -sOL "${RELEASES_URL}/v${SIGNAL_CLIENT_VER}/${file_name}"  # note: added v
+#          done
+#          tree .
+
+      - name: Compress native app
+        env:
+          SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.version }}
+        run: |
+          chmod +x signal-cli-native/signal-cli
+          tar -czf signal-cli-${SIGNAL_CLI_VER}-Linux-native.tar.gz -C signal-cli-native signal-cli
+          rm -rf signal-cli-native/
+
+#      - name: Replace Windows lib
+#        env:
+#          SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.version }}
+#          SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
+#        run: |
+#          mv signal_jni.dll libsignal_jni.so
+#          zip -u ./signal-cli-*/lib/libsignal-client-${SIGNAL_CLIENT_VER}.jar  ./libsignal_jni.so
+#          tar -czf signal-cli-${SIGNAL_CLI_VER}-Windows.tar.gz signal-cli-*/
+#
+#      - name: Replace macOS lib
+#        env:
+#          SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.version }}
+#          SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
+#        run: |
+#          jar_file=./signal-cli-*/lib/libsignal-client-${SIGNAL_CLIENT_VER}.jar
+#          zip -d $jar_file libsignal_jni.so
+#          zip $jar_file libsignal_jni.dylib
+#          tar -czf signal-cli-${SIGNAL_CLI_VER}-macOS.tar.gz signal-cli-*/
+
+      - name: Create release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: v${{ steps.cli_ver.outputs.version }}  # note: added `v`
+          release_name: v${{ steps.cli_ver.outputs.version }}  # note: added `v`
+          draft: true
+
+      - name: Upload archive
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}.tar.gz
+          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}.tar.gz
+          asset_content_type: application/x-compressed-tar  # .tar.gz
+
+#      - name: Upload Linux archive
+#        uses: actions/upload-release-asset@v1
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        with:
+#          upload_url: ${{ steps.create_release.outputs.upload_url }}
+#          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}-Linux.tar.gz
+#          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-Linux.tar.gz
+#          asset_content_type: application/x-compressed-tar  # .tar.gz
+
+      - name: Upload Linux native archive
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}-Linux-native.tar.gz
+          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-Linux-native.tar.gz
+          asset_content_type: application/x-compressed-tar  # .tar.gz
+
+#      - name: Upload windows archive
+#        uses: actions/upload-release-asset@v1
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        with:
+#          upload_url: ${{ steps.create_release.outputs.upload_url }}
+#          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}-Windows.tar.gz
+#          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-Windows.tar.gz
+#          asset_content_type: application/x-compressed-tar  # .tar.gz
+#
+#      - name: Upload macos archive
+#        uses: actions/upload-release-asset@v1
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        with:
+#          upload_url: ${{ steps.create_release.outputs.upload_url }}
+#          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}-macOS.tar.gz
+#          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-macOS.tar.gz
+#          asset_content_type: application/x-compressed-tar  # .tar.gz
+
+  build-container:
+    needs: ci_wf
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Download signal-cli build from CI workflow
+        uses: actions/download-artifact@v4
+
+      - name: Get signal-cli version
+        id: cli_ver
+        run: |
+          ver="${GITHUB_REF_NAME#v}"
+          echo "version=${ver}" >> $GITHUB_OUTPUT
+
+      - name: Move archive file
+        run: |
+          ARCHIVE_DIR=$(ls signal-cli-archive-*/ -d | tail -n1)
+          tar xf ./"${ARCHIVE_DIR}"/*.tar.gz
+          rm -r signal-cli-archive-* signal-cli-native
+          mkdir -p build/install/
+          mv ./signal-cli-"${GITHUB_REF_NAME#v}"/ build/install/signal-cli
+
+      - name: Build Image
+        id: build_image
+        uses: redhat-actions/buildah-build@v2
+        with:
+          image: ${{ env.IMAGE_NAME }}
+          tags: latest ${{ github.sha }} ${{ steps.cli_ver.outputs.version }}
+          containerfiles:
+            ./Containerfile
+          oci: true
+
+      - name: Push To GHCR
+        uses: redhat-actions/push-to-registry@v2
+        id: push
+        with:
+          image: ${{ steps.build_image.outputs.image }}
+          tags: ${{ steps.build_image.outputs.tags }}
+          registry: ${{ env.IMAGE_REGISTRY }}
+          username: ${{ env.REGISTRY_USER }}
+          password: ${{ env.REGISTRY_PASSWORD }}
+
+      - name: Echo outputs
+        run: |
+          echo "${{ toJSON(steps.push.outputs) }}"
+
+  build-container-native:
+    needs: ci_wf
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Download signal-cli build from CI workflow
+        uses: actions/download-artifact@v4
+
+      - name: Get signal-cli version
+        id: cli_ver
+        run: |
+          ver="${GITHUB_REF_NAME#v}"
+          echo "version=${ver}" >> $GITHUB_OUTPUT
+
+      - name: Move archive file
+        run: |
+          mkdir -p build/native/nativeCompile/
+          chmod +x ./signal-cli-native/signal-cli
+          mv ./signal-cli-native/signal-cli build/native/nativeCompile/
+
+      - name: Build Image
+        id: build_image
+        uses: redhat-actions/buildah-build@v2
+        with:
+          image: ${{ env.IMAGE_NAME }}
+          tags: latest-native ${{ github.sha }}-native ${{ steps.cli_ver.outputs.version }}-native
+          containerfiles:
+            ./native.Containerfile
+          oci: true
+
+      - name: Push To GHCR
+        uses: redhat-actions/push-to-registry@v2
+        id: push
+        with:
+          image: ${{ steps.build_image.outputs.image }}
+          tags: ${{ steps.build_image.outputs.tags }}
+          registry: ${{ env.IMAGE_REGISTRY }}
+          username: ${{ env.REGISTRY_USER }}
+          password: ${{ env.REGISTRY_PASSWORD }}
+
+      - name: Echo outputs
+        run: |
+          echo "${{ toJSON(steps.push.outputs) }}"
diff --git a/.github/workflows/repackage-native-libs.yml b/.github/workflows/repackage-native-libs.yml
deleted file mode 100644
index fc5fa780..00000000
--- a/.github/workflows/repackage-native-libs.yml
+++ /dev/null
@@ -1,172 +0,0 @@
-name: repackage-native-libs
-
-on:
-  push:
-    tags:
-      - v*
-
-
-jobs:
-
-  ci_wf:
-    uses: AsamK/signal-cli/.github/workflows/ci.yml@master
-      # ${{ github.repository }} not accpeted here
-
-
-  lib_to_jar:
-    needs: ci_wf
-    runs-on: ubuntu-latest
-
-    outputs:
-      signal_cli_version: ${{ steps.cli_ver.outputs.signal_cli_version }}
-      release_id: ${{ steps.create_release.outputs.id }}
-
-    steps:
-
-      - name: Download signal-cli build from CI workflow
-        uses: actions/download-artifact@v2
-
-      - name: Get signal-cli version
-        id: cli_ver
-        run: |
-          #echo ${GITHUB_REF#refs/tag/}
-          tree .
-          mv ./$(ls */ -d | tail -n1)/*.tar.gz .
-          ver=$(ls ./*.tar.gz | xargs basename | sed -E 's/signal-cli-(.*).tar.gz/\1/')
-          echo $ver
-          echo "::set-output name=signal_cli_version::${ver}"
-          tar -xzf ./*.tar.gz
-
-      - name: Get signal-client jar version
-        id: lib_ver
-        run: |
-          JAR_PREFIX=libsignal-client-
-          jar_file=$(find ./signal-cli-*/lib/ -name "$JAR_PREFIX*.jar")
-          jar_version=$(echo "$jar_file" | xargs basename | sed "s/$JAR_PREFIX//; s/.jar//")
-          echo "$jar_version"
-          echo "::set-output name=signal_client_version::$jar_version"
-
-      - name: Download signal-client builds
-        env:
-          RELEASES_URL: https://github.com/signalapp/libsignal/releases/download/
-          FILE_NAMES: signal_jni.dll libsignal_jni.dylib
-          SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
-        run: |
-          for file_name in $FILE_NAMES; do
-            curl -sOL "${RELEASES_URL}/v${SIGNAL_CLIENT_VER}/${file_name}"  # note: added v
-          done
-          tree .
-
-      - name: Replace Windows lib
-        env:
-          SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.signal_cli_version }}
-          SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
-        run: |
-          mv signal_jni.dll libsignal_jni.so
-          zip -u ./signal-cli-${SIGNAL_CLI_VER}/lib/libsignal-client-${SIGNAL_CLIENT_VER}.jar  ./libsignal_jni.so
-          tar -czf signal-cli-${SIGNAL_CLI_VER}-Windows.tar.gz signal-cli-${SIGNAL_CLI_VER}/
-
-      - name: Replace macOS lib
-        env:
-          SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.signal_cli_version }}
-          SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
-        run: |
-          jar_file=./signal-cli-${SIGNAL_CLI_VER}/lib/libsignal-client-${SIGNAL_CLIENT_VER}.jar
-          zip -d "$jar_file" libsignal_jni.so
-          zip "$jar_file" libsignal_jni.dylib
-          tar -czf signal-cli-${SIGNAL_CLI_VER}-macOS.tar.gz signal-cli-${SIGNAL_CLI_VER}/
-
-      - name: Create release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: v${{ steps.cli_ver.outputs.signal_cli_version }}  # note: added `v`
-          release_name: v${{ steps.cli_ver.outputs.signal_cli_version }}  # note: added `v`
-          draft: true
-
-      - name: Upload Linux archive
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: signal-cli-${{ steps.cli_ver.outputs.signal_cli_version }}.tar.gz
-          asset_name: signal-cli-${{ steps.cli_ver.outputs.signal_cli_version }}-Linux.tar.gz
-          asset_content_type: application/x-compressed-tar  # .tar.gz
-
-      - name: Upload windows archive
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: signal-cli-${{ steps.cli_ver.outputs.signal_cli_version }}-Windows.tar.gz
-          asset_name: signal-cli-${{ steps.cli_ver.outputs.signal_cli_version }}-Windows.tar.gz
-          asset_content_type: application/x-compressed-tar  # .tar.gz
-
-      - name: Upload macos archive
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: signal-cli-${{ steps.cli_ver.outputs.signal_cli_version }}-macOS.tar.gz
-          asset_name: signal-cli-${{ steps.cli_ver.outputs.signal_cli_version }}-macOS.tar.gz
-          asset_content_type: application/x-compressed-tar  # .tar.gz
-
-
-  run_repackaged:
-
-    needs:
-      - lib_to_jar
-
-    strategy:
-      matrix:
-        runner:
-          - windows-latest
-          - macos-latest
-
-    runs-on: ${{ matrix.runner }}
-
-    defaults:
-      run:
-        shell: bash   # Explicit for windows
-
-    env:
-      JAVA_VERSION: 18
-
-    steps:
-
-      - name: Download the release file
-        env:
-          SIGNAL_CLI_VER: ${{ needs.lib_to_jar.outputs.signal_cli_version }}
-          RELEASE_ID: ${{ needs.lib_to_jar.outputs.release_id }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          file_name=signal-cli-${SIGNAL_CLI_VER}-${RUNNER_OS}.tar.gz
-          echo "$file_name"
-          assets_json=$(curl -s \
-            -H "Authorization: Bearer $GITHUB_TOKEN" \
-            "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets")
-          asset_dl_url=$(echo "$assets_json" | jq -r ".[] | select (.name == \"$file_name\") | .url")
-          echo "$asset_dl_url"
-          curl -sLOJ \
-            -H 'Accept: application/octet-stream' \
-            -H "Authorization: Bearer $GITHUB_TOKEN" \
-            "$asset_dl_url"
-          tar -xzf "$file_name"
-
-      - name: Set up JDK for running signal-cli executable
-        uses: actions/setup-java@v1
-        with:
-          java-version: ${{ env.JAVA_VERSION }}
-
-      - name: Run signal-cli
-        run: |
-          cd signal-cli-*/bin
-          if [[ "$RUNNER_OS" == 'Windows' ]]; then
-            EXECUTABLE_SUFFIX=".bat"
-          fi
-          ./signal-cli${EXECUTABLE_SUFFIX} listAccounts
diff --git a/.gitignore b/.gitignore
index e41d1e40..2b6774c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ local.properties
 out/
 .DS_Store
 /bin/
+/test-config/
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index bb65b3e9..aa627792 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -5,8 +5,8 @@
       <option name="GENERATE_FINAL_LOCALS" value="true" />
       <option name="GENERATE_FINAL_PARAMETERS" value="true" />
       <option name="ALIGN_MULTILINE_TEXT_BLOCKS" value="true" />
-      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" />
-      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" />
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
           <package name="com" withSubpackages="true" static="false" />
@@ -54,6 +54,9 @@
       <option name="TERNARY_OPERATION_WRAP" value="5" />
       <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
       <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="5" />
+      <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
+      <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
       <option name="ENUM_CONSTANTS_WRAP" value="2" />
     </codeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a829372d..74d0bdc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,218 +2,850 @@
 
 ## [Unreleased]
 
+## [0.13.18] - 2025-07-16
+
+Requires libsignal-client version 0.76.3.
+
+### Added
+
+- Added `--view-once` parameter to send command to send view once images
+
+### Fixed
+
+- Handle rate limit exception correctly when querying usernames
+
+### Improved
+
+- Shut down when dbus daemon connection goes away unexpectedly
+- In daemon mode, exit immediately if account check fails at startup
+- Improve behavior when sending to devices that have no available prekeys
+
+## [0.13.17] - 2025-06-28
+
+Requires libsignal-client version 0.76.0.
+
+### Fixed
+
+- Fix issue when loading an older inactive group
+- Close attachment input streams after upload
+- Fix storage sync behavior with unhandled fields
+
+### Changed
+
+- Improve behavior when pin data doesn't exist on the server
+
+## [0.13.16] - 2025-06-07
+
+Requires libsignal-client version 0.73.2.
+
+### Changed
+
+- Ensure every sent message gets a unique timestamp
+
+## [0.13.15] - 2025-05-08
+
+Requires libsignal-client version 0.70.0.
+
+### Fixed
+
+- Fix native access warning with Java 24
+- Fix storage sync loop due to old removed e164 field
+
+### Changed
+
+- Increased compatibility of native build with older/virtual CPUs
+
+## [0.13.14] - 2025-04-06
+
+Requires libsignal-client version 0.68.1.
+
+### Fixed
+
+- Fix pre key import from old data files
+
+### Changed
+
+- Use websocket connection instead of HTTP for more requests
+- Improve handling of messages with decryption error
+
+## [0.13.13] - 2025-02-28
+
+Requires libsignal-client version 0.66.2.
+
+### Added
+- Allow setting nickname and note with `updateContact` command
+
+### Fixed
+- Fix syncing nickname, note and expiration timer
+- Fix check for registered users with a proxy
+- Improve handling of storage records not yet supported by signal-cli
+- Fix contact sync for networks requiring proxy
+
+## [0.13.12] - 2025-01-18
+
+Requires libsignal-client version 0.65.2.
+
+### Fixed
+
+- Fix sync of contact nick name
+- Fix incorrectly marking recipients as unregistered after sync
+- Fix cause of database deadlock (Thanks @dukhaSlayer)
+- Fix parsing of account query param in events http endpoint
+
+### Changed
+
+- Enable sqlite WAL journal\_mode for improved performance
+
+## [0.13.11] - 2024-12-26
+
+Requires libsignal-client version 0.64.0.
+
+### Fixed
+- Fix issue with receiving messages that have an invalid destination
+
+## [0.13.10] - 2024-11-30
+
+Requires libsignal-client version 0.62.0.
+
+### Fixed
+
+- Fix receiving some unusual contact sync messages
+- Fix receiving expiration timer updates
+
+### Improved
+- Add support for new storage encryption scheme
+
+## [0.13.9] - 2024-10-28
+
+### Fixed
+
+- Fix verify command
+
+## [0.13.8] - 2024-10-26
+
+Requires libsignal-client version 0.58.2
+
+### Fixed
+
+- Fix sending large text messages
+- Fix setting message expiration timer with recent Signal apps
+
+### Improved
+
+- Add group name and timestamps on json message (Thanks @jailson-dias)
+
+## [0.13.7] - 2024-09-28
+
+Requires libsignal-client version 0.58.0
+
+### Fixed
+
+- Fix unnecessary log output
+- Fix issue with CDSI sync with invalid token
+
+## [0.13.6] - 2024-09-08
+
+Requires libsignal-client version 0.56.0
+
+### Improved
+
+- Send sync message to linked devices when sending read/viewed receipts
+
+### Fixed
+
+- Fix issue with sending to some groups
+- Fix CDSI sync if no token is stored
+- Fix possible db dead lock during storage sync
+
+## [0.13.5] - 2024-07-25
+
+Requires libsignal-client version 0.52.2
+
+### Fixed
+
+- Fixed device linking, due to new feature flag
+
+## [0.13.4] - 2024-06-06
+
+**Attention**: Now requires libsignal-client version 0.47.0
+
+### Improved
+
+- Improve username update error message
+- Update groups when using listGroups command
+
+### Fixed
+
+- Update libsignal to fix graalvm native startup
+- Fix issue with saving username link
+- Fix sendMessageRequestResponse type parameter parsing in JSON RPC mode
+- Fix getUserStatus command with only username parameter
+
+## [0.13.3] - 2024-04-19
+
+**Attention**: Now requires libsignal-client version 0.44.0
+
+### Added
+
+- Support for reading contact nickname and notes
+- Add `--internal` and `--detailed` parameters to `listContacts` command
+
+### Fixed
+
+- Fix issue with sending messages when a new session is created
+
+## [0.13.2] - 2024-03-23
+
+**Attention**: Now requires libsignal-client version 0.40.1
+
+### Added
+
+- Add `--username` parameter to `getUserStatus` command
+
+### Fixed
+
+- Fixed setting and retrieving PIN after server changes
+
+## [0.13.1] - 2024-02-27
+
+### Added
+
+- Add `--reregister` parameter to force registration of an already registered account
+
+### Fixed
+
+- Fixed rare issue with duplicate PNIs during migration
+
+### Improved
+
+- Show information when requesting voice verification without prior SMS verification
+- Username can now be set with an explicit discriminator (e.g. testname.000)
+- Improve behavior when PNI prekeys upload fails
+- Improve `submitRateLimitChallenge` error message if captcha is rejected by server
+- Only retry messages after an identity was trusted
+
+### Changed
+
+- Default number sharing to NOBODY, to match the official apps behavior.
+
+## [0.13.0] - 2024-02-18
+
+**Attention**: Now requires Java 21 and libsignal-client version 0.39.2
+
+### Breaking changes
+
+- Sending to the self number (+XXXX) now behaves the same as the `--note-to-self` parameter. To get the previous
+  behavior with notification, the `--notify-self` parameter can be added.
+
+### Added
+
+- New `--hidden` parameter for `removeContact` command
+- New `--notify-self` parameter for `send` command, for sending a non-sync message when self is part of the recipients
+  or groups.
+- New `--unrestricted-unidentified-sender`, `--discoverable-by-number`, `--number-sharing`, `--username`
+  and `--delete-username` parameter for `updateAccount` command
+- New `--bus-name` parameter for `daemon` command to use another D-Bus bus name
+- New `getAvatar` and `getSticker` commands to get avatar and sticker images
+- New `sendMessageRequestResponse` command to accept/delete message requests
+
+### Fixed
+
+- Improve issue with stale prekeys and receiving messages to PNI address
+
+### Improved
+
+- Better shutdown handling after Ctrl+C and SIGTERM
+- Implemented full remote storage sync.
+  Provides better contact and settings sync for linked devices.
+- `listContacts` doesn't list unregistered users anymore
+
+## [0.12.8] - 2024-02-06
+
+### Fixes
+
+- Update user agent
+
+## [0.12.7] - 2023-12-15
+
+**Attention**: Now requires native libsignal-client version 0.36.1
+
+### Fixes
+
+- Fix linking to an existing account
+
+## [0.12.6] - 2023-12-11
+
+### Fixes
+
+- Fix linking to an existing account
+- Fix migration from old account data
+
+## [0.12.5] - 2023-11-21
+
+### Fixes
+
+- Fix issue with joining groups by group link for new accounts
+- Fix receiving address of shared contact
+- Fix receiving sync edit messages in groups
+
+### Changed
+
+- Create safety numbers based on ACI instead of phone number
+
+## [0.12.4] - 2023-10-22
+
+### Fixes
+
+- Prevent ConcurrentModificationException
+- Update captcha help text
+
+## [0.12.3] - 2023-10-17
+
+### Added
+
+- Added `startChangeNumber` and `finishChangeNumber` commands to switch to another phone number
+- Added `--quote-attachment` parameter to `send` command
+- Added support for scannable safety numbers based on serviceId
+- Added `EditMessageReceived` signal for D-Bus interface
+- Added new exit code `5` for rate limit failures
+- Added full CDSI refresh to get current ACI/PNIs for known numbers regularly
+
+### Fixed
+
+- Correctly respond with delivery receipts for edit messages
+
+### Changed
+
+- JSON-RPC requests are now executed in parallel.
+  Clients should make sure to use the `id` field to get the correct response for a request.
+
+## [0.12.2] - 2023-09-30
+
+**Attention**: Now requires native libsignal-client version 0.32.1
+
+### Added
+
+- Added `--receive-mode` parameter for `jsonRpc` command
+- Add `libsignal_client_path` build property to override libsignal-client jar file
+
+### Changed
+
+- `jsonRpc` command now supports multi-account mode including registering and linking
+
+## [0.12.1] - 2023-08-26
+
+### Added
+
+- New `addStickerPack` command
+
+### Fixed
+
+- Fixed some issues with upgrading from older accounts
+
+### Changed
+
+- Reverted receive notification in JSON-RPC to old format, only explicit subscriptions should use the new format
+
+## [0.12.0] - 2023-08-11
+
+**Attention**: Now requires native libsignal-client version 0.30.0
+
+### Breaking changes
+
+- Adapt receive subscription notification in JSON-RPC to have payload in result field
+    - Before: `{"jsonrpc":"2.0","method":"receive","params":{"envelope":{ ... },"account":"+XXX","subscription":0}}`
+    - After:
+      `{"jsonrpc":"2.0","method":"receive","params":{"subscription":0,"result":{"envelope":{ ... },"account":"+XXX"}}}`
+
+### Added
+
+- Manage identities via DBus (Thanks @bublath)
+- Added support for SVR2 PINs
+
+### Fixed
+
+- Fixed finishLink/receive/register/verify commands for JSON-RPC
+- Update to the latest libsignal to fix various issues
+
+## [0.11.11] - 2023-05-24
+
+**Attention**: Now requires native libsignal-client version 0.25.0
+
+### Added
+
+- New `--text-style` and `--quote-text-style` flags for `send` command
+
+### Fixed
+
+- Fixed migration of older account files
+- Fix deleting old unregistered recipient
+
+## [0.11.10] - 2023-05-11
+
+**Attention**: Now requires native libsignal-client version 0.23.1
+
+### Added
+
+- Support for receiving and sending edit messages with `--edit-timestamp`
+
+## [0.11.9.1] - 2023-04-23
+
+### Fixed
+
+- Fix build with Java 20
+
+## [0.11.9] - 2023-04-22
+
+### Fixed
+
+- Workaround issue with linking to newer app versions
+
+## [0.11.8] - 2023-04-05
+
+### Added
+
+- Added file attachment attributes to JSON output (Thanks @signals-from-outer-space)
+
+### Fixed
+
+- Scrub E164 number from dbus paths
+- Fix sending large text messages to multiple recipient
+- Fix deleting old group in dbus mode
+- Fix issue with unknown identity serviceId
+
+### Improved
+
+- Relaxed Content-Type check in http daemon mode (Thanks @cedb)
+
+## [0.11.7] - 2023-02-19
+
+**Attention**: Now requires native libsignal-client version 0.22.0
+
+### Fixed
+
+- Fix issue with missing pni identity key
+- Fix graalvm sqlite issue (Thanks @Marvin A. Ruder)
+- Fix issue with forgetting recipient
+
+### Changed
+
+- Allow JSON-RPC commands without account param if only one account exists
+
+## [0.11.6] - 2022-12-18
+
+### Added
+
+- Allow using data URIs for updateGroup/updateProfile
+- New alive check endpoint for http daemon (Thanks @ced-b)
+
+### Fixed
+
+- Registration with voice verification now works if no system locale is set
+- Fixed retrieving attachments in JSON RPC mode (Thanks @ced-b)
+
+## [0.11.5.1] - 2022-11-09
+
+### Fixed
+
+- Fix updating from older signal-cli version
+
+## [0.11.5] - 2022-11-07
+
+**Attention**: Now requires native libsignal-client version 0.21.1
+
+### Added
+
+- Add `--http` flag to `daemon` command to provide a JSON-RPC http endpoint (`/api/v1/rpc`). (Thanks @ced-b)
+- The `receive` method is now also available in JSON-RPC daemon mode, for polling new messages.
+- Add `getAttachment` command to get attachment file base64 encoded. (Thanks @ced-b)
+- Add `--disable-send-log` to disable the message send log.
+- Add `--story` to `sendReaction` command, to react to stories.
+- Add `--story-timestamp` and `--story-author` to `send` command, to reply to stories.
+- Add `--max-messages` to `receive` command, to only receive a certain number of messages.
+
+### Changed
+
+- Send long text messages as attachment instead. This matches the behavior of the official clients.
+- Store attachments with a file extension, for common file types.
+
+## [0.11.4] - 2022-10-19
+
+### Added
+
+- Approve/Refuse group join requests, using same interface as adding/removing members
+- Add --ignore-stories flag to prevent receiving story messages
+
+### Fixed
+
+- Fixed issue with receiving messages that can't be decrypted
+- Do not discard incoming group join messages
+
+### Improved
+
+- Add code to receive new PNI after change number
+
+## [0.11.3] - 2022-10-07
+
+### Fixed
+
+- Fix sending messages to groups (in non-daemon mode)
+- Fix updating from older signal-cli version
+- Fix issue with handling decryption error message
+- Fix graalvm native build (Thanks @bentolor)
+
+## [0.11.2] - 2022-10-06
+
+### Fixed
+
+- Update user agent version to work with new Signal-Server check
+
+## [0.11.1] - 2022-10-05
+
+### Fixed
+
+- Fix sending group messages
+- Fix store migration issue on Windows
+- Fix building fat jars
+
+## [0.11.0] - 2022-10-02
+
+**Attention**: Now requires native libsignal-client version 0.20.0
+
+### Breaking changes
+
+- Changed meaning of `-v` flag from `--version` to `--verbose`.
+  So now extended logging can be achieved with `-vv`.
+- Remove deprecated fallback to reading from stdin if no message body is given.
+  To read a message from stdin, use the `--message-from-stdin` flag.
+
+### Added
+
+- Migrate PIN to new KBS enclave when Signal updates it
+- Add `--scrub-log` flag to remove possibly sensitive information from the log
+- Add `sendPaymentNotification` dbus method
+
+### Fixed
+
+- Fix an issue where messages were sent without sender phone number
+
+### Changed
+
+- Store data except base account data in sqlite database
+- Use new CDSI for contact discovery in compat mode
+
+## [0.10.11] - 2022-08-17
+
+**Attention**: Now requires native libsignal-client version 0.19.3
+
+### Added
+
+- Output content of received story messages
+
+## [0.10.10] - 2022-07-30
+
+**Attention**: Now requires native libsignal-client version 0.18.1
+
+### Fixed
+
+- Fix setPin/removePin commands which broke due to server side changes
+- Workaround GraalVM 22.2.0 issue with daemon connection
+
+## [0.10.9] - 2022-07-16
+
+### Changed
+
+- updateAccount command checks self number and PNI after updating account attributes
+
+### Fixed
+
+- Fixed small issue with syncing contacts from storage
+- Fixed issue with opening older account files
+
+## [0.10.8] - 2022-06-13
+
+### Added
+
+- Attachments can now be given as data: URIs with base64 data instead of just file paths (Thanks @KevinRoebert)
+- `version` command can now be used on the commandline, in addition to the `--version` flag.
+  In the next version the current short form `-v` will change its meaning to `--verbose`!
+
+### Improved
+
+- An account can now be registered on both LIVE and STAGING environment in the same config directory.
+- Logging output for registering has been extended.
+
 ## [0.10.7] - 2022-05-29
 
 ### Added
+
 - Added profile information to `listContacts` command output
 - Added filter flags for `listContacts` command
 - New `sendPaymentNotification` command to send payment receipt blobs
 - New `--given-name` and `--family-name` parameters for `updateContact` command
 - Implement sending link previews with `--preview-url`, `--preview-title` parameters for the `send` command
-- New `--send-read-receipts` parameter for `receive` and `daemon` commands for automatically marking received messages as read
+- New `--send-read-receipts` parameter for `receive` and `daemon` commands for automatically marking received messages
+  as read
 
 ### Fixed
+
 - Issue with endless growing `pre-keys-pni` data directory
 
 ## [0.10.6] - 2022-05-19
+
 **Attention**: Now requires native libsignal-client version 0.17
 
 ### Added
+
 - Check if account is used on the environment it was registered (live or staging)
 - New command `deleteLocalAccountData` to delete all local data of an unregistered account
 - New parameter `-g` for `listGroups` command to filter for specific groups
 
 ### Fixed
+
 - Fix deleting a recipient which has no uuid
 
 ### Changed
+
 - Show warning when sending a message and no profile name has been set.
   (A profile name may become mandatory in the future)
 - After blocking a contact/group the profile key is now rotated
 - Only update profile keys from authoritative group changes
 
 ## [0.10.5] - 2022-04-11
+
 **Attention**: Now requires native libsignal-client version 0.15
 
 ### Added
+
 - New `--ban`, `--unban` flags for `updateGroup` command to ban users from joining by group link
 
 ### Fixed
+
 - Fix plain text output of blocked group ids
 - Fix error output in case of rate limiting
 - Fix error when creating a group with no members
 - Fix adding recent Signal-Desktop versions as linked devices
 
 ## [0.10.4.2] - 2022-03-17
+
 ### Fixed
+
 - Crash in json output when receiving message from untrusted identity
 - Fix multi account commands for newly created accounts
 
 ## [0.10.4.1] - 2022-03-02
+
 ### Fixed
+
 - Linking to current apps (which currently don't include a PNI identity yet)
 - Show better error message when --target-timestamp is missing for sendReceipt
 
 ## [0.10.4] - 2022-02-20
+
 ### Added
+
 - Implement support for change number as linked device
-- Add `--message-from-stdin` flag for send command.  The current behavior of
+- Add `--message-from-stdin` flag for send command. The current behavior of
   reading from stdin if the `-m` flag is not given, will be removed in a future
   version.
 
 ### Changed
+
 - Align receive timeout behavior for dbus client with cli and JSON-RPC.
   Timeout is reset by every incoming message
 - Renamed `error` field in json receive response to `exception`
 
 ### Fixed
+
 - Prevent a stale jsonrpc connection from interfering with message receiving
 
 ## [0.10.3] - 2022-02-01
+
 ### Added
+
 - MessageSendLog to cache sent message for 24h.
   For resending messages in case the recipient fails to decrypt the message.
 - New global `--log-file` parameter to write logs to a separate file.
   (`--verbose` can be used to increase the log level)
 
 ### Improved
+
 - Better subscription handling for JSON-RPC `subscribeReceive` command
 
 ### Fixed
+
 - Output receipt data for unsealed sender receipts again
 - Fix sending message resend requests to devices that happen to have the same deviceId
 
 ## [0.10.2] - 2022-01-22
+
 ### Fixed
+
 - Archive old sessions/sender keys when a recipient's identity key has changed
 - Fix profile fetch with an invalid LANG variable
 
 ## [0.10.1] - 2022-01-16
+
 ### Added
+
 - Send group messages with sender keys (more efficient for larger groups)
 - New command `listStickerPacks` to display all known sticker packs
 - New flag `--sticker` for `send` command to send stickers
 
 ### Changed
+
 - Improve exit code for message sending.
   Exit with 0 status code if the message was sent successfully to at least
   one recipient, otherwise exit with status code 2 or 4 (for untrusted).
-- Download profiles in parallel for improved perfomance
+- Download profiles in parallel for improved performance
 - `--verbose` flag can be specified multiple times for additional log output
 - Enable more security options for systemd service file
 - Rename sandbox to staging environment, to match the upstream name.
 
 ### Fixed
+
 - The first incoming message after registration can now always be decrypted successfully
 - Ignore decryption failures from blocked contacts and don't send a resend request.
 
 ## [0.10.0] - 2021-12-11
+
 **Attention**: Now requires Java 17 and libsignal-client version 0.11
 
 ### Added
+
 - The daemon command now provides a JSON-RPC based socket interface (`--socket` and `--tcp`)
 - New daemon command flag `--receive-mode` to configure when messages are received
 - New daemon command flag `--no-receive-stdout` to prevent outputting messages on stdout
 - New command `listAccounts` that lists all registered local accounts
 - New command `removeContact`
-- Extend `send` command to allow sending mentions (`--mention`) and quotes (`--quote-timestamp`, `--quote-author`, `--quote-message`, `--quote-mention`)
+- Extend `send` command to allow sending mentions (`--mention`) and
+  quotes (`--quote-timestamp`, `--quote-author`, `--quote-message`, `--quote-mention`)
 - New dbus methods sendGroupTying, unregister, deleteAccount
-- New dbus events MessageReceivedV2, ReceiptReceivedV2, SyncMessageReceivedV2 that provide an extras parameter with additional message info as a key/value map
+- New dbus events MessageReceivedV2, ReceiptReceivedV2, SyncMessageReceivedV2 that provide an extras parameter with
+  additional message info as a key/value map
 - New dbus method sendViewedReceipt (Thanks @John Freed)
 - New dbus object Configuration to read and update configuration values (Thanks @John Freed)
 - Payment info in json receive output (Thanks @technillogue)
 - `-c` alias for `--config` (Thanks @technillogue)
 
 ### Changed
+
 - libzkgroup dependency is no longer required
-- Renamed `-u` and `--username` flags to `-a` and `--account` to prevent confusion with upcoming Signal usernames. The old flags are also still supported for now.
+- Renamed `-u` and `--username` flags to `-a` and `--account` to prevent confusion with upcoming Signal usernames. The
+  old flags are also still supported for now.
 - Respect phone number sharing mode and unlisted state set by primary device
 - Adapt register command to reactivate account if possible.
 - dbus-java now uses Java 16 native unix sockets, which should provide better cross-platform compatibility
-- If sending to a recipient fails (e.g. unregistered) signal-cli now exits with a success exit code and prints additional information about the failure.
+- If sending to a recipient fails (e.g. unregistered) signal-cli now exits with a success exit code and prints
+  additional information about the failure.
 
 ### Fixed
+
 - Registering an existing unregistered account now works reliably in daemon mode
 - Fixed an issue with loading some old config files without UUID
 - More reliable send behavior if some recipients are unregistered
 
 ## [0.9.2] - 2021-10-24
+
 ### Fixed
+
 - dbus `listNumbers` method works again
 
 ### Changed
+
 - Improved provisioning error handling if the last steps fail
 - Adapt behavior of receive command as dbus client to match normal mode
 - Update captcha url for proof required handling
 
 ## [0.9.1] - 2021-10-16
+
 **Attention**: Now requires native libzkgroup version 0.8
 
 ### Added
+
 - New command `updateConfiguration` which allows setting configurations for linked devices
 - Improved dbus daemon for group handling, groups are now exported as separate dbus objects
 - Linked devices can be managed via dbus
 - New dbus methods sendTyping and sendReadReceipt (Thanks @JtheSaw)
-- New dbus methods submitRateLimitChallenge, isRegistered, listDevices, setExpirationTimer, sendContacts, sendSyncRequest, uploadStickerPack, setPin and removePin (Thanks @John Freed)
+- New dbus methods submitRateLimitChallenge, isRegistered, listDevices, setExpirationTimer, sendContacts,
+  sendSyncRequest, uploadStickerPack, setPin and removePin (Thanks @John Freed)
 - New dbus method getSelfNumber
 
 ### Fixed
+
 - Do not send message resend request to own device
 - Allow message from pending member to accept group invitations
 - Fix issue which could cause signal-cli to repeatedly send the same delivery receipts
 - Reconnect websocket after connection loss
 
 ### Changed
+
 - Use new provisioning URL `sgnl://linkdevice` instead of `tsdevice:/`
 - The gradle command to build a graalvm native image is now `./gradlew nativeCompile`
 
 ## [0.9.0] - 2021-09-12
+
 **Attention**: Now requires native libsignal-client version 0.9
 
 ### Breaking changes
+
 - Removed deprecated `--json` parameter, use global parameter `--output=json` instead
 - Json output format of `listGroups` command changed:
   Members are now arrays of `{"number":"...","uuid":"..."}` objects instead of arrays of strings.
 - Removed deprecated fallback data paths, only `$XDG_DATA_HOME/signal-cli` is used now
-  For those still using the old paths (`$HOME/.config/signal`, `$HOME/.config/textsecure`) you need to move those to the new location.
+  For those still using the old paths (`$HOME/.config/signal`, `$HOME/.config/textsecure`) you need to move those to the
+  new location.
 
 ### Added
+
 - New global parameter `--trust-new-identities=always` to allow trusting any new identity key without verification
-- New parameter `--device-name` for `updateAccount` command to change the device name (also works for the primary device)
+- New parameter `--device-name` for `updateAccount` command to change the device name (also works for the primary
+  device)
 - New SignalControl DBus interface, to register/verify/link new accounts
 - New `jsonRpc` command that provides a JSON-RPC based API on stdout/stdin
 - Support for announcement groups
 - New parameter `--set-permission-send-messages` for `updateGroup` to create an announcement group
 - New `sendReceipt` command to send read and viewed receipts
-- Support for receiving sender key messages, mobile apps can now send messages more efficiently with server-side fan-out to groups with signal-cli members.
+- Support for receiving sender key messages, mobile apps can now send messages more efficiently with server-side fan-out
+  to groups with signal-cli members.
 - Support for reading data from remote Signal storage. Now v2 groups will be shown after linking a new device.
 - New `submitRateLimitChallenge` command that can be used to lift some rate-limits by solving a captcha
 
 ### Fixed
+
 - Store identity key correctly when sending a message after a recipient has changed keys
 
 ## [0.8.5] - 2021-08-07
+
 ### Added
+
 - Source name is included in JSON receive output (Thanks @technillogue)
 
 ### Fixed
+
 - Allow updateContact command to only set expiration timer without requiring a name parameter
 
 ## [0.8.4.1] - 2021-06-20
+
 ### Fixed
+
 - Incorrect error handling in register command
 
 ## [0.8.4] - 2021-06-13
+
 **Attention**: Now requires native libsignal-client version 0.8.1
 
 ### Added
+
 - New parameters for `updateGroup` command for group v2 features:
-  `--description`, `--remove-member`, `--admin`, `--remove-admin`, `--reset-link`, `--link`, `--set-permission-add-member`, `--set-permission-edit-details`, `--expiration`
+  `--description`, `--remove-member`, `--admin`, `--remove-admin`, `--reset-link`, `--link`,
+  `--set-permission-add-member`, `--set-permission-edit-details`, `--expiration`
 - New `--admin` parameter for `quitGroup` to set an admin before leaving the group
 - New `--delete` parameter for `quitGroup`, to delete the local group data
 - New 'sendTyping' command to send typing indicators
 
 ### Fixed
+
 - Fixed issue that prevented registration with invalid locales
 - Prevent last admin of a group from leaving the group
 - All commands now show a short description with `--help`
@@ -223,11 +855,14 @@
 ## [0.8.3] - 2021-05-13
 
 ### Fixed
+
 - Upgrading from account files with older profiles
 - Building native image with graalvm
 
 ## [0.8.2] - 2021-05-11
+
 ### Added
+
 - A manual page for the DBus interface (Thanks @bublath, @exquo)
 - Remote message delete command (Thanks @adaptivegarage)
 - sendSyncRequest command to request complete contact/group list from primary device
@@ -235,6 +870,7 @@
 - New `--family-name` argument for updateProfile
 
 ### Fixed
+
 - Sending reaction to group (Thanks @adaptivegarage)
 - Displaying of address for messages from untrusted identities
 - Handling of recipient number or uuid changes (e.g. after account deletions)
@@ -242,6 +878,7 @@
 - Display of quit group messages
 
 ### Changed
+
 - Unlimited strength crypto is now enabled automatically for JREs that require it (Thanks @i-infra)
 - Only one identity key is stored per recipient and updated from profile (to match app behavior)
 - updateContact, block and unblock are now disabled for linked devices
@@ -249,44 +886,58 @@
 - If message decryption fails due to a broken session, the session is automatically renewed
 - Rework account storage for better reliability
 - Improved device linking flow
-  - Allow relinking existing account
-  - Encrypt/Decrypt device names
+    - Allow relinking existing account
+    - Encrypt/Decrypt device names
 
 ## [0.8.1] - 2021-03-02
+
 ### Added
-- New dbus commands: updateProfile, listNumbers, getContactNumber, quitGroup, isContactBlocked, isGroupBlocked, isMember, joinGroup (Thanks @bublath)
+
+- New dbus commands: updateProfile, listNumbers, getContactNumber, quitGroup, isContactBlocked, isGroupBlocked,
+  isMember, joinGroup (Thanks @bublath)
 - Additional output for json format: shared contacts (Thanks @Atomic-Bean)
 - Improved plain text output to be more consistent and synced messages are now indented
 
 ### Fixed
+
 - Issue with broken sessions with linked devices
 
 ### Changed
+
 - Behavior of `trust` command improved, when trusting a new identity key all other known keys for
   the same number are removed.
 
 ## [0.8.0] - 2021-02-14
-**Attention**: For all signal protocol functionality an additional native library is now required: [libsignal-client](https://github.com/signalapp/libsignal-client/).
+
+**Attention**: For all signal protocol functionality an additional native library is now
+required: [libsignal-client](https://github.com/signalapp/libsignal-client/).
 See https://github.com/AsamK/signal-cli/wiki/Provide-native-lib-for-libsignal for more information.
 
 ### Added
+
 - Experimental support for building a GraalVM native image
 - Support for setting profile about text and emoji
 
 ### Fixed
+
 - Incorrect error message when removing a non-existent profile avatar
 
 ## [0.7.4] - 2021-01-19
+
 ### Changed
+
 - Notify linked devices after profile has been updated
 
 ### Fixed
+
 - After registering a new account, receiving messages didn't work
   You may have to register and verify again to fix the issue.
 - Creating v1 groups works again
 
 ## [0.7.3] - 2021-01-17
+
 ### Added
+
 - `getUserStatus` command to check if a user is registered on Signal (Thanks @Atomic-Bean)
 - Global `--verbose` flag to increase log level
 - Global `--output=json` flag, currently supported by `receive`, `daemon`, `getUserStatus`, `listGroups`
@@ -294,6 +945,7 @@ See https://github.com/AsamK/signal-cli/wiki/Provide-native-lib-for-libsignal fo
 - More info for received messages in json output: stickers, viewOnce, typing, remoteDelete
 
 ### Changed
+
 - signal-cli can now be used without the username `-u` flag
   For daemon command all local users will be exposed as dbus objects.
   If only one local user exists, all other commands will use that user,
@@ -305,32 +957,42 @@ See https://github.com/AsamK/signal-cli/wiki/Provide-native-lib-for-libsignal fo
 - In json output unnecessary fields that are null are now omitted
 
 ### Fixed
+
 - Disable registration lock before removing the PIN
 - Fix PIN hash version to match the official clients.
   If you had previously set a PIN you need to set it again to be able to unlock the registration lock later.
 - Issue with saving account file after linking
 
 ## [0.7.2] - 2020-12-31
+
 ### Added
+
 - Implement new registration lock PIN with `setPin` and `removePin` (with KBS)
 - Include quotes, mentions and reactions in json output (Thanks @Atomic-Bean)
 
 ### Fixed
+
 - Retrieve avatars for v2 groups
 - Download attachment thumbnail for quoted attachments
 
 ## [0.7.1] - 2020-12-21
+
 ### Added
+
 - Accept group invitation with `updateGroup -g GROUP_ID`
 - Decline group invitation with `quitGroup -g GROUP_ID`
 - Join group via invitation link `joinGroup --uri https://signal.group/#...`
 
 ### Fixed
+
 - Include group ids for v2 groups in json output
 
 ## [0.7.0] - 2020-12-15
+
 ### Added
+
 Support for groups of new type/v2
+
 - Sending and receiving
 - Updating name, avatar and adding members with `updateGroup`
 - Quit group and decline invitation with `quitGroup`
@@ -340,28 +1002,36 @@ Support for groups of new type/v2
 See https://github.com/AsamK/signal-cli/wiki/Provide-native-lib-for-libsignal for more information.
 
 ### Fixed
+
 - Rare NullPointerException when receiving messages
 
 ## [0.6.12] - 2020-11-22
+
 ### Added
+
 - Show additional message content (view once, remote delete, mention, …) for received messages
 - `--captcha` parameter for `register` command, required for some IP ranges
 
 ### Changed
+
 - Profile keys are now stored separately from contact list
 - Receipts from normal and unidentified messages now have the same format in json output
 
 ### Fixed
+
 - Issue where some messages were sent with an old counter index
 
 ## [0.6.11] - 2020-10-14
+
 - Fix issue with receiving message reactions
 
 ## [0.6.10] - 2020-09-11
+
 - Fix issue when retrieving profiles
 - Workaround issue with libzkgroup on platforms other than linux x86_64
 
 ## [0.6.9] - 2020-09-10
+
 - Minor bug fixes and improvements
 - dbus functionality now works on FreeBSD
 - signal-cli now requires Java 11
@@ -369,17 +1039,21 @@ See https://github.com/AsamK/signal-cli/wiki/Provide-native-lib-for-libsignal fo
 **Warning: this version only works on Linux x86_64, will be fixed in 0.6.10**
 
 ## [0.6.8] - 2020-05-22
-- Switch to hypfvieh dbus-java, which doesn't require a native library anymore (drops requirement of libmatthew-unix-java)
+
+- Switch to hypfvieh dbus-java, which doesn't require a native library anymore (drops requirement of
+  libmatthew-unix-java)
 - Bugfixes for messages with uuids
 - Add `--expiration` parameter to `updateContact` command to set expiration timer
 
 ## [0.6.7] - 2020-04-03
+
 - Send command now returns the timestamp of the sent message
 - DBus daemon: Publish received sync message to SyncMessageReceived signal
 - Fix issue with resolving e164/uuid addresses for sessions
 - Fix pack key length for sticker upload
 
 ## [0.6.6] - 2020-03-29
+
 - Added listContacts command
 - Added block/unblock commands to block contacts and groups
 - Added uploadStickerPack command to upload sticker packs (see man page for more details)
@@ -388,21 +1062,26 @@ See https://github.com/AsamK/signal-cli/wiki/Provide-native-lib-for-libsignal fo
 - Internal: support recipients with uuids
 
 ## [0.6.5] - 2019-11-11
+
 Supports receiving messages sent with unidentified sender
 
 ## [0.6.4] - 2019-11-02
+
 - Fix rounding error for attachment ids in json output
 - Add additional info to json output
 - Add commands to update profile name and avatar
 - Add command to update contact names
 
 ## [0.6.3] - 2019-09-05
+
 Bug fixes and small improvements
 
 ## [0.6.2] - 2018-12-16
+
 - Fixes sending of group messages
 
 ## [0.6.1] - 2018-12-09
+
 - Added getGroupIds dbus command
 - Use "NativePRNG" pseudo random number generator, if available
 - Switch default data path:
@@ -410,41 +1089,49 @@ Bug fixes and small improvements
   Existing data paths will continue to work (used as fallback)
 
 ## [0.6.0] - 2018-05-03
+
 - Simple json output
 - dbus signal for receiving messages
 - Registration lock PIN
 - Output quoted message
 
 ## [0.5.6] - 2017-06-16
+
 * new listGroups command
 * Support for attachments with file names
 * Support for complete contacts sync
-* Support for contact verification sync 
+* Support for contact verification sync
 * DBus interface:
- * Get/Set group info
- * Get/Set contact info
+* Get/Set group info
+* Get/Set contact info
 
 ## [0.5.5] - 2017-02-18
+
 - fix receiving messages on linked devices
 - add unregister command
 
 ## [0.5.4] - 2017-02-17
+
 - Fix linking of new devices
 
 ## [0.5.3] - 2017-01-29
-* New commandline paramter for receive: --ignore-attachments
+
+* New commandline parameter for receive: --ignore-attachments
 * Updated dependencies
 
 ## [0.5.2] - 2016-12-16
+
 - Add support for group info requests
 - Improve closing of file streams
 
 ## [0.5.1] - 2016-11-18
+
 - Support new safety numbers (https://whispersystems.org/blog/safety-number-updates/)
 - Add a man page
 - Support sending disappearing messages, if the recipient has activated it
 
 ## [0.5.0] - 2016-08-29
+
 - Check if a number is registered on Signal, before adding it to a group
 - Prevent sending to groups that the user has quit
 - Commands to trust new identity keys (see README)
@@ -452,38 +1139,47 @@ Bug fixes and small improvements
 - Timestamps shown in ISO 8601 format
 
 ## [0.4.1] - 2016-07-18
+
 - Fix issue with creating groups
 - Lock config file to prevent parallel access by multiple instances of signal-cli
 - Improve return codes, always return non-zero code, when sending failed
 
 ## [0.4.0] - 2016-06-19
+
 - Linking to Signal-Desktop and Signal-Android is now possible (Provisioning)
 - Added a contact store, mainly for syncing contacts with linked devices (editing not yet possible via cli)
 - Avatars for groups and contacts are now stored (new folder "avatars" in the config path)
 
 ## [0.3.1] - 2016-04-03
+
 - Fix running with Oracle JRE 8
 - Fix registering
 - Fix unicode warning when compiling with non utf8 locale
 
 ## [0.3.0] - 2016-04-02
+
 - Renamed textsecure-cli to signal-cli, following the rename of libtextsecure-java to libsignal-service-java
 - The experimental dbus interface was also renamed to org.asamk.Signal
 - Upload new prekeys to the server, when there are less than 20 left, prekeys are needed to create new sessions
 
 ## [0.2.1] - 2016-02-10
+
 - Improve dbus service
 - New command line argument --config to specify config directory
 
 ## [0.2.0] - 2015-12-30
-Added an experimental dbus interface, for sending and receiving messages (The interface is unstable and may change with future releases).
+
+Added an experimental dbus interface, for sending and receiving messages (The interface is unstable and may change with
+future releases).
 
 This release works with Java 7 and 8.
 
 ## [0.1.0] - 2015-11-28
+
 Add support for creating/updating groups and sending to them
 
 ## [0.0.5] - 2015-11-21
+
 - Add receive timeout commandline parameter
 - Show message group info
 
@@ -492,4 +1188,5 @@ Add support for creating/updating groups and sending to them
 ## [0.0.3] - 2015-08-07
 
 ## [0.0.2] - 2015-07-08
+
 First release
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e250e745..c18cd8a8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,13 +1,18 @@
 # Question
+
 If you have a question you can ask it in the [GitHub discussions page](https://github.com/AsamK/signal-cli/discussions)
 
 # Report a bug
+
 - Search [existing issues](https://github.com/AsamK/signal-cli/issues?q=is%3Aissue) if it has been reported already
-- If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/AsamK/signal-cli/issues/new).
-  - Be sure to include a **title and clear description**, as much relevant information as possible.
-  - Specify the signal-cli, JDK and OS version you're using. (and libsignal-client version, if self-compiled)
-  - Run the failing command with `--verbose` flag to get a more detailed log output and include that in the bug report
+- If you're unable to find an open issue addressing the
+  problem, [open a new one](https://github.com/AsamK/signal-cli/issues/new).
+    - Be sure to include a **title and clear description**, as much relevant information as possible.
+    - Specify the versions of signal-cli, libsignal-client (if self-compiled), JDK and OS you're using
+    - Specify if it's the normal java or the graalvm native version.
+    - Run the failing command with `--verbose` flag to get a more detailed log output and include that in the bug report
 
 # Pull request
+
 - Code style should match the existing code, IntelliJ users can use the auto formatter
 - Separate PRs should be opened for each implemented feature or bug fix
diff --git a/Containerfile b/Containerfile
new file mode 100644
index 00000000..361c2667
--- /dev/null
+++ b/Containerfile
@@ -0,0 +1,11 @@
+FROM docker.io/azul/zulu-openjdk:21-jre-headless
+
+LABEL org.opencontainers.image.source=https://github.com/AsamK/signal-cli
+LABEL org.opencontainers.image.description="signal-cli provides an unofficial commandline, dbus and JSON-RPC interface for the Signal messenger."
+LABEL org.opencontainers.image.licenses=GPL-3.0-only
+
+RUN useradd signal-cli --system --create-home --home-dir /var/lib/signal-cli
+ADD build/install/signal-cli /opt/signal-cli
+
+USER signal-cli
+ENTRYPOINT ["/opt/signal-cli/bin/signal-cli", "--config=/var/lib/signal-cli"]
diff --git a/FUNDING.yml b/FUNDING.yml
index 909168ff..c2420609 100644
--- a/FUNDING.yml
+++ b/FUNDING.yml
@@ -1,3 +1,4 @@
+github: AsamK
 liberapay: asamk
 ko_fi: asamk
 #bitcoin: bc1qykae53fry8a8ycgdzgv0rlxfc959hmmllvz698
diff --git a/README.md b/README.md
index 570451c2..c7228c09 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,19 @@
 # signal-cli
 
-signal-cli is a commandline interface
-for [libsignal-service-java](https://github.com/WhisperSystems/libsignal-service-java). It supports registering,
-verifying, sending and receiving messages. To be able to link to an existing Signal-Android/signal-cli instance,
-signal-cli uses a [patched libsignal-service-java](https://github.com/AsamK/libsignal-service-java), because
-libsignal-service-java does not yet
-support [provisioning as a linked device](https://github.com/WhisperSystems/libsignal-service-java/pull/21). For
-registering you need a phone number where you can receive SMS or incoming calls.
+signal-cli is a commandline interface for the [Signal messenger](https://signal.org/).
+It supports registering, verifying, sending and receiving messages.
+signal-cli uses a [patched libsignal-service-java](https://github.com/Turasa/libsignal-service-java),
+extracted from the [Signal-Android source code](https://github.com/signalapp/Signal-Android/tree/main/libsignal-service).
+For registering you need a phone number where you can receive SMS or incoming calls.
 
-signal-cli is primarily intended to be used on servers to notify admins of important events. For this use-case, it has a daemon mode with D-BUS
-interface ([man page](https://github.com/AsamK/signal-cli/blob/master/man/signal-cli-dbus.5.adoc)) and JSON-PRC interface ([documentation](https://github.com/AsamK/signal-cli/wiki/JSON-RPC-service)). For the JSON-RPC interface there's also a simple [example client](https://github.com/AsamK/signal-cli/tree/master/client), written in Rust.
+signal-cli is primarily intended to be used on servers to notify admins of important events.
+For this use-case, it has a daemon mode with JSON-RPC interface ([man page](https://github.com/AsamK/signal-cli/blob/master/man/signal-cli-jsonrpc.5.adoc))
+and D-BUS interface ([man page](https://github.com/AsamK/signal-cli/blob/master/man/signal-cli-dbus.5.adoc)) .
+For the JSON-RPC interface there's also a simple [example client](https://github.com/AsamK/signal-cli/tree/master/client), written in Rust.
+
+signal-cli needs to be kept up-to-date to keep up with Signal-Server changes.
+The official Signal clients expire after three months and then the Signal-Server can make incompatible changes.
+So signal-cli releases older than three months may not work correctly.
 
 ## Installation
 
@@ -19,7 +23,7 @@ Windows. There's also a [docker image and some Linux packages](https://github.co
 
 System requirements:
 
-- at least Java Runtime Environment (JRE) 17
+- at least Java Runtime Environment (JRE) 21
 - native library: libsignal-client
 
   The native libs are bundled for x86_64 Linux (with recent enough glibc), Windows and MacOS. For other
@@ -32,15 +36,14 @@ See [latest version](https://github.com/AsamK/signal-cli/releases).
 
 ```sh
 export VERSION=<latest version, format "x.y.z">
-wget https://github.com/AsamK/signal-cli/releases/download/v"${VERSION}"/signal-cli-"${VERSION}"-Linux.tar.gz
-sudo tar xf signal-cli-"${VERSION}"-Linux.tar.gz -C /opt
+wget https://github.com/AsamK/signal-cli/releases/download/v"${VERSION}"/signal-cli-"${VERSION}".tar.gz
+sudo tar xf signal-cli-"${VERSION}".tar.gz -C /opt
 sudo ln -sf /opt/signal-cli-"${VERSION}"/bin/signal-cli /usr/local/bin/
 ```
 
 You can find further instructions on the Wiki:
 
 - [Quickstart](https://github.com/AsamK/signal-cli/wiki/Quickstart)
-- [DBus Service](https://github.com/AsamK/signal-cli/wiki/DBus-service)
 
 ## Usage
 
@@ -54,10 +57,17 @@ of all country codes.)
 
 * Register a number (with SMS verification)
 
-        signal-cli -a ACCOUNT register
+      signal-cli -a ACCOUNT register
 
-  You can register Signal using a land line number. In this case you can skip SMS verification process and jump directly
-  to the voice call verification by adding the `--voice` switch at the end of above register command.
+  You can register Signal using a landline number. In this case, you need to follow the procedure below:
+   * Attempt a SMS verification process first (`signal-cli -a ACCOUNT register`)
+     * You will get an error `400 (InvalidTransportModeException)`, this is normal
+   * Wait 60 seconds
+   * Attempt a voice call verification by adding the `--voice` switch and wait for the call:
+
+     ```sh
+     signal-cli -a ACCOUNT register --voice
+     ```
 
   Registering may require solving a CAPTCHA
   challenge: [Registration with captcha](https://github.com/AsamK/signal-cli/wiki/Registration-with-captcha)
@@ -65,19 +75,27 @@ of all country codes.)
 * Verify the number using the code received via SMS or voice, optionally add `--pin PIN_CODE` if you've added a pin code
   to your account
 
-        signal-cli -a ACCOUNT verify CODE
+      signal-cli -a ACCOUNT verify CODE
 
 * Send a message
 
-        signal-cli -a ACCOUNT send -m "This is a message" RECIPIENT
+     ```sh
+     signal-cli -a ACCOUNT send -m "This is a message" RECIPIENT
+     ```
+
+* Send a message to a username, usernames need to be prefixed with `u:`
+
+     ```sh
+     signal-cli -a ACCOUNT send -m "This is a message" u:USERNAME.000
+     ```
 
 * Pipe the message content from another process.
 
-        uname -a | signal-cli -a ACCOUNT send --message-from-stdin RECIPIENT
+      uname -a | signal-cli -a ACCOUNT send --message-from-stdin RECIPIENT
 
 * Receive messages
 
-        signal-cli -a ACCOUNT receive
+      signal-cli -a ACCOUNT receive
 
 **Hint**: The Signal protocol expects that incoming messages are regularly received (using `daemon` or `receive`
 command). This is required for the encryption to work efficiently and for getting updates to groups, expiration timer
@@ -87,8 +105,8 @@ and other features.
 
 The password and cryptographic keys are created when registering and stored in the current users home directory:
 
-        $XDG_DATA_HOME/signal-cli/data/
-        $HOME/.local/share/signal-cli/data/
+    $XDG_DATA_HOME/signal-cli/data/
+    $HOME/.local/share/signal-cli/data/
 
 ## Building
 
@@ -97,44 +115,45 @@ version installed, you can replace `./gradlew` with `gradle` in the following st
 
 1. Checkout the source somewhere on your filesystem with
 
-        git clone https://github.com/AsamK/signal-cli.git
+       git clone https://github.com/AsamK/signal-cli.git
 
 2. Execute Gradle:
 
-        ./gradlew build
+       ./gradlew build
 
    2a. Create shell wrapper in *build/install/signal-cli/bin*:
 
-        ./gradlew installDist
+       ./gradlew installDist
 
    2b. Create tar file in *build/distributions*:
 
-        ./gradlew distTar
+       ./gradlew distTar
 
    2c. Create a fat tar file in *build/libs/signal-cli-fat*:
 
-        ./gradlew fatJar
+       ./gradlew fatJar
 
    2d. Compile and run signal-cli:
 
-        ./gradlew run --args="--help"
+      ```sh
+      ./gradlew run --args="--help"
+      ```
 
 ### Building a native binary with GraalVM (EXPERIMENTAL)
 
 It is possible to build a native binary with [GraalVM](https://www.graalvm.org). This is still experimental and will not
 work in all situations.
 
-1. [Install GraalVM and setup the enviroment](https://www.graalvm.org/docs/getting-started/#install-graalvm)
-2. [Install prerequisites](https://www.graalvm.org/reference-manual/native-image/#prerequisites)
-3. Execute Gradle:
+1. [Install GraalVM and setup the environment](https://www.graalvm.org/docs/getting-started/#install-graalvm)
+2. Execute Gradle:
 
-        ./gradlew nativeCompile
+       ./gradlew nativeCompile
 
    The binary is available at *build/native/nativeCompile/signal-cli*
 
 ## FAQ and Troubleshooting
 
-For frequently asked questions and issues have a look at the [wiki](https://github.com/AsamK/signal-cli/wiki/FAQ)
+For frequently asked questions and issues have a look at the [wiki](https://github.com/AsamK/signal-cli/wiki/FAQ).
 
 ## License
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 8bdd9ca4..ea69d97e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,43 +3,94 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.9.11"
+    id("org.graalvm.buildtools.native") version "0.10.6"
 }
 
-version = "0.10.7"
+allprojects {
+    group = "org.asamk"
+    version = "0.13.19-SNAPSHOT"
+}
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+
+    if (!JavaVersion.current().isCompatibleWith(targetCompatibility)) {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(targetCompatibility.majorVersion))
+        }
+    }
 }
 
 application {
     mainClass.set("org.asamk.signal.Main")
+    applicationDefaultJvmArgs = listOf("--enable-native-access=ALL-UNNAMED")
 }
 
 graalvmNative {
     binaries {
         this["main"].run {
+            buildArgs.add("--install-exit-handlers")
+            buildArgs.add("-Dfile.encoding=UTF-8")
+            buildArgs.add("-J-Dfile.encoding=UTF-8")
+            buildArgs.add("-march=compatibility")
+            resources.autodetect()
             configurationFileDirectories.from(file("graalvm-config-dir"))
-            buildArgs.add("--report-unsupported-elements-at-runtime")
+            if (System.getenv("GRAALVM_HOME") == null) {
+                toolchainDetection.set(true)
+                javaLauncher.set(javaToolchains.launcherFor {
+                    languageVersion.set(JavaLanguageVersion.of(21))
+                })
+            } else {
+                toolchainDetection.set(false)
+            }
         }
     }
 }
 
-repositories {
-    mavenLocal()
-    mavenCentral()
+val artifactType = Attribute.of("artifactType", String::class.java)
+val minified = Attribute.of("minified", Boolean::class.javaObjectType)
+dependencies {
+    attributesSchema {
+        attribute(minified)
+    }
+    artifactTypes.getByName("jar") {
+        attributes.attribute(minified, false)
+    }
 }
 
+configurations.runtimeClasspath.configure {
+    attributes {
+        attribute(minified, true)
+    }
+}
+val excludePatterns = mapOf(
+    "libsignal-client" to setOf(
+        "libsignal_jni_testing_amd64.so",
+        "signal_jni_testing_amd64.dll",
+        "libsignal_jni_testing_amd64.dylib",
+        "libsignal_jni_testing_aarch64.dylib",
+    )
+)
+
 dependencies {
-    implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
-    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.3")
-    implementation("net.sourceforge.argparse4j", "argparse4j", "0.9.0")
-    implementation("com.github.hypfvieh", "dbus-java-transport-native-unixsocket", "4.1.0")
-    implementation("org.slf4j", "slf4j-api", "1.7.36")
-    implementation("ch.qos.logback", "logback-classic", "1.2.11")
-    implementation("org.slf4j", "jul-to-slf4j", "1.7.36")
-    implementation(project(":lib"))
+    registerTransform(JarFileExcluder::class) {
+        from.attribute(minified, false).attribute(artifactType, "jar")
+        to.attribute(minified, true).attribute(artifactType, "jar")
+
+        parameters {
+            excludeFilesByArtifact = excludePatterns
+        }
+    }
+
+    implementation(libs.bouncycastle)
+    implementation(libs.jackson.databind)
+    implementation(libs.argparse4j)
+    implementation(libs.dbusjava)
+    implementation(libs.slf4j.api)
+    implementation(libs.slf4j.jul)
+    implementation(libs.logback)
+    implementation(project(":libsignal-cli"))
 }
 
 configurations {
@@ -63,21 +114,26 @@ tasks.withType<Jar> {
         attributes(
             "Implementation-Title" to project.name,
             "Implementation-Version" to project.version,
-            "Main-Class" to application.mainClass.get()
+            "Main-Class" to application.mainClass.get(),
+            "Enable-Native-Access" to "ALL-UNNAMED",
         )
     }
 }
 
-task("fatJar", type = Jar::class) {
+tasks.register("fatJar", type = Jar::class) {
     archiveBaseName.set("${project.name}-fat")
     exclude(
         "META-INF/*.SF",
         "META-INF/*.DSA",
         "META-INF/*.RSA",
-        "META-INF/NOTICE",
-        "META-INF/LICENSE",
-        "**/module-info.class"
+        "META-INF/NOTICE*",
+        "META-INF/LICENSE*",
+        "META-INF/INDEX.LIST",
+        "**/module-info.class",
     )
-    from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
-    with(tasks.jar.get() as CopySpec)
+    duplicatesStrategy = DuplicatesStrategy.WARN
+    doFirst {
+        from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
+    }
+    with(tasks.jar.get())
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 4516d475..3e8942b9 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,7 +1,19 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
+
 plugins {
     `kotlin-dsl`
 }
 
+tasks.named<KotlinCompilationTask<KotlinJvmCompilerOptions>>("compileKotlin").configure {
+    compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
+}
+
+java {
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
 repositories {
     mavenCentral()
 }
diff --git a/buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt b/buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt
index 270ae835..ae8ae4de 100644
--- a/buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt
+++ b/buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt
@@ -1,10 +1,10 @@
-import groovy.util.XmlSlurper
-import groovy.util.slurpersupport.GPathResult
-import org.codehaus.groovy.runtime.ResourceGroovyMethods
+@file:Suppress("DEPRECATION")
+
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.artifacts.Dependency
+import javax.xml.parsers.DocumentBuilderFactory
 
 class CheckLibVersionsPlugin : Plugin<Project> {
     override fun apply(project: Project) {
@@ -26,15 +26,15 @@ class CheckLibVersionsPlugin : Plugin<Project> {
         val name = dependency.name
         val metaDataUrl = "https://repo1.maven.org/maven2/$path/$name/maven-metadata.xml"
         try {
-            val url = ResourceGroovyMethods.toURL(metaDataUrl)
-            val metaDataText = ResourceGroovyMethods.getText(url)
-            val metadata = XmlSlurper().parseText(metaDataText)
-            val newest = (metadata.getProperty("versioning") as GPathResult).getProperty("latest")
+            val dbf = DocumentBuilderFactory.newInstance()
+            val db = dbf.newDocumentBuilder()
+            val doc = db.parse(metaDataUrl);
+            val newest = doc.getElementsByTagName("latest").item(0).textContent
             if (version != newest.toString()) {
                 println("UPGRADE {\"group\": \"$group\", \"name\": \"$name\", \"current\": \"$version\", \"latest\": \"$newest\"}")
             }
         } catch (e: Throwable) {
-            logger.debug("Unable to download or parse $metaDataUrl: $e.message")
+            logger.debug("Unable to download or parse {}: {}", metaDataUrl, e.message)
         }
     }
 }
diff --git a/buildSrc/src/main/kotlin/ExcludeFileFromJar.kt b/buildSrc/src/main/kotlin/ExcludeFileFromJar.kt
new file mode 100644
index 00000000..25862cc9
--- /dev/null
+++ b/buildSrc/src/main/kotlin/ExcludeFileFromJar.kt
@@ -0,0 +1,53 @@
+import org.gradle.api.artifacts.transform.*
+import org.gradle.api.file.FileSystemLocation
+import org.gradle.api.provider.Provider
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
+import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
+
+@CacheableTransform
+abstract class JarFileExcluder : TransformAction<JarFileExcluder.Parameters> {
+    interface Parameters : TransformParameters {
+        @get:Input
+        var excludeFilesByArtifact: Map<String, Set<String>>
+    }
+
+    @get:PathSensitive(PathSensitivity.NAME_ONLY)
+    @get:InputArtifact
+    abstract val inputArtifact: Provider<FileSystemLocation>
+
+    override
+    fun transform(outputs: TransformOutputs) {
+        val fileName = inputArtifact.get().asFile.name
+        for (entry in parameters.excludeFilesByArtifact) {
+            if (fileName.startsWith(entry.key)) {
+                val nameWithoutExtension = fileName.substring(0, fileName.lastIndexOf("."))
+                excludeFiles(inputArtifact.get().asFile, entry.value, outputs.file("${nameWithoutExtension}.jar"))
+                return
+            }
+        }
+        outputs.file(inputArtifact)
+    }
+
+    private fun excludeFiles(artifact: File, excludeFiles: Set<String>, jarFile: File) {
+        ZipInputStream(FileInputStream(artifact)).use { input ->
+            ZipOutputStream(FileOutputStream(jarFile)).use { output ->
+                var entry = input.nextEntry
+                while (entry != null) {
+                    if (!excludeFiles.contains(entry.name)) {
+                        output.putNextEntry(entry)
+                        input.copyTo(output)
+                        output.closeEntry()
+                    }
+
+                    entry = input.nextEntry
+                }
+            }
+        }
+    }
+}
diff --git a/client/Cargo.lock b/client/Cargo.lock
index 607cf0d5..01f28e0c 100644
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@@ -1,91 +1,179 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
-name = "aho-corasick"
-version = "0.7.18"
+name = "addr2line"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
- "memchr",
+ "gimli",
+]
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "anstream"
+version = "0.6.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.57"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
 [[package]]
-name = "atty"
-version = "0.2.14"
+name = "async-trait"
+version = "0.1.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
-name = "autocfg"
-version = "1.1.0"
+name = "atomic-waker"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "backtrace"
+version = "0.3.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bstr"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
-dependencies = [
- "memchr",
-]
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 
 [[package]]
 name = "bytes"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+
+[[package]]
+name = "cc"
+version = "1.2.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cesu8"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
 
 [[package]]
 name = "clap"
-version = "3.1.18"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b"
+checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
 dependencies = [
- "atty",
- "bitflags",
+ "clap_builder",
  "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
+dependencies = [
+ "anstream",
+ "anstyle",
  "clap_lex",
- "indexmap",
- "lazy_static",
  "strsim",
- "termcolor",
- "textwrap",
+ "terminal_size",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.1.18"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c"
+checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
 dependencies = [
  "heck",
- "proc-macro-error",
  "proc-macro2",
  "quote",
  "syn",
@@ -93,32 +181,69 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.2.0"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+
+[[package]]
+name = "combine"
+version = "4.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
 dependencies = [
- "os_str_bytes",
+ "bytes",
+ "memchr",
 ]
 
 [[package]]
-name = "convert_case"
-version = "0.4.0"
+name = "core-foundation"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
 
 [[package]]
-name = "derive_more"
-version = "0.99.17"
+name = "core-foundation-sys"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
- "convert_case",
  "proc-macro2",
  "quote",
- "rustc_version",
  "syn",
 ]
 
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "errno"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+dependencies = [
+ "libc",
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -126,65 +251,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
-name = "futures"
-version = "0.1.31"
+name = "form_urlencoded"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
-
-[[package]]
-name = "futures"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
+ "percent-encoding",
 ]
 
 [[package]]
 name = "futures-channel"
-version = "0.3.21"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
- "futures-sink",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.21"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
- "num_cpus",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.21"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -193,30 +287,32 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.21"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.21"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-timer"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 
 [[package]]
 name = "futures-util"
-version = "0.3.21"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
- "futures 0.1.31",
- "futures-channel",
  "futures-core",
- "futures-io",
  "futures-macro",
  "futures-sink",
  "futures-task",
- "memchr",
  "pin-project-lite",
  "pin-utils",
  "slab",
@@ -224,135 +320,380 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.1.16"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
+ "wasi",
 ]
 
 [[package]]
-name = "globset"
-version = "0.4.8"
+name = "gimli"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+
+[[package]]
+name = "h2"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17da50a276f1e01e0ba6c029e47b7100754904ee8a278f886546e98575380785"
 dependencies = [
- "aho-corasick",
- "bstr",
+ "atomic-waker",
+ "bytes",
  "fnv",
- "log",
- "regex",
+ "futures-core",
+ "futures-sink",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.11.2"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
 
 [[package]]
 name = "heck"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
-name = "hermit-abi"
-version = "0.1.19"
+name = "http"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
 dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
+[[package]]
+name = "hyper"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+dependencies = [
+ "http",
+ "hyper",
+ "hyper-util",
+ "log",
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f66d5bd4c6f02bf0542fad85d626775bab9258cf795a4256dcaf3161114d1df"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
  "libc",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "icu_collections"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+
+[[package]]
+name = "icu_properties"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "potential_utf",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+
+[[package]]
+name = "icu_provider"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
 name = "indexmap"
-version = "1.8.1"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
- "autocfg",
+ "equivalent",
  "hashbrown",
 ]
 
 [[package]]
-name = "instant"
-version = "0.1.12"
+name = "io-uring"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013"
 dependencies = [
+ "bitflags",
  "cfg-if",
+ "libc",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
 [[package]]
 name = "itoa"
-version = "1.0.2"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
-name = "jsonrpc-client-transports"
-version = "18.0.0"
-source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
+name = "jni"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
 dependencies = [
- "derive_more",
- "futures 0.3.21",
- "jsonrpc-core 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
- "jsonrpc-pubsub",
- "jsonrpc-server-utils 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
+ "cesu8",
+ "cfg-if",
+ "combine",
+ "jni-sys",
  "log",
- "parity-tokio-ipc",
+ "thiserror 1.0.69",
+ "walkdir",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+
+[[package]]
+name = "jsonrpsee"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fba77a59c4c644fd48732367624d1bcf6f409f9c9a286fbc71d2f1fc0b2ea16"
+dependencies = [
+ "jsonrpsee-core",
+ "jsonrpsee-http-client",
+ "jsonrpsee-proc-macros",
+ "jsonrpsee-types",
+ "tracing",
+]
+
+[[package]]
+name = "jsonrpsee-core"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "693c93cbb7db25f4108ed121304b671a36002c2db67dff2ee4391a688c738547"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "futures-timer",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "jsonrpsee-types",
+ "pin-project",
+ "rustc-hash",
  "serde",
  "serde_json",
+ "thiserror 2.0.12",
  "tokio",
+ "tokio-stream",
+ "tower",
+ "tracing",
 ]
 
 [[package]]
-name = "jsonrpc-core"
-version = "18.0.0"
+name = "jsonrpsee-http-client"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb"
+checksum = "6962d2bd295f75e97dd328891e58fce166894b974c1f7ce2e7597f02eeceb791"
 dependencies = [
- "futures 0.3.21",
- "futures-executor",
- "futures-util",
- "log",
+ "base64",
+ "http-body",
+ "hyper",
+ "hyper-rustls",
+ "hyper-util",
+ "jsonrpsee-core",
+ "jsonrpsee-types",
+ "rustls",
+ "rustls-platform-verifier",
  "serde",
- "serde_derive",
  "serde_json",
+ "thiserror 2.0.12",
+ "tokio",
+ "tower",
+ "url",
 ]
 
 [[package]]
-name = "jsonrpc-core"
-version = "18.0.0"
-source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
-dependencies = [
- "futures 0.3.21",
- "futures-executor",
- "futures-util",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
-]
-
-[[package]]
-name = "jsonrpc-core-client"
-version = "18.0.0"
+name = "jsonrpsee-proc-macros"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0"
-dependencies = [
- "futures 0.3.21",
- "jsonrpc-client-transports",
-]
-
-[[package]]
-name = "jsonrpc-derive"
-version = "18.0.0"
-source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
+checksum = "2fa4f5daed39f982a1bb9d15449a28347490ad42b212f8eaa2a2a344a0dce9e9"
 dependencies = [
+ "heck",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
@@ -360,169 +701,125 @@ dependencies = [
 ]
 
 [[package]]
-name = "jsonrpc-pubsub"
-version = "18.0.0"
-source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
+name = "jsonrpsee-types"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66df7256371c45621b3b7d2fb23aea923d577616b9c0e9c0b950a6ea5c2be0ca"
 dependencies = [
- "futures 0.3.21",
- "jsonrpc-core 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
- "lazy_static",
- "log",
- "parking_lot",
- "rand",
+ "http",
  "serde",
+ "serde_json",
+ "thiserror 2.0.12",
 ]
 
-[[package]]
-name = "jsonrpc-server-utils"
-version = "18.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4"
-dependencies = [
- "bytes",
- "futures 0.3.21",
- "globset",
- "jsonrpc-core 18.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static",
- "log",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "unicase",
-]
-
-[[package]]
-name = "jsonrpc-server-utils"
-version = "18.0.0"
-source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
-dependencies = [
- "bytes",
- "futures 0.3.21",
- "globset",
- "jsonrpc-core 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
- "lazy_static",
- "log",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "unicase",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
 [[package]]
 name = "libc"
-version = "0.2.126"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
 [[package]]
-name = "lock_api"
-version = "0.4.7"
+name = "linux-raw-sys"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+
+[[package]]
+name = "litemap"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
-name = "mio"
-version = "0.8.3"
+name = "miniz_oxide"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
- "libc",
- "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
+ "adler2",
 ]
 
 [[package]]
-name = "num_cpus"
-version = "1.13.1"
+name = "mio"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
- "hermit-abi",
  "libc",
+ "wasi",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "object"
+version = "0.36.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+dependencies = [
+ "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.11.0"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b10983b38c53aebdf33f542c6275b0f58a238129d00c4ae0e6fb59738d783ca"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
-name = "os_str_bytes"
-version = "6.0.1"
+name = "once_cell_polyfill"
+version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "029d8d0b2f198229de29dca79676f2738ff952edf3fde542eb8bf94d8c21b435"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
 
 [[package]]
-name = "parity-tokio-ipc"
-version = "0.9.0"
+name = "openssl-probe"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "pin-project"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
 dependencies = [
- "futures 0.3.21",
- "libc",
- "log",
- "rand",
- "tokio",
- "winapi",
+ "pin-project-internal",
 ]
 
 [[package]]
-name = "parking_lot"
-version = "0.11.2"
+name = "pin-project-internal"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec",
- "winapi",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -531,170 +828,215 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
-name = "ppv-lite86"
-version = "0.2.16"
+name = "potential_utf"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
+checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+dependencies = [
+ "zerovec",
+]
 
 [[package]]
 name = "proc-macro-crate"
-version = "0.1.5"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
+checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
 dependencies = [
- "toml",
-]
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
+ "toml_edit",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.39"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.18"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
-name = "rand"
-version = "0.7.3"
+name = "ring"
+version = "0.17.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
+ "cc",
+ "cfg-if",
  "getrandom",
  "libc",
- "rand_chacha",
- "rand_core",
- "rand_hc",
+ "untrusted",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "rand_chacha"
-version = "0.2.2"
+name = "rustc-demangle"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
+checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
 
 [[package]]
-name = "rand_core"
-version = "0.5.1"
+name = "rustc-hash"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom",
-]
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
-name = "rand_hc"
-version = "0.2.0"
+name = "rustix"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
+checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
 dependencies = [
  "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
-name = "regex"
-version = "1.5.6"
+name = "rustls"
+version = "0.23.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
+checksum = "2491382039b29b9b11ff08b76ff6c97cf287671dbb74f0be44bda389fffe9bd1"
 dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
+ "log",
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
 ]
 
 [[package]]
-name = "regex-syntax"
-version = "0.6.26"
+name = "rustls-native-certs"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
+checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
+dependencies = [
+ "openssl-probe",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework",
+]
 
 [[package]]
-name = "rustc_version"
-version = "0.4.0"
+name = "rustls-pki-types"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
 dependencies = [
- "semver",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-platform-verifier"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19787cda76408ec5404443dc8b31795c87cd8fec49762dc75fa727740d34acc1"
+dependencies = [
+ "core-foundation",
+ "core-foundation-sys",
+ "jni",
+ "log",
+ "once_cell",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-platform-verifier-android",
+ "rustls-webpki",
+ "security-framework",
+ "security-framework-sys",
+ "webpki-root-certs 0.26.11",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustls-platform-verifier-android"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.10"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
-name = "scopeguard"
-version = "1.1.0"
+name = "same-file"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
 
 [[package]]
-name = "semver"
-version = "1.0.9"
+name = "schannel"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "security-framework"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
 
 [[package]]
 name = "serde"
-version = "1.0.137"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.137"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -703,65 +1045,83 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.81"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "signal-cli-client"
 version = "0.0.1"
 dependencies = [
  "anyhow",
+ "bytes",
  "clap",
- "jsonrpc-client-transports",
- "jsonrpc-core 18.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core-client",
- "jsonrpc-derive",
- "jsonrpc-server-utils 18.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log",
+ "futures-util",
+ "jsonrpsee",
  "serde",
  "serde_json",
+ "thiserror 2.0.12",
  "tokio",
+ "tokio-util",
 ]
 
 [[package]]
 name = "slab"
-version = "0.4.6"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
+checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
 
 [[package]]
 name = "smallvec"
-version = "1.8.0"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "socket2"
-version = "0.4.4"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
 dependencies = [
  "libc",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "strsim"
-version = "0.10.0"
+name = "stable_deref_trait"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "1.0.95"
+version = "2.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -769,43 +1129,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "termcolor"
-version = "1.1.3"
+name = "sync_wrapper"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
-dependencies = [
- "winapi-util",
-]
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 
 [[package]]
-name = "textwrap"
-version = "0.15.0"
+name = "synstructure"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
-
-[[package]]
-name = "tokio"
-version = "1.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395"
-dependencies = [
- "bytes",
- "libc",
- "memchr",
- "mio",
- "num_cpus",
- "once_cell",
- "pin-project-lite",
- "socket2",
- "tokio-macros",
- "winapi",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -813,10 +1146,109 @@ dependencies = [
 ]
 
 [[package]]
-name = "tokio-stream"
-version = "0.1.8"
+name = "terminal_size"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3"
+checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed"
+dependencies = [
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+dependencies = [
+ "thiserror-impl 2.0.12",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tokio"
+version = "1.46.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "io-uring",
+ "libc",
+ "mio",
+ "pin-project-lite",
+ "slab",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -825,130 +1257,500 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.6.10"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507"
+checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
- "log",
  "pin-project-lite",
  "tokio",
 ]
 
 [[package]]
-name = "toml"
-version = "0.5.9"
+name = "toml_datetime"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+
+[[package]]
+name = "toml_edit"
+version = "0.22.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
- "serde",
+ "indexmap",
+ "toml_datetime",
+ "winnow",
 ]
 
 [[package]]
-name = "unicase"
-version = "2.6.0"
+name = "tower"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
- "version_check",
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tower-layer",
+ "tower-service",
 ]
 
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
 [[package]]
 name = "unicode-ident"
-version = "1.0.0"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
-name = "version_check"
-version = "0.9.4"
+name = "untrusted"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
+name = "url"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
 ]
 
 [[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
+name = "utf8_iter"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "webpki-root-certs"
+version = "0.26.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75c7f0ef91146ebfb530314f5f1d24528d7f0767efbfd31dce919275413e393e"
+dependencies = [
+ "webpki-root-certs 1.0.1",
+]
+
+[[package]]
+name = "webpki-root-certs"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86138b15b2b7d561bc4469e77027b8dd005a43dc502e9031d1f5afc8ce1f280e"
+dependencies = [
+ "rustls-pki-types",
+]
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "winapi",
+ "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "windows-sys"
-version = "0.36.1"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
 dependencies = [
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_msvc",
+ "windows-targets 0.42.2",
 ]
 
 [[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
+name = "windows-sys"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
+dependencies = [
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.36.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.36.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.36.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.36.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
+[[package]]
+name = "winnow"
+version = "0.7.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "writeable"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+
+[[package]]
+name = "yoke"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerotrie"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/client/Cargo.toml b/client/Cargo.toml
index e14d2d74..aff9ede4 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -1,25 +1,22 @@
 [package]
 name = "signal-cli-client"
 version = "0.0.1"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 anyhow = "1"
-clap = { version = "3", features = ["cargo", "derive"] }
-jsonrpc-core = "18"
-jsonrpc-core-client = "18"
-jsonrpc-client-transports = { version = "18", default-features = false, features = [
-    "ipc",
-] }
-jsonrpc-derive = "18"
-jsonrpc-server-utils = "18"
-log = "0.4"
+clap = { version = "4", features = ["cargo", "derive", "wrap_help"] }
 serde = "1"
 serde_json = "1"
-tokio = { version = "1", features = ["rt", "macros", "net"] }
-
-[patch.crates-io]
-jsonrpc-client-transports = { git = "https://github.com/AsamK/jsonrpc", branch = "client_subscribe_named_params" }
-jsonrpc-derive = { git = "https://github.com/AsamK/jsonrpc", branch = "client_subscribe_named_params" }
+tokio = { version = "1", features = ["rt", "macros", "net", "rt-multi-thread"] }
+jsonrpsee = { version = "0.25", features = [
+    "macros",
+    "async-client",
+    "http-client",
+] }
+bytes = "1"
+tokio-util = "0.7"
+futures-util = "0.3"
+thiserror = "2"
diff --git a/client/src/cli.rs b/client/src/cli.rs
index a98b16d3..7fa5d1c5 100644
--- a/client/src/cli.rs
+++ b/client/src/cli.rs
@@ -1,221 +1,306 @@
-use clap::{crate_version, ArgEnum, Parser, Subcommand};
 use std::{ffi::OsString, net::SocketAddr};
 
+use clap::{crate_version, Parser, Subcommand, ValueEnum};
+
 /// JSON-RPC client for signal-cli
 #[derive(Parser, Debug)]
-#[clap(rename_all = "kebab-case", version=crate_version!())]
+#[command(rename_all = "kebab-case", version = crate_version!())]
 pub struct Cli {
     /// Account to use (for daemon in multi-account mode)
-    #[clap(short = 'a', long)]
+    #[arg(short = 'a', long)]
     pub account: Option<String>,
 
     /// TCP host and port of signal-cli daemon
-    #[clap(long)]
+    #[arg(long, conflicts_with = "json_rpc_http")]
     pub json_rpc_tcp: Option<Option<SocketAddr>>,
 
     /// UNIX socket address and port of signal-cli daemon
-    #[clap(long)]
+    #[cfg(unix)]
+    #[arg(long, conflicts_with = "json_rpc_tcp")]
     pub json_rpc_socket: Option<Option<OsString>>,
 
-    #[clap(arg_enum, long, default_value_t = OutputTypes::Json)]
-    pub output: OutputTypes,
+    /// HTTP URL of signal-cli daemon
+    #[arg(long, conflicts_with = "json_rpc_socket")]
+    pub json_rpc_http: Option<Option<String>>,
 
-    #[clap(long)]
+    #[arg(long)]
     pub verbose: bool,
 
-    #[clap(subcommand)]
+    #[command(subcommand)]
     pub command: CliCommands,
 }
 
-#[derive(ArgEnum, Clone, Debug)]
-#[clap(rename_all = "kebab-case")]
-pub enum OutputTypes {
-    PlainText,
-    Json,
-}
-
 #[allow(clippy::large_enum_variant)]
 #[derive(Subcommand, Debug)]
-#[clap(rename_all = "camelCase", version=crate_version!())]
+#[command(rename_all = "camelCase", version = crate_version!())]
 pub enum CliCommands {
     AddDevice {
-        #[clap(long)]
+        #[arg(long)]
         uri: String,
     },
-    #[clap(rename_all = "kebab-case")]
+    AddStickerPack {
+        #[arg(long)]
+        uri: String,
+    },
+    #[command(rename_all = "kebab-case")]
     Block {
         recipient: Vec<String>,
 
-        #[clap(short = 'g', long)]
+        #[arg(short = 'g', long)]
         group_id: Vec<String>,
     },
     DeleteLocalAccountData {
-        #[clap(long = "ignore-registered")]
+        #[arg(long = "ignore-registered")]
         ignore_registered: Option<bool>,
     },
+    FinishChangeNumber {
+        number: String,
+        #[arg(short = 'v', long = "verification-code")]
+        verification_code: String,
+
+        #[arg(short = 'p', long)]
+        pin: Option<String>,
+    },
+    GetAttachment {
+        #[arg(long)]
+        id: String,
+        #[arg(long)]
+        recipient: Option<String>,
+        #[arg(short = 'g', long = "group-id")]
+        group_id: Option<String>,
+    },
+    GetAvatar {
+        #[arg(long)]
+        contact: Option<String>,
+        #[arg(long)]
+        profile: Option<String>,
+        #[arg(short = 'g', long = "group-id")]
+        group_id: Option<String>,
+    },
+    GetSticker {
+        #[arg(long = "pack-id")]
+        pack_id: String,
+        #[arg(long = "sticker-id")]
+        sticker_id: u32,
+    },
     GetUserStatus {
         recipient: Vec<String>,
+        #[arg(long)]
+        username: Vec<String>,
     },
     JoinGroup {
-        #[clap(long)]
+        #[arg(long)]
         uri: String,
     },
     Link {
-        #[clap(short = 'n', long)]
+        #[arg(short = 'n', long)]
         name: String,
     },
     ListAccounts,
     ListContacts {
         recipient: Vec<String>,
-        #[clap(short = 'a', long = "all-recipients")]
+        #[arg(short = 'a', long = "all-recipients")]
         all_recipients: bool,
-        #[clap(long, parse(try_from_str))]
+        #[arg(long)]
         blocked: Option<bool>,
-        #[clap(long)]
+        #[arg(long)]
         name: Option<String>,
     },
     ListDevices,
     ListGroups {
-        #[clap(short = 'd', long)]
+        #[arg(short = 'd', long)]
         detailed: bool,
-        #[clap(short = 'g', long = "group-id")]
+        #[arg(short = 'g', long = "group-id")]
         group_id: Vec<String>,
     },
     ListIdentities {
-        #[clap(short = 'n', long)]
+        #[arg(short = 'n', long)]
         number: Option<String>,
     },
     ListStickerPacks,
     QuitGroup {
-        #[clap(short = 'g', long = "group-id")]
+        #[arg(short = 'g', long = "group-id")]
         group_id: String,
-        #[clap(long)]
+        #[arg(long)]
         delete: bool,
-        #[clap(long)]
+        #[arg(long)]
         admin: Vec<String>,
     },
     Receive {
-        #[clap(short = 't', long, default_value_t = 3.0)]
+        #[arg(short = 't', long, default_value_t = 3.0)]
         timeout: f64,
     },
     Register {
-        #[clap(short = 'v', long)]
+        #[arg(short = 'v', long)]
         voice: bool,
-        #[clap(long)]
+        #[arg(long)]
         captcha: Option<String>,
     },
     RemoveContact {
         recipient: String,
-        #[clap(long)]
+        #[arg(long)]
         forget: bool,
+        #[arg(long)]
+        hide: bool,
     },
     RemoveDevice {
-        #[clap(short = 'd', long = "device-id")]
+        #[arg(short = 'd', long = "device-id")]
         device_id: u32,
     },
     RemovePin,
     RemoteDelete {
-        #[clap(short = 't', long = "target-timestamp")]
+        #[arg(short = 't', long = "target-timestamp")]
         target_timestamp: u64,
 
         recipient: Vec<String>,
 
-        #[clap(short = 'g', long = "group-id")]
+        #[arg(short = 'g', long = "group-id")]
         group_id: Vec<String>,
 
-        #[clap(long = "note-to-self")]
+        #[arg(long = "note-to-self")]
         note_to_self: bool,
     },
-    #[clap(rename_all = "kebab-case")]
+    #[command(rename_all = "kebab-case")]
     Send {
         recipient: Vec<String>,
 
-        #[clap(short = 'g', long)]
+        #[arg(short = 'g', long)]
         group_id: Vec<String>,
 
-        #[clap(long)]
+        #[arg(long)]
         note_to_self: bool,
 
-        #[clap(short = 'e', long)]
+        #[arg(short = 'e', long)]
         end_session: bool,
 
-        #[clap(short = 'm', long)]
+        #[arg(short = 'm', long)]
         message: Option<String>,
 
-        #[clap(short = 'a', long)]
+        #[arg(short = 'a', long)]
         attachment: Vec<String>,
 
-        #[clap(long)]
+        #[arg(long)]
+        view_once: bool,
+
+        #[arg(long)]
         mention: Vec<String>,
 
-        #[clap(long)]
+        #[arg(long)]
+        text_style: Vec<String>,
+
+        #[arg(long)]
         quote_timestamp: Option<u64>,
 
-        #[clap(long)]
+        #[arg(long)]
         quote_author: Option<String>,
 
-        #[clap(long)]
+        #[arg(long)]
         quote_message: Option<String>,
 
-        #[clap(long)]
+        #[arg(long)]
         quote_mention: Vec<String>,
 
-        #[clap(long)]
+        #[arg(long)]
+        quote_text_style: Vec<String>,
+
+        #[arg(long)]
+        quote_attachment: Vec<String>,
+
+        #[arg(long)]
+        preview_url: Option<String>,
+
+        #[arg(long)]
+        preview_title: Option<String>,
+
+        #[arg(long)]
+        preview_description: Option<String>,
+
+        #[arg(long)]
+        preview_image: Option<String>,
+
+        #[arg(long)]
         sticker: Option<String>,
+
+        #[arg(long)]
+        story_timestamp: Option<u64>,
+
+        #[arg(long)]
+        story_author: Option<String>,
+
+        #[arg(long)]
+        edit_timestamp: Option<u64>,
     },
     SendContacts,
     SendPaymentNotification {
         recipient: String,
 
-        #[clap(long)]
+        #[arg(long)]
         receipt: String,
 
-        #[clap(long)]
+        #[arg(long)]
         note: String,
     },
     SendReaction {
         recipient: Vec<String>,
 
-        #[clap(short = 'g', long = "group-id")]
+        #[arg(short = 'g', long = "group-id")]
         group_id: Vec<String>,
 
-        #[clap(long = "note-to-self")]
+        #[arg(long = "note-to-self")]
         note_to_self: bool,
 
-        #[clap(short = 'e', long)]
+        #[arg(short = 'e', long)]
         emoji: String,
 
-        #[clap(short = 'a', long = "target-author")]
+        #[arg(short = 'a', long = "target-author")]
         target_author: String,
 
-        #[clap(short = 't', long = "target-timestamp")]
+        #[arg(short = 't', long = "target-timestamp")]
         target_timestamp: u64,
 
-        #[clap(short = 'r', long)]
+        #[arg(short = 'r', long)]
         remove: bool,
+
+        #[arg(long)]
+        story: bool,
     },
     SendReceipt {
         recipient: String,
 
-        #[clap(short = 't', long = "target-timestamp")]
+        #[arg(short = 't', long = "target-timestamp")]
         target_timestamp: Vec<u64>,
 
-        #[clap(arg_enum, long)]
+        #[arg(value_enum, long)]
         r#type: ReceiptType,
     },
     SendSyncRequest,
     SendTyping {
         recipient: Vec<String>,
 
-        #[clap(short = 'g', long = "group-id")]
+        #[arg(short = 'g', long = "group-id")]
         group_id: Vec<String>,
 
-        #[clap(short = 's', long)]
+        #[arg(short = 's', long)]
         stop: bool,
     },
+    SendMessageRequestResponse {
+        recipient: Vec<String>,
+
+        #[arg(short = 'g', long = "group-id")]
+        group_id: Vec<String>,
+
+        r#type: MessageRequestResponseType,
+    },
     SetPin {
         pin: String,
     },
+    StartChangeNumber {
+        number: String,
+        #[arg(short = 'v', long)]
+        voice: bool,
+        #[arg(long)]
+        captcha: Option<String>,
+    },
     SubmitRateLimitChallenge {
         challenge: String,
         captcha: String,
@@ -223,118 +308,124 @@ pub enum CliCommands {
     Trust {
         recipient: String,
 
-        #[clap(short = 'a', long = "trust-all-known-keys")]
+        #[arg(short = 'a', long = "trust-all-known-keys")]
         trust_all_known_keys: bool,
 
-        #[clap(short = 'v', long = "verified-safety-number")]
+        #[arg(short = 'v', long = "verified-safety-number")]
         verified_safety_number: Option<String>,
     },
-    #[clap(rename_all = "kebab-case")]
+    #[command(rename_all = "kebab-case")]
     Unblock {
         recipient: Vec<String>,
 
-        #[clap(short = 'g', long)]
+        #[arg(short = 'g', long)]
         group_id: Vec<String>,
     },
     Unregister {
-        #[clap(long = "delete-account")]
+        #[arg(long = "delete-account")]
         delete_account: bool,
     },
     UpdateAccount {
-        #[clap(short = 'n', long = "device-name")]
+        #[arg(short = 'n', long = "device-name")]
         device_name: Option<String>,
+        #[arg(long = "unrestricted-unidentified-sender")]
+        unrestricted_unidentified_sender: Option<bool>,
+        #[arg(long = "discoverable-by-number")]
+        discoverable_by_number: Option<bool>,
+        #[arg(long = "number-sharing")]
+        number_sharing: Option<bool>,
     },
     UpdateConfiguration {
-        #[clap(long = "read-receipts", parse(try_from_str))]
+        #[arg(long = "read-receipts")]
         read_receipts: Option<bool>,
 
-        #[clap(long = "unidentified-delivery-indicators", parse(try_from_str))]
+        #[arg(long = "unidentified-delivery-indicators")]
         unidentified_delivery_indicators: Option<bool>,
 
-        #[clap(long = "typing-indicators", parse(try_from_str))]
+        #[arg(long = "typing-indicators")]
         typing_indicators: Option<bool>,
 
-        #[clap(long = "link-previews", parse(try_from_str))]
+        #[arg(long = "link-previews")]
         link_previews: Option<bool>,
     },
     UpdateContact {
         recipient: String,
 
-        #[clap(short = 'e', long)]
+        #[arg(short = 'e', long)]
         expiration: Option<u32>,
 
-        #[clap(short = 'n', long)]
+        #[arg(short = 'n', long)]
         name: Option<String>,
     },
     UpdateGroup {
-        #[clap(short = 'g', long = "group-id")]
+        #[arg(short = 'g', long = "group-id")]
         group_id: Option<String>,
 
-        #[clap(short = 'n', long)]
+        #[arg(short = 'n', long)]
         name: Option<String>,
 
-        #[clap(short = 'd', long)]
+        #[arg(short = 'd', long)]
         description: Option<String>,
 
-        #[clap(short = 'a', long)]
+        #[arg(short = 'a', long)]
         avatar: Option<String>,
 
-        #[clap(short = 'm', long)]
+        #[arg(short = 'm', long)]
         member: Vec<String>,
 
-        #[clap(short = 'r', long = "remove-member")]
+        #[arg(short = 'r', long = "remove-member")]
         remove_member: Vec<String>,
 
-        #[clap(long)]
+        #[arg(long)]
         admin: Vec<String>,
 
-        #[clap(long = "remove-admin")]
+        #[arg(long = "remove-admin")]
         remove_admin: Vec<String>,
 
-        #[clap(long)]
+        #[arg(long)]
         ban: Vec<String>,
 
-        #[clap(long)]
+        #[arg(long)]
         unban: Vec<String>,
 
-        #[clap(long = "reset-link")]
+        #[arg(long = "reset-link")]
         reset_link: bool,
 
-        #[clap(arg_enum, long)]
+        #[arg(value_enum, long)]
         link: Option<LinkState>,
 
-        #[clap(arg_enum, long = "set-permission-add-member")]
+        #[arg(value_enum, long = "set-permission-add-member")]
         set_permission_add_member: Option<GroupPermission>,
 
-        #[clap(arg_enum, long = "set-permission-edit-details")]
+        #[arg(value_enum, long = "set-permission-edit-details")]
         set_permission_edit_details: Option<GroupPermission>,
 
-        #[clap(arg_enum, long = "set-permission-send-messages")]
+        #[arg(value_enum, long = "set-permission-send-messages")]
         set_permission_send_messages: Option<GroupPermission>,
 
-        #[clap(short = 'e', long)]
+        #[arg(short = 'e', long)]
         expiration: Option<u32>,
     },
     UpdateProfile {
-        #[clap(long = "given-name")]
+        #[arg(long = "given-name")]
         given_name: Option<String>,
 
-        #[clap(long = "family-name")]
+        #[arg(long = "family-name")]
         family_name: Option<String>,
 
-        #[clap(long)]
+        #[arg(long)]
         about: Option<String>,
 
-        #[clap(long = "about-emoji")]
+        #[arg(long = "about-emoji")]
         about_emoji: Option<String>,
 
-        #[clap(long = "mobile-coin-address")]
+        #[arg(long = "mobile-coin-address", visible_alias = "mobilecoin-address")]
         mobile_coin_address: Option<String>,
 
-        #[clap(long)]
+        #[arg(long)]
         avatar: Option<String>,
 
-        #[clap(long = "remove-avatar")]
+        #[arg(long = "remove-avatar")]
         remove_avatar: bool,
     },
     UploadStickerPack {
@@ -343,30 +434,37 @@ pub enum CliCommands {
     Verify {
         verification_code: String,
 
-        #[clap(short = 'p', long)]
+        #[arg(short = 'p', long)]
         pin: Option<String>,
     },
     Version,
 }
 
-#[derive(ArgEnum, Clone, Debug)]
-#[clap(rename_all = "kebab-case")]
+#[derive(ValueEnum, Clone, Debug)]
+#[value(rename_all = "kebab-case")]
 pub enum ReceiptType {
     Read,
     Viewed,
 }
 
-#[derive(ArgEnum, Clone, Debug)]
-#[clap(rename_all = "kebab-case")]
+#[derive(ValueEnum, Clone, Debug)]
+#[value(rename_all = "kebab-case")]
 pub enum LinkState {
     Enabled,
     EnabledWithApproval,
     Disabled,
 }
 
-#[derive(ArgEnum, Clone, Debug)]
-#[clap(rename_all = "kebab-case")]
+#[derive(ValueEnum, Clone, Debug)]
+#[value(rename_all = "kebab-case")]
 pub enum GroupPermission {
     EveryMember,
     OnlyAdmins,
 }
+
+#[derive(ValueEnum, Clone, Debug)]
+#[value(rename_all = "kebab-case")]
+pub enum MessageRequestResponseType {
+    Accept,
+    Delete,
+}
diff --git a/client/src/jsonrpc.rs b/client/src/jsonrpc.rs
index 3c8abbbd..66ef9d9d 100644
--- a/client/src/jsonrpc.rs
+++ b/client/src/jsonrpc.rs
@@ -1,49 +1,102 @@
 use std::path::Path;
 
-use jsonrpc_client_transports::{transports::ipc, RpcError};
-use jsonrpc_core::serde::Deserialize;
-use jsonrpc_derive::rpc;
+use jsonrpsee::async_client::ClientBuilder;
+use jsonrpsee::core::client::{Error, SubscriptionClientT};
+use jsonrpsee::http_client::HttpClientBuilder;
+use jsonrpsee::proc_macros::rpc;
+use serde::Deserialize;
+use serde_json::Value;
 use tokio::net::ToSocketAddrs;
 
-pub type SignalCliClient = gen_client::Client;
-
-#[rpc(client, params = "named")]
+#[rpc(client)]
 pub trait Rpc {
-    #[rpc(name = "addDevice", params = "named")]
-    fn add_device(&self, account: Option<String>, uri: String) -> Result<Value>;
+    #[method(name = "addDevice", param_kind = map)]
+    async fn add_device(
+        &self,
+        account: Option<String>,
+        uri: String,
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "block", params = "named")]
+    #[method(name = "addStickerPack", param_kind = map)]
+    async fn add_sticker_pack(
+        &self,
+        account: Option<String>,
+        uri: String,
+    ) -> Result<Value, ErrorObjectOwned>;
+
+    #[method(name = "block", param_kind = map)]
     fn block(
         &self,
         account: Option<String>,
         recipients: Vec<String>,
         #[allow(non_snake_case)] groupIds: Vec<String>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "deleteLocalAccountData", params = "named")]
+    #[method(name = "deleteLocalAccountData", param_kind = map)]
     fn delete_local_account_data(
         &self,
         account: Option<String>,
         #[allow(non_snake_case)] ignoreRegistered: Option<bool>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "getUserStatus", params = "named")]
-    fn get_user_status(&self, account: Option<String>, recipients: Vec<String>) -> Result<Value>;
+    #[method(name = "getAttachment", param_kind = map)]
+    fn get_attachment(
+        &self,
+        account: Option<String>,
+        id: String,
+        recipient: Option<String>,
+        #[allow(non_snake_case)] groupId: Option<String>,
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "joinGroup", params = "named")]
-    fn join_group(&self, account: Option<String>, uri: String) -> Result<Value>;
+    #[method(name = "getAvatar", param_kind = map)]
+    fn get_avatar(
+        &self,
+        account: Option<String>,
+        contact: Option<String>,
+        profile: Option<String>,
+        #[allow(non_snake_case)] groupId: Option<String>,
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "finishLink", params = "named")]
+    #[method(name = "getSticker", param_kind = map)]
+    fn get_sticker(
+        &self,
+        account: Option<String>,
+        #[allow(non_snake_case)] packId: String,
+        #[allow(non_snake_case)] stickerId: u32,
+    ) -> Result<Value, ErrorObjectOwned>;
+
+    #[method(name = "getUserStatus", param_kind = map)]
+    fn get_user_status(
+        &self,
+        account: Option<String>,
+        recipients: Vec<String>,
+        usernames: Vec<String>,
+    ) -> Result<Value, ErrorObjectOwned>;
+
+    #[method(name = "joinGroup", param_kind = map)]
+    fn join_group(&self, account: Option<String>, uri: String) -> Result<Value, ErrorObjectOwned>;
+
+    #[allow(non_snake_case)]
+    #[method(name = "finishChangeNumber", param_kind = map)]
+    fn finish_change_number(
+        &self,
+        account: Option<String>,
+        number: String,
+        verificationCode: String,
+        pin: Option<String>,
+    ) -> Result<Value, ErrorObjectOwned>;
+
+    #[method(name = "finishLink", param_kind = map)]
     fn finish_link(
         &self,
         #[allow(non_snake_case)] deviceLinkUri: String,
         #[allow(non_snake_case)] deviceName: String,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "listAccounts", params = "named")]
-    fn list_accounts(&self) -> Result<Value>;
+    #[method(name = "listAccounts", param_kind = map)]
+    fn list_accounts(&self) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "listContacts", params = "named")]
+    #[method(name = "listContacts", param_kind = map)]
     fn list_contacts(
         &self,
         account: Option<String>,
@@ -51,60 +104,65 @@ pub trait Rpc {
         #[allow(non_snake_case)] allRecipients: bool,
         blocked: Option<bool>,
         name: Option<String>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "listDevices", params = "named")]
-    fn list_devices(&self, account: Option<String>) -> Result<Value>;
+    #[method(name = "listDevices", param_kind = map)]
+    fn list_devices(&self, account: Option<String>) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "listGroups", params = "named")]
+    #[method(name = "listGroups", param_kind = map)]
     fn list_groups(
         &self,
         account: Option<String>,
         #[allow(non_snake_case)] groupIds: Vec<String>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "listIdentities", params = "named")]
-    fn list_identities(&self, account: Option<String>, number: Option<String>) -> Result<Value>;
+    #[method(name = "listIdentities", param_kind = map)]
+    fn list_identities(
+        &self,
+        account: Option<String>,
+        number: Option<String>,
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "listStickerPacks", params = "named")]
-    fn list_sticker_packs(&self, account: Option<String>) -> Result<Value>;
+    #[method(name = "listStickerPacks", param_kind = map)]
+    fn list_sticker_packs(&self, account: Option<String>) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "quitGroup", params = "named")]
+    #[method(name = "quitGroup", param_kind = map)]
     fn quit_group(
         &self,
         account: Option<String>,
         #[allow(non_snake_case)] groupId: String,
         delete: bool,
         admins: Vec<String>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "register", params = "named")]
+    #[method(name = "register", param_kind = map)]
     fn register(
         &self,
         account: Option<String>,
         voice: bool,
         captcha: Option<String>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "removeContact", params = "named")]
+    #[method(name = "removeContact", param_kind = map)]
     fn remove_contact(
         &self,
         account: Option<String>,
         recipient: String,
         forget: bool,
-    ) -> Result<Value>;
+        hide: bool,
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "removeDevice", params = "named")]
+    #[method(name = "removeDevice", param_kind = map)]
     fn remove_device(
         &self,
         account: Option<String>,
         #[allow(non_snake_case)] deviceId: u32,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "removePin", params = "named")]
-    fn remove_pin(&self, account: Option<String>) -> Result<Value>;
+    #[method(name = "removePin", param_kind = map)]
+    fn remove_pin(&self, account: Option<String>) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "remoteDelete", params = "named")]
+    #[method(name = "remoteDelete", param_kind = map)]
     fn remote_delete(
         &self,
         account: Option<String>,
@@ -112,39 +170,51 @@ pub trait Rpc {
         recipients: Vec<String>,
         #[allow(non_snake_case)] groupIds: Vec<String>,
         #[allow(non_snake_case)] noteToSelf: bool,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "send", params = "named")]
+    #[allow(non_snake_case)]
+    #[method(name = "send", param_kind = map)]
     fn send(
         &self,
         account: Option<String>,
         recipients: Vec<String>,
-        #[allow(non_snake_case)] groupIds: Vec<String>,
-        #[allow(non_snake_case)] noteToSelf: bool,
-        #[allow(non_snake_case)] endSession: bool,
+        groupIds: Vec<String>,
+        noteToSelf: bool,
+        endSession: bool,
         message: String,
         attachments: Vec<String>,
+        viewOnce: bool,
         mentions: Vec<String>,
-        #[allow(non_snake_case)] quoteTimestamp: Option<u64>,
-        #[allow(non_snake_case)] quoteAuthor: Option<String>,
-        #[allow(non_snake_case)] quoteMessage: Option<String>,
-        #[allow(non_snake_case)] quoteMention: Vec<String>,
+        textStyle: Vec<String>,
+        quoteTimestamp: Option<u64>,
+        quoteAuthor: Option<String>,
+        quoteMessage: Option<String>,
+        quoteMention: Vec<String>,
+        quoteTextStyle: Vec<String>,
+        quoteAttachment: Vec<String>,
+        previewUrl: Option<String>,
+        previewTitle: Option<String>,
+        previewDescription: Option<String>,
+        previewImage: Option<String>,
         sticker: Option<String>,
-    ) -> Result<Value>;
+        storyTimestamp: Option<u64>,
+        storyAuthor: Option<String>,
+        editTimestamp: Option<u64>,
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "sendContacts", params = "named")]
-    fn send_contacts(&self, account: Option<String>) -> Result<Value>;
+    #[method(name = "sendContacts", param_kind = map)]
+    fn send_contacts(&self, account: Option<String>) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "sendPaymentNotification", params = "named")]
+    #[method(name = "sendPaymentNotification", param_kind = map)]
     fn send_payment_notification(
         &self,
         account: Option<String>,
         recipient: String,
         receipt: String,
         note: String,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "sendReaction", params = "named")]
+    #[method(name = "sendReaction", param_kind = map)]
     fn send_reaction(
         &self,
         account: Option<String>,
@@ -155,94 +225,117 @@ pub trait Rpc {
         #[allow(non_snake_case)] targetAuthor: String,
         #[allow(non_snake_case)] targetTimestamp: u64,
         remove: bool,
-    ) -> Result<Value>;
+        story: bool,
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "sendReceipt", params = "named")]
+    #[method(name = "sendReceipt", param_kind = map)]
     fn send_receipt(
         &self,
         account: Option<String>,
         recipient: String,
         #[allow(non_snake_case)] targetTimestamps: Vec<u64>,
         r#type: String,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "sendSyncRequest", params = "named")]
-    fn send_sync_request(&self, account: Option<String>) -> Result<Value>;
+    #[method(name = "sendSyncRequest", param_kind = map)]
+    fn send_sync_request(&self, account: Option<String>) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "sendTyping", params = "named")]
+    #[method(name = "sendTyping", param_kind = map)]
     fn send_typing(
         &self,
         account: Option<String>,
         recipients: Vec<String>,
         #[allow(non_snake_case)] groupIds: Vec<String>,
         stop: bool,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "setPin", params = "named")]
-    fn set_pin(&self, account: Option<String>, pin: String) -> Result<Value>;
+    #[method(name = "sendMessageRequestResponse", param_kind = map)]
+    fn send_message_request_response(
+        &self,
+        account: Option<String>,
+        recipients: Vec<String>,
+        #[allow(non_snake_case)] groupIds: Vec<String>,
+        r#type: String,
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "submitRateLimitChallenge", params = "named")]
+    #[method(name = "setPin", param_kind = map)]
+    fn set_pin(&self, account: Option<String>, pin: String) -> Result<Value, ErrorObjectOwned>;
+
+    #[method(name = "submitRateLimitChallenge", param_kind = map)]
     fn submit_rate_limit_challenge(
         &self,
         account: Option<String>,
         challenge: String,
         captcha: String,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "startLink", params = "named")]
-    fn start_link(&self, account: Option<String>) -> Result<JsonLink>;
+    #[method(name = "startChangeNumber", param_kind = map)]
+    fn start_change_number(
+        &self,
+        account: Option<String>,
+        number: String,
+        voice: bool,
+        captcha: Option<String>,
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "trust", params = "named")]
+    #[method(name = "startLink", param_kind = map)]
+    fn start_link(&self, account: Option<String>) -> Result<JsonLink, ErrorObjectOwned>;
+
+    #[method(name = "trust", param_kind = map)]
     fn trust(
         &self,
         account: Option<String>,
         recipient: String,
         #[allow(non_snake_case)] trustAllKnownKeys: bool,
         #[allow(non_snake_case)] verifiedSafetyNumber: Option<String>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "unblock", params = "named")]
+    #[method(name = "unblock", param_kind = map)]
     fn unblock(
         &self,
         account: Option<String>,
         recipients: Vec<String>,
         #[allow(non_snake_case)] groupIds: Vec<String>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "unregister", params = "named")]
+    #[method(name = "unregister", param_kind = map)]
     fn unregister(
         &self,
         account: Option<String>,
         #[allow(non_snake_case)] deleteAccount: bool,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "updateAccount", params = "named")]
+    #[allow(non_snake_case)]
+    #[method(name = "updateAccount", param_kind = map)]
     fn update_account(
         &self,
         account: Option<String>,
-        #[allow(non_snake_case)] deviceName: Option<String>,
-    ) -> Result<Value>;
+        deviceName: Option<String>,
+        unrestrictedUnidentifiedSender: Option<bool>,
+        discoverableByNumber: Option<bool>,
+        numberSharing: Option<bool>,
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "updateConfiguration", params = "named")]
+    #[method(name = "updateConfiguration", param_kind = map)]
     fn update_configuration(
         &self,
         account: Option<String>,
-        #[allow(non_snake_case)] readReceiptes: Option<bool>,
+        #[allow(non_snake_case)] readReceipts: Option<bool>,
         #[allow(non_snake_case)] unidentifiedDeliveryIndicators: Option<bool>,
         #[allow(non_snake_case)] typingIndicators: Option<bool>,
         #[allow(non_snake_case)] linkPreviews: Option<bool>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "updateContact", params = "named")]
+    #[method(name = "updateContact", param_kind = map)]
     fn update_contact(
         &self,
         account: Option<String>,
         recipient: String,
         name: Option<String>,
         expiration: Option<u32>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "updateGroup", params = "named")]
+    #[method(name = "updateGroup", param_kind = map)]
     fn update_group(
         &self,
         account: Option<String>,
@@ -262,9 +355,9 @@ pub trait Rpc {
         #[allow(non_snake_case)] setPermissionEditDetails: Option<String>,
         #[allow(non_snake_case)] setPermissionSendMessages: Option<String>,
         expiration: Option<u32>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "updateProfile", params = "named")]
+    #[method(name = "updateProfile", param_kind = map)]
     fn update_profile(
         &self,
         account: Option<String>,
@@ -275,32 +368,33 @@ pub trait Rpc {
         #[allow(non_snake_case)] mobileCoinAddress: Option<String>,
         avatar: Option<String>,
         #[allow(non_snake_case)] removeAvatar: bool,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "uploadStickerPack", params = "named")]
-    fn upload_sticker_pack(&self, account: Option<String>, path: String) -> Result<Value>;
+    #[method(name = "uploadStickerPack", param_kind = map)]
+    fn upload_sticker_pack(
+        &self,
+        account: Option<String>,
+        path: String,
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "verify", params = "named")]
+    #[method(name = "verify", param_kind = map)]
     fn verify(
         &self,
         account: Option<String>,
         #[allow(non_snake_case)] verificationCode: String,
         pin: Option<String>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[pubsub(
-        subscription = "receive",
-        subscribe,
-        name = "subscribeReceive",
-        params = "named"
+    #[subscription(
+        name = "subscribeReceive" => "receive",
+        unsubscribe = "unsubscribeReceive",
+        item = Value,
+        param_kind = map
     )]
-    fn subscribe_receive(&self, _: Self::Metadata, _: Subscriber<Value>, account: Option<String>);
+    async fn subscribe_receive(&self, account: Option<String>) -> SubscriptionResult;
 
-    #[pubsub(subscription = "receive", unsubscribe, name = "unsubscribeReceive")]
-    fn unsubscribe_receive(&self, _: Option<Self::Metadata>, _: SubscriptionId) -> Result<bool>;
-
-    #[rpc(name = "version")]
-    fn version(&self) -> Result<Value>;
+    #[method(name = "version")]
+    fn version(&self) -> Result<Value, ErrorObjectOwned>;
 }
 
 #[derive(Deserialize)]
@@ -309,10 +403,23 @@ pub struct JsonLink {
     pub device_link_uri: String,
 }
 
-pub async fn connect_tcp(tcp: impl ToSocketAddrs) -> Result<SignalCliClient, RpcError> {
-    super::tcp::connect::<_, SignalCliClient>(tcp).await
+pub async fn connect_tcp(
+    tcp: impl ToSocketAddrs,
+) -> Result<impl SubscriptionClientT, std::io::Error> {
+    let (sender, receiver) = super::transports::tcp::connect(tcp).await?;
+
+    Ok(ClientBuilder::default().build_with_tokio(sender, receiver))
 }
 
-pub async fn connect_unix(socket_path: impl AsRef<Path>) -> Result<SignalCliClient, RpcError> {
-    ipc::connect::<_, SignalCliClient>(socket_path).await
+#[cfg(unix)]
+pub async fn connect_unix(
+    socket_path: impl AsRef<Path>,
+) -> Result<impl SubscriptionClientT, std::io::Error> {
+    let (sender, receiver) = super::transports::ipc::connect(socket_path).await?;
+
+    Ok(ClientBuilder::default().build_with_tokio(sender, receiver))
+}
+
+pub async fn connect_http(uri: &str) -> Result<impl SubscriptionClientT + use<>, Error> {
+    HttpClientBuilder::default().build(uri)
 }
diff --git a/client/src/main.rs b/client/src/main.rs
index c0ef0de6..ac12331d 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -1,66 +1,85 @@
-use clap::StructOpt;
-use jsonrpc_client_transports::{RpcError, TypedSubscriptionStream};
-use jsonrpc_core::{futures_util::StreamExt, Value};
 use std::{path::PathBuf, time::Duration};
+
+use clap::Parser;
+use jsonrpsee::core::client::{Error as RpcError, Subscription, SubscriptionClientT};
+use serde_json::{Error, Value};
 use tokio::{select, time::sleep};
 
-use crate::cli::{GroupPermission, LinkState};
+use cli::Cli;
+
+use crate::cli::{CliCommands, GroupPermission, LinkState};
+use crate::jsonrpc::RpcClient;
 
 mod cli;
-#[allow(clippy::too_many_arguments)]
+#[allow(non_snake_case, clippy::too_many_arguments)]
 mod jsonrpc;
-mod tcp;
+mod transports;
 
 const DEFAULT_TCP: &str = "127.0.0.1:7583";
 const DEFAULT_SOCKET_SUFFIX: &str = "signal-cli/socket";
+const DEFAULT_HTTP: &str = "http://localhost:8080/api/v1/rpc";
 
 #[tokio::main]
 async fn main() -> Result<(), anyhow::Error> {
     let cli = cli::Cli::parse();
 
-    let client = connect(&cli)
-        .await
-        .map_err(|e| anyhow::anyhow!("Failed to connect to socket: {e}"))?;
+    let result = connect(cli).await;
 
-    let result = match cli.command {
-        cli::CliCommands::Receive { timeout } => {
-            let mut stream = client
-                .subscribe_receive(cli.account)
-                .map_err(|e| anyhow::anyhow!("JSON-RPC command failed: {:?}", e))?;
+    match result {
+        Ok(Value::Null) => {}
+        Ok(v) => println!("{v}"),
+        Err(e) => return Err(anyhow::anyhow!("JSON-RPC command failed: {e:?}")),
+    }
+    Ok(())
+}
+
+async fn handle_command(
+    cli: Cli,
+    client: impl SubscriptionClientT + Sync,
+) -> Result<Value, RpcError> {
+    match cli.command {
+        CliCommands::Receive { timeout } => {
+            let mut stream = client.subscribe_receive(cli.account).await?;
 
             {
                 while let Some(v) = stream_next(timeout, &mut stream).await {
-                    let v = v.map_err(|e| anyhow::anyhow!("JSON-RPC command failed: {:?}", e))?;
+                    let v = v?;
                     println!("{v}");
                 }
             }
-            return Ok(());
+            stream.unsubscribe().await?;
+            Ok(Value::Null)
         }
-        cli::CliCommands::AddDevice { uri } => client.add_device(cli.account, uri).await,
-        cli::CliCommands::Block {
+        CliCommands::AddDevice { uri } => client.add_device(cli.account, uri).await,
+        CliCommands::Block {
             recipient,
             group_id,
         } => client.block(cli.account, recipient, group_id).await,
-        cli::CliCommands::DeleteLocalAccountData { ignore_registered } => {
+        CliCommands::DeleteLocalAccountData { ignore_registered } => {
             client
                 .delete_local_account_data(cli.account, ignore_registered)
                 .await
         }
-        cli::CliCommands::GetUserStatus { recipient } => {
-            client.get_user_status(cli.account, recipient).await
+        CliCommands::GetUserStatus {
+            recipient,
+            username,
+        } => {
+            client
+                .get_user_status(cli.account, recipient, username)
+                .await
         }
-        cli::CliCommands::JoinGroup { uri } => client.join_group(cli.account, uri).await,
-        cli::CliCommands::Link { name } => {
+        CliCommands::JoinGroup { uri } => client.join_group(cli.account, uri).await,
+        CliCommands::Link { name } => {
             let url = client
                 .start_link(cli.account)
                 .await
-                .map_err(|e| anyhow::anyhow!("JSON-RPC command startLink failed: {e:?}",))?
+                .map_err(|e| RpcError::Custom(format!("JSON-RPC command startLink failed: {e:?}")))?
                 .device_link_uri;
-            println!("{}", url);
+            println!("{url}");
             client.finish_link(url, name).await
         }
-        cli::CliCommands::ListAccounts => client.list_accounts().await,
-        cli::CliCommands::ListContacts {
+        CliCommands::ListAccounts => client.list_accounts().await,
+        CliCommands::ListContacts {
             recipient,
             all_recipients,
             blocked,
@@ -70,16 +89,14 @@ async fn main() -> Result<(), anyhow::Error> {
                 .list_contacts(cli.account, recipient, all_recipients, blocked, name)
                 .await
         }
-        cli::CliCommands::ListDevices => client.list_devices(cli.account).await,
-        cli::CliCommands::ListGroups {
+        CliCommands::ListDevices => client.list_devices(cli.account).await,
+        CliCommands::ListGroups {
             detailed: _,
             group_id,
         } => client.list_groups(cli.account, group_id).await,
-        cli::CliCommands::ListIdentities { number } => {
-            client.list_identities(cli.account, number).await
-        }
-        cli::CliCommands::ListStickerPacks => client.list_sticker_packs(cli.account).await,
-        cli::CliCommands::QuitGroup {
+        CliCommands::ListIdentities { number } => client.list_identities(cli.account, number).await,
+        CliCommands::ListStickerPacks => client.list_sticker_packs(cli.account).await,
+        CliCommands::QuitGroup {
             group_id,
             delete,
             admin,
@@ -88,17 +105,23 @@ async fn main() -> Result<(), anyhow::Error> {
                 .quit_group(cli.account, group_id, delete, admin)
                 .await
         }
-        cli::CliCommands::Register { voice, captcha } => {
+        CliCommands::Register { voice, captcha } => {
             client.register(cli.account, voice, captcha).await
         }
-        cli::CliCommands::RemoveContact { recipient, forget } => {
-            client.remove_contact(cli.account, recipient, forget).await
+        CliCommands::RemoveContact {
+            recipient,
+            forget,
+            hide,
+        } => {
+            client
+                .remove_contact(cli.account, recipient, forget, hide)
+                .await
         }
-        cli::CliCommands::RemoveDevice { device_id } => {
+        CliCommands::RemoveDevice { device_id } => {
             client.remove_device(cli.account, device_id).await
         }
-        cli::CliCommands::RemovePin => client.remove_pin(cli.account).await,
-        cli::CliCommands::RemoteDelete {
+        CliCommands::RemovePin => client.remove_pin(cli.account).await,
+        CliCommands::RemoteDelete {
             target_timestamp,
             recipient,
             group_id,
@@ -114,19 +137,30 @@ async fn main() -> Result<(), anyhow::Error> {
                 )
                 .await
         }
-        cli::CliCommands::Send {
+        CliCommands::Send {
             recipient,
             group_id,
             note_to_self,
             end_session,
             message,
             attachment,
+            view_once,
             mention,
+            text_style,
             quote_timestamp,
             quote_author,
             quote_message,
             quote_mention,
+            quote_text_style,
+            quote_attachment,
+            preview_url,
+            preview_title,
+            preview_description,
+            preview_image,
             sticker,
+            story_timestamp,
+            story_author,
+            edit_timestamp,
         } => {
             client
                 .send(
@@ -137,17 +171,28 @@ async fn main() -> Result<(), anyhow::Error> {
                     end_session,
                     message.unwrap_or_default(),
                     attachment,
+                    view_once,
                     mention,
+                    text_style,
                     quote_timestamp,
                     quote_author,
                     quote_message,
                     quote_mention,
+                    quote_text_style,
+                    quote_attachment,
+                    preview_url,
+                    preview_title,
+                    preview_description,
+                    preview_image,
                     sticker,
+                    story_timestamp,
+                    story_author,
+                    edit_timestamp,
                 )
                 .await
         }
-        cli::CliCommands::SendContacts => client.send_contacts(cli.account).await,
-        cli::CliCommands::SendPaymentNotification {
+        CliCommands::SendContacts => client.send_contacts(cli.account).await,
+        CliCommands::SendPaymentNotification {
             recipient,
             receipt,
             note,
@@ -156,7 +201,7 @@ async fn main() -> Result<(), anyhow::Error> {
                 .send_payment_notification(cli.account, recipient, receipt, note)
                 .await
         }
-        cli::CliCommands::SendReaction {
+        CliCommands::SendReaction {
             recipient,
             group_id,
             note_to_self,
@@ -164,6 +209,7 @@ async fn main() -> Result<(), anyhow::Error> {
             target_author,
             target_timestamp,
             remove,
+            story,
         } => {
             client
                 .send_reaction(
@@ -175,10 +221,11 @@ async fn main() -> Result<(), anyhow::Error> {
                     target_author,
                     target_timestamp,
                     remove,
+                    story,
                 )
                 .await
         }
-        cli::CliCommands::SendReceipt {
+        CliCommands::SendReceipt {
             recipient,
             target_timestamp,
             r#type,
@@ -195,8 +242,8 @@ async fn main() -> Result<(), anyhow::Error> {
                 )
                 .await
         }
-        cli::CliCommands::SendSyncRequest => client.send_sync_request(cli.account).await,
-        cli::CliCommands::SendTyping {
+        CliCommands::SendSyncRequest => client.send_sync_request(cli.account).await,
+        CliCommands::SendTyping {
             recipient,
             group_id,
             stop,
@@ -205,13 +252,13 @@ async fn main() -> Result<(), anyhow::Error> {
                 .send_typing(cli.account, recipient, group_id, stop)
                 .await
         }
-        cli::CliCommands::SetPin { pin } => client.set_pin(cli.account, pin).await,
-        cli::CliCommands::SubmitRateLimitChallenge { challenge, captcha } => {
+        CliCommands::SetPin { pin } => client.set_pin(cli.account, pin).await,
+        CliCommands::SubmitRateLimitChallenge { challenge, captcha } => {
             client
                 .submit_rate_limit_challenge(cli.account, challenge, captcha)
                 .await
         }
-        cli::CliCommands::Trust {
+        CliCommands::Trust {
             recipient,
             trust_all_known_keys,
             verified_safety_number,
@@ -225,17 +272,30 @@ async fn main() -> Result<(), anyhow::Error> {
                 )
                 .await
         }
-        cli::CliCommands::Unblock {
+        CliCommands::Unblock {
             recipient,
             group_id,
         } => client.unblock(cli.account, recipient, group_id).await,
-        cli::CliCommands::Unregister { delete_account } => {
+        CliCommands::Unregister { delete_account } => {
             client.unregister(cli.account, delete_account).await
         }
-        cli::CliCommands::UpdateAccount { device_name } => {
-            client.update_account(cli.account, device_name).await
+        CliCommands::UpdateAccount {
+            device_name,
+            unrestricted_unidentified_sender,
+            discoverable_by_number,
+            number_sharing,
+        } => {
+            client
+                .update_account(
+                    cli.account,
+                    device_name,
+                    unrestricted_unidentified_sender,
+                    discoverable_by_number,
+                    number_sharing,
+                )
+                .await
         }
-        cli::CliCommands::UpdateConfiguration {
+        CliCommands::UpdateConfiguration {
             read_receipts,
             unidentified_delivery_indicators,
             typing_indicators,
@@ -251,7 +311,7 @@ async fn main() -> Result<(), anyhow::Error> {
                 )
                 .await
         }
-        cli::CliCommands::UpdateContact {
+        CliCommands::UpdateContact {
             recipient,
             expiration,
             name,
@@ -260,7 +320,7 @@ async fn main() -> Result<(), anyhow::Error> {
                 .update_contact(cli.account, recipient, name, expiration)
                 .await
         }
-        cli::CliCommands::UpdateGroup {
+        CliCommands::UpdateGroup {
             group_id,
             name,
             description,
@@ -313,7 +373,7 @@ async fn main() -> Result<(), anyhow::Error> {
                 )
                 .await
         }
-        cli::CliCommands::UpdateProfile {
+        CliCommands::UpdateProfile {
             given_name,
             family_name,
             about,
@@ -335,47 +395,126 @@ async fn main() -> Result<(), anyhow::Error> {
                 )
                 .await
         }
-        cli::CliCommands::UploadStickerPack { path } => {
+        CliCommands::UploadStickerPack { path } => {
             client.upload_sticker_pack(cli.account, path).await
         }
-        cli::CliCommands::Verify {
+        CliCommands::Verify {
             verification_code,
             pin,
         } => client.verify(cli.account, verification_code, pin).await,
-        cli::CliCommands::Version => client.version().await,
-    };
-
-    result
-        .map(|v| println!("{v}"))
-        .map_err(|e| anyhow::anyhow!("JSON-RPC command failed: {e:?}",))?;
-    Ok(())
+        CliCommands::Version => client.version().await,
+        CliCommands::AddStickerPack { uri } => client.add_sticker_pack(cli.account, uri).await,
+        CliCommands::FinishChangeNumber {
+            number,
+            verification_code,
+            pin,
+        } => {
+            client
+                .finish_change_number(cli.account, number, verification_code, pin)
+                .await
+        }
+        CliCommands::GetAttachment {
+            id,
+            recipient,
+            group_id,
+        } => {
+            client
+                .get_attachment(cli.account, id, recipient, group_id)
+                .await
+        }
+        CliCommands::GetAvatar {
+            contact,
+            profile,
+            group_id,
+        } => {
+            client
+                .get_avatar(cli.account, contact, profile, group_id)
+                .await
+        }
+        CliCommands::GetSticker {
+            pack_id,
+            sticker_id,
+        } => client.get_sticker(cli.account, pack_id, sticker_id).await,
+        CliCommands::StartChangeNumber {
+            number,
+            voice,
+            captcha,
+        } => {
+            client
+                .start_change_number(cli.account, number, voice, captcha)
+                .await
+        }
+        CliCommands::SendMessageRequestResponse {
+            recipient,
+            group_id,
+            r#type,
+        } => {
+            client
+                .send_message_request_response(
+                    cli.account,
+                    recipient,
+                    group_id,
+                    match r#type {
+                        cli::MessageRequestResponseType::Accept => "accept".to_owned(),
+                        cli::MessageRequestResponseType::Delete => "delete".to_owned(),
+                    },
+                )
+                .await
+        }
+    }
 }
 
-async fn connect(cli: &cli::Cli) -> Result<jsonrpc::SignalCliClient, RpcError> {
-    if let Some(tcp) = cli.json_rpc_tcp {
+async fn connect(cli: Cli) -> Result<Value, RpcError> {
+    if let Some(http) = &cli.json_rpc_http {
+        let uri = if let Some(uri) = http {
+            uri
+        } else {
+            DEFAULT_HTTP
+        };
+        let client = jsonrpc::connect_http(uri)
+            .await
+            .map_err(|e| RpcError::Custom(format!("Failed to connect to socket: {e}")))?;
+
+        handle_command(cli, client).await
+    } else if let Some(tcp) = cli.json_rpc_tcp {
         let socket_addr = tcp.unwrap_or_else(|| DEFAULT_TCP.parse().unwrap());
-        jsonrpc::connect_tcp(socket_addr).await
+        let client = jsonrpc::connect_tcp(socket_addr)
+            .await
+            .map_err(|e| RpcError::Custom(format!("Failed to connect to socket: {e}")))?;
+
+        handle_command(cli, client).await
     } else {
-        let socket_path = cli
-            .json_rpc_socket
-            .clone()
-            .unwrap_or(None)
-            .or_else(|| {
-                std::env::var_os("XDG_RUNTIME_DIR").map(|runtime_dir| {
-                    PathBuf::from(runtime_dir)
-                        .join(DEFAULT_SOCKET_SUFFIX)
-                        .into()
+        #[cfg(windows)]
+        {
+            Err(RpcError::Custom("Invalid socket".into()))
+        }
+        #[cfg(unix)]
+        {
+            let socket_path = cli
+                .json_rpc_socket
+                .clone()
+                .unwrap_or(None)
+                .or_else(|| {
+                    std::env::var_os("XDG_RUNTIME_DIR").map(|runtime_dir| {
+                        PathBuf::from(runtime_dir)
+                            .join(DEFAULT_SOCKET_SUFFIX)
+                            .into()
+                    })
                 })
-            })
-            .unwrap_or_else(|| ("/run".to_owned() + DEFAULT_SOCKET_SUFFIX).into());
-        jsonrpc::connect_unix(socket_path).await
+                .unwrap_or_else(|| ("/run".to_owned() + DEFAULT_SOCKET_SUFFIX).into());
+            let client = jsonrpc::connect_unix(socket_path)
+                .await
+                .map_err(|e| RpcError::Custom(format!("Failed to connect to socket: {e}")))?;
+
+            handle_command(cli, client).await
+        }
     }
 }
 
 async fn stream_next(
     timeout: f64,
-    stream: &mut TypedSubscriptionStream<Value>,
-) -> Option<Result<Value, RpcError>> {
+    stream: &mut Subscription<Value>,
+) -> Option<Result<Value, Error>> {
     if timeout < 0.0 {
         stream.next().await
     } else {
diff --git a/client/src/tcp.rs b/client/src/tcp.rs
deleted file mode 100644
index 53650381..00000000
--- a/client/src/tcp.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use jsonrpc_client_transports::{transports::duplex, RpcChannel, RpcError};
-use jsonrpc_core::futures_util::{SinkExt, StreamExt, TryStreamExt};
-use jsonrpc_server_utils::{codecs::StreamCodec, tokio_util::codec::Decoder};
-use tokio::net::{TcpStream, ToSocketAddrs};
-
-/// Connect to a JSON-RPC TCP server.
-pub async fn connect<S: ToSocketAddrs, Client: From<RpcChannel>>(
-    socket: S,
-) -> Result<Client, RpcError> {
-    let connection = TcpStream::connect(socket)
-        .await
-        .map_err(|e| RpcError::Other(Box::new(e)))?;
-    let (sink, stream) = StreamCodec::stream_incoming().framed(connection).split();
-    let sink = sink.sink_map_err(|e| RpcError::Other(Box::new(e)));
-    let stream = stream.map_err(|e| log::error!("TCP stream error: {}", e));
-
-    let (client, sender) = duplex(
-        Box::pin(sink),
-        Box::pin(
-            stream
-                .take_while(|x| std::future::ready(x.is_ok()))
-                .map(|x| x.expect("Stream is closed upon first error.")),
-        ),
-    );
-
-    tokio::spawn(client);
-
-    Ok(sender.into())
-}
diff --git a/client/src/transports/ipc.rs b/client/src/transports/ipc.rs
new file mode 100644
index 00000000..b14063aa
--- /dev/null
+++ b/client/src/transports/ipc.rs
@@ -0,0 +1,23 @@
+use std::io::Error;
+use std::path::Path;
+
+use futures_util::stream::StreamExt;
+use jsonrpsee::core::client::{TransportReceiverT, TransportSenderT};
+use tokio::net::UnixStream;
+use tokio_util::codec::Decoder;
+
+use super::stream_codec::StreamCodec;
+use super::{Receiver, Sender};
+
+/// Connect to a JSON-RPC Unix Socket server.
+pub async fn connect(
+    socket: impl AsRef<Path>,
+) -> Result<(impl TransportSenderT + Send, impl TransportReceiverT + Send), Error> {
+    let connection = UnixStream::connect(socket).await?;
+    let (sink, stream) = StreamCodec::stream_incoming().framed(connection).split();
+
+    let sender = Sender { inner: sink };
+    let receiver = Receiver { inner: stream };
+
+    Ok((sender, receiver))
+}
diff --git a/client/src/transports/mod.rs b/client/src/transports/mod.rs
new file mode 100644
index 00000000..ed1963a0
--- /dev/null
+++ b/client/src/transports/mod.rs
@@ -0,0 +1,60 @@
+use futures_util::{stream::StreamExt, Sink, SinkExt, Stream};
+use jsonrpsee::core::client::{ReceivedMessage, TransportReceiverT, TransportSenderT};
+use thiserror::Error;
+
+#[cfg(unix)]
+pub mod ipc;
+mod stream_codec;
+pub mod tcp;
+
+#[derive(Debug, Error)]
+enum Errors {
+    #[error("Other: {0}")]
+    Other(String),
+    #[error("Closed")]
+    Closed,
+}
+
+struct Sender<T: Send + Sink<String>> {
+    inner: T,
+}
+
+impl<T: Send + Sink<String, Error = impl std::error::Error> + Unpin + 'static> TransportSenderT
+    for Sender<T>
+{
+    type Error = Errors;
+
+    async fn send(&mut self, body: String) -> Result<(), Self::Error> {
+        self.inner
+            .send(body)
+            .await
+            .map_err(|e| Errors::Other(format!("{e:?}")))?;
+        Ok(())
+    }
+
+    async fn close(&mut self) -> Result<(), Self::Error> {
+        self.inner
+            .close()
+            .await
+            .map_err(|e| Errors::Other(format!("{e:?}")))?;
+        Ok(())
+    }
+}
+
+struct Receiver<T: Send + Stream> {
+    inner: T,
+}
+
+impl<T: Send + Stream<Item = Result<String, std::io::Error>> + Unpin + 'static> TransportReceiverT
+    for Receiver<T>
+{
+    type Error = Errors;
+
+    async fn receive(&mut self) -> Result<ReceivedMessage, Self::Error> {
+        match self.inner.next().await {
+            None => Err(Errors::Closed),
+            Some(Ok(msg)) => Ok(ReceivedMessage::Text(msg)),
+            Some(Err(e)) => Err(Errors::Other(format!("{e:?}"))),
+        }
+    }
+}
diff --git a/client/src/transports/stream_codec.rs b/client/src/transports/stream_codec.rs
new file mode 100644
index 00000000..e46233cb
--- /dev/null
+++ b/client/src/transports/stream_codec.rs
@@ -0,0 +1,61 @@
+use bytes::BytesMut;
+use std::{io, str};
+use tokio_util::codec::{Decoder, Encoder};
+
+type Separator = u8;
+
+/// Stream codec for streaming protocols (ipc, tcp)
+#[derive(Debug, Default)]
+pub struct StreamCodec {
+    incoming_separator: Separator,
+    outgoing_separator: Separator,
+}
+
+impl StreamCodec {
+    /// Default codec with streaming input data. Input can be both enveloped and not.
+    pub fn stream_incoming() -> Self {
+        StreamCodec::new(b'\n', b'\n')
+    }
+
+    /// New custom stream codec
+    pub fn new(incoming_separator: Separator, outgoing_separator: Separator) -> Self {
+        StreamCodec {
+            incoming_separator,
+            outgoing_separator,
+        }
+    }
+}
+
+impl Decoder for StreamCodec {
+    type Item = String;
+    type Error = io::Error;
+
+    fn decode(&mut self, buf: &mut BytesMut) -> io::Result<Option<Self::Item>> {
+        if let Some(i) = buf
+            .as_ref()
+            .iter()
+            .position(|&b| b == self.incoming_separator)
+        {
+            let line = buf.split_to(i);
+            let _ = buf.split_to(1);
+
+            match str::from_utf8(line.as_ref()) {
+                Ok(s) => Ok(Some(s.to_string())),
+                Err(_) => Err(io::Error::other("invalid UTF-8")),
+            }
+        } else {
+            Ok(None)
+        }
+    }
+}
+
+impl Encoder<String> for StreamCodec {
+    type Error = io::Error;
+
+    fn encode(&mut self, msg: String, buf: &mut BytesMut) -> io::Result<()> {
+        let mut payload = msg.into_bytes();
+        payload.push(self.outgoing_separator);
+        buf.extend_from_slice(&payload);
+        Ok(())
+    }
+}
diff --git a/client/src/transports/tcp.rs b/client/src/transports/tcp.rs
new file mode 100644
index 00000000..ae80759f
--- /dev/null
+++ b/client/src/transports/tcp.rs
@@ -0,0 +1,22 @@
+use std::io::Error;
+
+use futures_util::stream::StreamExt;
+use jsonrpsee::core::client::{TransportReceiverT, TransportSenderT};
+use tokio::net::{TcpStream, ToSocketAddrs};
+use tokio_util::codec::Decoder;
+
+use super::stream_codec::StreamCodec;
+use super::{Receiver, Sender};
+
+/// Connect to a JSON-RPC TCP server.
+pub async fn connect(
+    socket: impl ToSocketAddrs,
+) -> Result<(impl TransportSenderT + Send, impl TransportReceiverT + Send), Error> {
+    let connection = TcpStream::connect(socket).await?;
+    let (sink, stream) = StreamCodec::stream_incoming().framed(connection).split();
+
+    let sender = Sender { inner: sink };
+    let receiver = Receiver { inner: stream };
+
+    Ok((sender, receiver))
+}
diff --git a/data/org.asamk.SignalCli.metainfo.xml b/data/org.asamk.SignalCli.metainfo.xml
new file mode 100644
index 00000000..c6c07411
--- /dev/null
+++ b/data/org.asamk.SignalCli.metainfo.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="console-application">
+    <id>org.asamk.SignalCli</id>
+
+    <name>signal-cli</name>
+    <summary>Use Signal messenger in terminal</summary>
+    <developer id="org.asamk">
+        <name>AsamK</name>
+    </developer>
+    <icon type="stock">org.asamk.SignalCli</icon>
+    <keywords>
+        <keyword>signal</keyword>
+        <keyword>signal-cli</keyword>
+        <keyword>messenger</keyword>
+        <keyword>messaging</keyword>
+    </keywords>
+
+    <url type="bugtracker">https://github.com/AsamK/signal-cli/issues</url>
+    <url type="homepage">https://github.com/AsamK/signal-cli</url>
+    <url type="donation">https://github.com/sponsors/AsamK</url>
+    <url type="faq">https://github.com/AsamK/signal-cli/discussions</url>
+    <url type="vcs-browser">https://github.com/AsamK/signal-cli</url>
+
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>GPL-3.0-only</project_license>
+
+    <description>
+        <p>
+            signal-cli is an unofficial commandline interface for the Signal Messenger.
+            It supports many Signal functions, including registering, verifying, sending and receiving messages.
+            For registering you need a phone number where you can receive SMS or incoming calls.
+            Alternatively signal-cli can be linked to an existing App account.
+        </p>
+    </description>
+
+    <categories>
+        <category>Utility</category>
+        <category>Java</category>
+    </categories>
+
+    <provides>
+        <binary>signal-cli</binary>
+    </provides>
+    <content_rating type="oars-1.1">
+        <content_attribute id="social-chat">intense</content_attribute>
+    </content_rating>
+    <releases>
+        <release version="0.13.18" date="2025-07-16">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.18</url>
+        </release>
+        <release version="0.13.17" date="2025-06-28">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.17</url>
+        </release>
+        <release version="0.13.16" date="2025-06-07">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.16</url>
+        </release>
+        <release version="0.13.15" date="2025-05-08">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.15</url>
+        </release>
+        <release version="0.13.14" date="2025-04-06">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.14</url>
+        </release>
+        <release version="0.13.13" date="2025-02-28">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.13</url>
+        </release>
+        <release version="0.13.12" date="2025-01-18">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.12</url>
+        </release>
+        <release version="0.13.11" date="2024-12-26">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.11</url>
+        </release>
+        <release version="0.13.10" date="2024-11-30">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.10</url>
+        </release>
+        <release version="0.13.9" date="2024-10-28">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.9</url>
+        </release>
+        <release version="0.13.8" date="2024-10-26">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.8</url>
+        </release>
+        <release version="0.13.7" date="2024-09-28">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.7</url>
+        </release>
+        <release version="0.13.6" date="2024-09-08">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.6</url>
+        </release>
+        <release version="0.13.5" date="2024-07-25">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.5</url>
+        </release>
+        <release version="0.13.4" date="2024-06-06">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.4</url>
+        </release>
+        <release version="0.13.3" date="2024-04-19">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.3</url>
+        </release>
+        <release version="0.13.2" date="2024-03-23">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.2</url>
+        </release>
+        <release version="0.13.1" date="2024-02-27">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.1</url>
+        </release>
+        <release version="0.13.0" date="2024-02-18">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.0</url>
+        </release>
+        <release version="0.12.8" date="2024-02-08">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.12.8</url>
+        </release>
+        <release version="0.12.7" date="2023-12-15">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.12.7</url>
+        </release>
+    </releases>
+</component>
diff --git a/data/org.asamk.SignalCli.svg b/data/org.asamk.SignalCli.svg
new file mode 100644
index 00000000..69ca862b
--- /dev/null
+++ b/data/org.asamk.SignalCli.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg">
+<g transform="translate(-32.279 -138.64)">
+<g transform="matrix(.45526 0 0 .45526 33.984 140.17)">
+<path d="m33.468 66.938c-18.454 0-33.468-15.014-33.468-33.469s15.014-33.469 33.468-33.469c18.455 0 33.469 15.014 33.469 33.469 0 5.621-1.421 11.161-4.116 16.076l4.608 17.2-16.849-4.516c-5.172 3.084-11.069 4.709-17.112 4.709z" fill="#fff"/>
+<path d="m33.468 67.184c-18.454 0-33.468-15.014-33.468-33.469s15.014-33.469 33.468-33.469c18.455 0 33.469 15.014 33.469 33.469 0 5.621-1.421 11.161-4.116 16.076l4.608 17.2-16.849-4.516c-5.172 3.084-11.069 4.709-17.112 4.709zm0-62.938c-16.249 0-29.468 13.22-29.468 29.469s13.219 29.469 29.468 29.469c5.582 0 11.021-1.574 15.729-4.554l0.74-0.468 11.835 3.171-3.243-12.1 0.419-0.72c2.609-4.484 3.988-9.602 3.988-14.799 0-16.248-13.219-29.468-29.468-29.468z"/>
+<path d="m25.515 45.296q-2.3937 0-4.2817-0.97772-1.8543-0.97772-2.9332-3.0343-1.0451-2.0566-1.0451-5.2595 0-3.3377 1.1126-5.428 1.1126-2.0903 3.0006-3.068 1.9217-0.97772 4.3492-0.97772 1.3823 0 2.6634 0.30343 1.2812 0.26972 2.0903 0.67429l-0.91029 2.4612q-0.80915-0.30343-1.888-0.57315t-2.0229-0.26972q-5.3269 0-5.3269 6.844 0 3.2703 1.2812 5.0235 1.3149 1.7194 3.8772 1.7194 1.4834 0 2.596-0.30343 1.1463-0.30343 2.0903-0.74172v2.6297q-0.91029 0.472-2.0229 0.708-1.0789 0.26972-2.6297 0.26972zm11.901-0.33714h-2.9669v-25.623h2.9669zm7.2486-24.848q0.67429 0 1.18 0.472 0.53943 0.43829 0.53943 1.416 0 0.94401-0.53943 1.416-0.50572 0.472-1.18 0.472-0.74172 0-1.2474-0.472-0.50572-0.472-0.50572-1.416 0-0.97772 0.50572-1.416 0.50572-0.472 1.2474-0.472zm1.4497 6.7766v18.071h-2.9669v-18.071z" aria-label="cli"/>
+</g>
+</g>
+</svg>
diff --git a/data/signal-cli-socket.service b/data/signal-cli-socket.service
index 670f9c99..11d56ce3 100644
--- a/data/signal-cli-socket.service
+++ b/data/signal-cli-socket.service
@@ -32,8 +32,6 @@ RestrictAddressFamilies=AF_INET AF_INET6
 RestrictNamespaces=true
 RestrictRealtime=true
 RestrictSUIDSGID=true
-# JVM always exits with 143 in reaction to SIGTERM signal
-SuccessExitStatus=143
 StandardInput=socket
 StandardOutput=journal
 StandardError=journal
diff --git a/data/signal-cli.service b/data/signal-cli.service
index d334107a..a0bba768 100644
--- a/data/signal-cli.service
+++ b/data/signal-cli.service
@@ -8,11 +8,9 @@ After=network-online.target
 [Service]
 Type=dbus
 Environment="SIGNAL_CLI_OPTS=-Xms2m"
-ExecStart=%dir%/bin/signal-cli --config /var/lib/signal-cli daemon --system
+ExecStart=%dir%/bin/signal-cli --config /var/lib/signal-cli daemon --dbus-system
 User=signal-cli
 BusName=org.asamk.Signal
-# JVM always exits with 143 in reaction to SIGTERM signal
-SuccessExitStatus=143
 
 [Install]
 Alias=dbus-org.asamk.Signal.service
diff --git a/data/signal-cli@.service b/data/signal-cli@.service
index 4368a5e2..c5698ca7 100644
--- a/data/signal-cli@.service
+++ b/data/signal-cli@.service
@@ -8,11 +8,9 @@ After=network-online.target
 [Service]
 Type=dbus
 Environment="SIGNAL_CLI_OPTS=-Xms2m"
-ExecStart=%dir%/bin/signal-cli -a %I --config /var/lib/signal-cli daemon --system
+ExecStart=%dir%/bin/signal-cli -a %I --config /var/lib/signal-cli daemon --dbus-system
 User=signal-cli
 BusName=org.asamk.Signal
-# JVM always exits with 143 in reaction to SIGTERM signal
-SuccessExitStatus=143
 
 [Install]
 Alias=dbus-org.asamk.Signal.service
diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index 5c774bed..523a6c03 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -1,12 +1,16 @@
 [
+{
+  "name":"[B"
+},
+{
+  "name":"[Z"
+},
+{
+  "name":"[[B"
+},
 {
   "name":"com.sun.security.auth.module.UnixSystem",
-  "fields":[
-    {"name":"gid"}, 
-    {"name":"groups"}, 
-    {"name":"uid"}, 
-    {"name":"username"}
-  ]
+  "fields":[{"name":"gid"}, {"name":"groups"}, {"name":"uid"}, {"name":"username"}]
 },
 {
   "name":"java.lang.Boolean",
@@ -14,14 +18,18 @@
 },
 {
   "name":"java.lang.Class",
-  "methods":[{"name":"getCanonicalName","parameterTypes":[] }]
+  "methods":[{"name":"getCanonicalName","parameterTypes":[] }, {"name":"getClassLoader","parameterTypes":[] }]
 },
 {
   "name":"java.lang.ClassLoader",
-  "methods":[
-    {"name":"getPlatformClassLoader","parameterTypes":[] }, 
-    {"name":"loadClass","parameterTypes":["java.lang.String"] }
-  ]
+  "methods":[{"name":"getPlatformClassLoader","parameterTypes":[] }, {"name":"loadClass","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"java.lang.ClassNotFoundException"
+},
+{
+  "name":"java.lang.Enum",
+  "methods":[{"name":"ordinal","parameterTypes":[] }]
 },
 {
   "name":"java.lang.IllegalArgumentException",
@@ -31,60 +39,104 @@
   "name":"java.lang.IllegalStateException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 },
+{
+  "name":"java.lang.Long",
+  "methods":[{"name":"<init>","parameterTypes":["long"] }]
+},
+{
+  "name":"java.lang.NoClassDefFoundError"
+},
 {
   "name":"java.lang.NoSuchMethodError"
 },
+{
+  "name":"java.lang.String"
+},
+{
+  "name":"java.lang.Thread",
+  "methods":[{"name":"currentThread","parameterTypes":[] }, {"name":"getStackTrace","parameterTypes":[] }]
+},
 {
   "name":"java.lang.Throwable",
-  "methods":[{"name":"getMessage","parameterTypes":[] }]
+  "methods":[{"name":"getMessage","parameterTypes":[] }, {"name":"setStackTrace","parameterTypes":["java.lang.StackTraceElement[]"] }, {"name":"toString","parameterTypes":[] }]
 },
 {
   "name":"java.lang.UnsatisfiedLinkError",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 },
+{
+  "name":"java.util.HashMap",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"java.util.Map",
+  "methods":[{"name":"get","parameterTypes":["java.lang.Object"] }, {"name":"put","parameterTypes":["java.lang.Object","java.lang.Object"] }, {"name":"remove","parameterTypes":["java.lang.Object"] }]
+},
 {
   "name":"java.util.UUID",
-  "methods":[
-    {"name":"<init>","parameterTypes":["long","long"] }, 
-    {"name":"getLeastSignificantBits","parameterTypes":[] }, 
-    {"name":"getMostSignificantBits","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["long","long"] }, {"name":"getLeastSignificantBits","parameterTypes":[] }, {"name":"getMostSignificantBits","parameterTypes":[] }]
+},
+{
+  "name":"jdk.internal.loader.ClassLoaders$AppClassLoader"
 },
 {
   "name":"jdk.internal.loader.ClassLoaders$PlatformClassLoader"
 },
 {
   "name":"org.asamk.signal.manager.storage.protocol.SignalProtocolStore",
-  "methods":[
-    {"name":"getIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress"] }, 
-    {"name":"getIdentityKeyPair","parameterTypes":[] }, 
-    {"name":"getLocalRegistrationId","parameterTypes":[] }, 
-    {"name":"isTrustedIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.IdentityKey","org.signal.libsignal.protocol.state.IdentityKeyStore$Direction"] }, 
-    {"name":"loadPreKey","parameterTypes":["int"] }, 
-    {"name":"loadSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID"] }, 
-    {"name":"loadSession","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress"] }, 
-    {"name":"loadSignedPreKey","parameterTypes":["int"] }, 
-    {"name":"removePreKey","parameterTypes":["int"] }, 
-    {"name":"saveIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.IdentityKey"] }, 
-    {"name":"storeSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID","org.signal.libsignal.protocol.groups.state.SenderKeyRecord"] }, 
-    {"name":"storeSession","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.state.SessionRecord"] }
-  ]
+  "methods":[{"name":"getIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress"] }, {"name":"getIdentityKeyPair","parameterTypes":[] }, {"name":"getLocalRegistrationId","parameterTypes":[] }, {"name":"isTrustedIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.IdentityKey","org.signal.libsignal.protocol.state.IdentityKeyStore$Direction"] }, {"name":"loadKyberPreKey","parameterTypes":["int"] }, {"name":"loadPreKey","parameterTypes":["int"] }, {"name":"loadSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID"] }, {"name":"loadSession","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress"] }, {"name":"loadSignedPreKey","parameterTypes":["int"] }, {"name":"markKyberPreKeyUsed","parameterTypes":["int"] }, {"name":"removePreKey","parameterTypes":["int"] }, {"name":"saveIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.IdentityKey"] }, {"name":"storeSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID","org.signal.libsignal.protocol.groups.state.SenderKeyRecord"] }, {"name":"storeSession","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.state.SessionRecord"] }]
+},
+{
+  "name":"org.asamk.signal.manager.storage.senderKeys.SenderKeyStore",
+  "methods":[{"name":"loadSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID"] }, {"name":"storeSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID","org.signal.libsignal.protocol.groups.state.SenderKeyRecord"] }]
 },
 {
   "name":"org.graalvm.jniutils.JNIExceptionWrapperEntryPoints",
   "methods":[{"name":"getClassName","parameterTypes":["java.lang.Class"] }]
 },
+{
+  "name":"org.signal.libsignal.internal.CompletableFuture",
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"complete","parameterTypes":["java.lang.Object"] }, {"name":"completeExceptionally","parameterTypes":["java.lang.Throwable"] }, {"name":"setCancellationId","parameterTypes":["long"] }]
+},
+{
+  "name":"org.signal.libsignal.internal.NativeHandleGuard$SimpleOwner",
+  "methods":[{"name":"unsafeNativeHandleWithoutGuard","parameterTypes":[] }]
+},
+{
+  "name":"org.signal.libsignal.net.CdsiLookupResponse",
+  "methods":[{"name":"<init>","parameterTypes":["java.util.Map","int"] }]
+},
+{
+  "name":"org.signal.libsignal.net.CdsiLookupResponse$Entry",
+  "methods":[{"name":"<init>","parameterTypes":["byte[]","byte[]"] }]
+},
+{
+  "name":"org.signal.libsignal.net.ChatService"
+},
+{
+  "name":"org.signal.libsignal.net.ChatService$DebugInfo"
+},
+{
+  "name":"org.signal.libsignal.net.ChatService$Response"
+},
+{
+  "name":"org.signal.libsignal.net.ChatService$ResponseAndDebugInfo"
+},
+{
+  "name":"org.signal.libsignal.net.NetworkException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"org.signal.libsignal.net.RetryLaterException",
+  "methods":[{"name":"<init>","parameterTypes":["long"] }]
+},
 {
   "name":"org.signal.libsignal.protocol.DuplicateMessageException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"org.signal.libsignal.protocol.IdentityKey",
-  "methods":[
-    {"name":"<init>","parameterTypes":["long"] }, 
-    {"name":"<init>","parameterTypes":["byte[]"] }, 
-    {"name":"serialize","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["long"] }, {"name":"<init>","parameterTypes":["byte[]"] }, {"name":"serialize","parameterTypes":[] }]
 },
 {
   "name":"org.signal.libsignal.protocol.IdentityKeyPair",
@@ -107,15 +159,16 @@
 },
 {
   "name":"org.signal.libsignal.protocol.SignalProtocolAddress",
-  "methods":[
-    {"name":"<init>","parameterTypes":["long"] }, 
-    {"name":"<init>","parameterTypes":["java.lang.String","int"] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["long"] }, {"name":"<init>","parameterTypes":["java.lang.String","int"] }]
 },
 {
   "name":"org.signal.libsignal.protocol.UntrustedIdentityException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 },
+{
+  "name":"org.signal.libsignal.protocol.fingerprint.FingerprintParsingException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
 {
   "name":"org.signal.libsignal.protocol.groups.state.SenderKeyRecord",
   "fields":[{"name":"unsafeHandle"}],
@@ -152,10 +205,17 @@
 },
 {
   "name":"org.signal.libsignal.protocol.state.IdentityKeyStore$Direction",
-  "fields":[
-    {"name":"RECEIVING"}, 
-    {"name":"SENDING"}
-  ]
+  "fields":[{"name":"RECEIVING"}, {"name":"SENDING"}]
+},
+{
+  "name":"org.signal.libsignal.protocol.state.IdentityKeyStore$IdentityChange"
+},
+{
+  "name":"org.signal.libsignal.protocol.state.KyberPreKeyRecord",
+  "fields":[{"name":"unsafeHandle"}]
+},
+{
+  "name":"org.signal.libsignal.protocol.state.KyberPreKeyStore"
 },
 {
   "name":"org.signal.libsignal.protocol.state.PreKeyRecord",
@@ -167,10 +227,7 @@
 {
   "name":"org.signal.libsignal.protocol.state.SessionRecord",
   "fields":[{"name":"unsafeHandle"}],
-  "methods":[
-    {"name":"<init>","parameterTypes":["long"] }, 
-    {"name":"<init>","parameterTypes":["byte[]"] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["long"] }, {"name":"<init>","parameterTypes":["byte[]"] }]
 },
 {
   "name":"org.signal.libsignal.protocol.state.SessionStore"
@@ -182,38 +239,74 @@
 {
   "name":"org.signal.libsignal.protocol.state.SignedPreKeyStore"
 },
+{
+  "name":"org.signal.libsignal.usernames.BadDiscriminatorCharacterException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"org.signal.libsignal.usernames.BadNicknameCharacterException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"org.signal.libsignal.usernames.CannotBeEmptyException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"org.signal.libsignal.usernames.DiscriminatorCannotBeZeroException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"org.signal.libsignal.usernames.MissingSeparatorException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"org.signal.libsignal.usernames.NicknameTooLongException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"org.signal.libsignal.usernames.NicknameTooShortException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
 {
   "name":"org.signal.libsignal.zkgroup.InvalidInputException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 },
 {
-  "name":"org.sqlite.Collation"
+  "name":"org.sqlite.BusyHandler",
+  "methods":[{"name":"callback","parameterTypes":["int"] }]
 },
 {
-  "name":"org.sqlite.Function"
+  "name":"org.sqlite.Collation",
+  "methods":[{"name":"xCompare","parameterTypes":["java.lang.String","java.lang.String"] }]
 },
 {
-  "name":"org.sqlite.Function$Aggregate"
+  "name":"org.sqlite.Function",
+  "fields":[{"name":"args"}, {"name":"context"}, {"name":"value"}],
+  "methods":[{"name":"xFunc","parameterTypes":[] }]
 },
 {
-  "name":"org.sqlite.Function$Window"
+  "name":"org.sqlite.Function$Aggregate",
+  "methods":[{"name":"clone","parameterTypes":[] }, {"name":"xFinal","parameterTypes":[] }, {"name":"xStep","parameterTypes":[] }]
 },
 {
-  "name":"org.sqlite.ProgressHandler"
+  "name":"org.sqlite.Function$Window",
+  "methods":[{"name":"xInverse","parameterTypes":[] }, {"name":"xValue","parameterTypes":[] }]
+},
+{
+  "name":"org.sqlite.ProgressHandler",
+  "methods":[{"name":"progress","parameterTypes":[] }]
 },
 {
   "name":"org.sqlite.core.DB",
-  "methods":[{"name":"throwex","parameterTypes":["int"] }]
+  "methods":[{"name":"onCommit","parameterTypes":["boolean"] }, {"name":"onUpdate","parameterTypes":["int","java.lang.String","java.lang.String","long"] }, {"name":"throwex","parameterTypes":[] }, {"name":"throwex","parameterTypes":["int"] }]
 },
 {
-  "name":"org.sqlite.core.DB$ProgressObserver"
+  "name":"org.sqlite.core.DB$ProgressObserver",
+  "methods":[{"name":"progress","parameterTypes":["int","int"] }]
 },
 {
   "name":"org.sqlite.core.NativeDB",
-  "fields":[
-    {"name":"colldatalist"}, 
-    {"name":"pointer"}, 
-    {"name":"udfdatalist"}
-  ]
+  "fields":[{"name":"busyHandler"}, {"name":"commitListener"}, {"name":"pointer"}, {"name":"progressHandler"}, {"name":"updateListener"}],
+  "methods":[{"name":"stringToUtf8ByteArray","parameterTypes":["java.lang.String"] }, {"name":"throwex","parameterTypes":["java.lang.String"] }]
 }
 ]
diff --git a/graalvm-config-dir/proxy-config.json b/graalvm-config-dir/proxy-config.json
index 3110286d..1a97b30a 100644
--- a/graalvm-config-dir/proxy-config.json
+++ b/graalvm-config-dir/proxy-config.json
@@ -1,23 +1,26 @@
 [
   {
-    "interfaces":["java.sql.Connection"]}
-  ,
+    "interfaces":["java.sql.Connection"]
+  },
   {
-    "interfaces":["org.asamk.Signal"]}
-  ,
+    "interfaces":["org.asamk.Signal"]
+  },
   {
-    "interfaces":["org.asamk.Signal$Configuration"]}
-  ,
+    "interfaces":["org.asamk.Signal$Configuration"]
+  },
   {
-    "interfaces":["org.asamk.Signal$Device"]}
-  ,
+    "interfaces":["org.asamk.Signal$Device"]
+  },
   {
-    "interfaces":["org.asamk.Signal$Group"]}
-  ,
+    "interfaces":["org.asamk.Signal$Group"]
+  },
   {
-    "interfaces":["org.asamk.SignalControl"]}
-  ,
+    "interfaces":["org.asamk.Signal$Identity"]
+  },
   {
-    "interfaces":["org.freedesktop.dbus.interfaces.DBus"]}
-  
+    "interfaces":["org.asamk.SignalControl"]
+  },
+  {
+    "interfaces":["org.freedesktop.dbus.interfaces.DBus"]
+  }
 ]
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 62612d44..0bfd1cdf 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -15,15 +15,72 @@
 {
   "name":"[J"
 },
+{
+  "name":"[Lcom.fasterxml.jackson.databind.deser.Deserializers;"
+},
+{
+  "name":"[Lcom.fasterxml.jackson.databind.deser.KeyDeserializers;"
+},
+{
+  "name":"[Lcom.fasterxml.jackson.databind.deser.ValueInstantiators;"
+},
+{
+  "name":"[Lcom.fasterxml.jackson.databind.ser.Serializers;"
+},
 {
   "name":"[Lcom.zaxxer.hikari.util.ConcurrentBag$IConcurrentBagEntry;"
 },
+{
+  "name":"[Ljava.lang.Object;"
+},
 {
   "name":"[Ljava.lang.String;"
 },
 {
   "name":"[Ljava.sql.Statement;"
 },
+{
+  "name":"[Lorg.asamk.signal.commands.ListStickerPacksCommand$JsonStickerPack$JsonSticker;"
+},
+{
+  "name":"[Lorg.asamk.signal.json.JsonAttachment;"
+},
+{
+  "name":"[Lorg.asamk.signal.json.JsonCallMessage$IceUpdate;"
+},
+{
+  "name":"[Lorg.asamk.signal.json.JsonContactAddress;"
+},
+{
+  "name":"[Lorg.asamk.signal.json.JsonContactEmail;"
+},
+{
+  "name":"[Lorg.asamk.signal.json.JsonContactPhone;"
+},
+{
+  "name":"[Lorg.asamk.signal.json.JsonMention;"
+},
+{
+  "name":"[Lorg.asamk.signal.json.JsonPreview;"
+},
+{
+  "name":"[Lorg.asamk.signal.json.JsonQuotedAttachment;"
+},
+{
+  "name":"[Lorg.asamk.signal.json.JsonSharedContact;"
+},
+{
+  "name":"[Lorg.asamk.signal.json.JsonSyncReadMessage;"
+},
+{
+  "name":"[Lorg.asamk.signal.json.JsonTextStyle;"
+},
+{
+  "name":"[Lorg.asamk.signal.manager.storage.accounts.AccountsStorage$Account;"
+},
+{
+  "name":"[Lorg.asamk.signal.manager.storage.stickerPacks.JsonStickerPack$JsonSticker;"
+},
 {
   "name":"[Lorg.whispersystems.signalservice.api.groupsv2.TemporalCredential;"
 },
@@ -33,6 +90,9 @@
 {
   "name":"[Lorg.whispersystems.signalservice.internal.push.GroupStaleDevices;"
 },
+{
+  "name":"android.os.Build$VERSION"
+},
 {
   "name":"byte[]",
   "allDeclaredMethods":true,
@@ -65,6 +125,18 @@
 {
   "name":"char[]"
 },
+{
+  "name":"com.fasterxml.jackson.annotation.JsonIgnore"
+},
+{
+  "name":"com.fasterxml.jackson.annotation.JsonProperty"
+},
+{
+  "name":"com.fasterxml.jackson.databind.annotation.JsonDeserialize"
+},
+{
+  "name":"com.fasterxml.jackson.databind.annotation.JsonSerialize"
+},
 {
   "name":"com.fasterxml.jackson.databind.ext.Java7HandlersImpl",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -74,31 +146,17 @@
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
-  "name":"com.google.protobuf.AbstractProtobufList",
+  "name":"com.squareup.wire.Message",
+  "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
+},
+{
+  "name":"com.squareup.wire.ProtoAdapter"
+},
+{
+  "name":"com.squareup.wire.internal.ImmutableList",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true
-},
-{
-  "name":"com.google.protobuf.GeneratedMessageLite",
-  "fields":[{"name":"unknownFields"}]
-},
-{
-  "name":"com.google.protobuf.Internal$LongList",
-  "allDeclaredMethods":true
-},
-{
-  "name":"com.google.protobuf.Internal$ProtobufList",
-  "allDeclaredMethods":true
-},
-{
-  "name":"com.google.protobuf.LongArrayList",
-  "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
-},
-{
-  "name":"com.google.protobuf.PrimitiveNonBoxingCollection",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
 },
 {
   "name":"com.sun.crypto.provider.AESCipher$General",
@@ -152,43 +210,15 @@
   "name":"com.zaxxer.hikari.HikariConfig",
   "allDeclaredFields":true,
   "queryAllPublicMethods":true,
-  "methods":[
-    {"name":"getCatalog","parameterTypes":[] }, 
-    {"name":"getConnectionInitSql","parameterTypes":[] }, 
-    {"name":"getConnectionTestQuery","parameterTypes":[] }, 
-    {"name":"getConnectionTimeout","parameterTypes":[] }, 
-    {"name":"getDataSource","parameterTypes":[] }, 
-    {"name":"getDataSourceClassName","parameterTypes":[] }, 
-    {"name":"getDataSourceJNDI","parameterTypes":[] }, 
-    {"name":"getDataSourceProperties","parameterTypes":[] }, 
-    {"name":"getDriverClassName","parameterTypes":[] }, 
-    {"name":"getExceptionOverrideClassName","parameterTypes":[] }, 
-    {"name":"getHealthCheckProperties","parameterTypes":[] }, 
-    {"name":"getHealthCheckRegistry","parameterTypes":[] }, 
-    {"name":"getIdleTimeout","parameterTypes":[] }, 
-    {"name":"getInitializationFailTimeout","parameterTypes":[] }, 
-    {"name":"getJdbcUrl","parameterTypes":[] }, 
-    {"name":"getKeepaliveTime","parameterTypes":[] }, 
-    {"name":"getLeakDetectionThreshold","parameterTypes":[] }, 
-    {"name":"getMaxLifetime","parameterTypes":[] }, 
-    {"name":"getMaximumPoolSize","parameterTypes":[] }, 
-    {"name":"getMetricRegistry","parameterTypes":[] }, 
-    {"name":"getMetricsTrackerFactory","parameterTypes":[] }, 
-    {"name":"getMinimumIdle","parameterTypes":[] }, 
-    {"name":"getPassword","parameterTypes":[] }, 
-    {"name":"getPoolName","parameterTypes":[] }, 
-    {"name":"getScheduledExecutor","parameterTypes":[] }, 
-    {"name":"getSchema","parameterTypes":[] }, 
-    {"name":"getThreadFactory","parameterTypes":[] }, 
-    {"name":"getTransactionIsolation","parameterTypes":[] }, 
-    {"name":"getUsername","parameterTypes":[] }, 
-    {"name":"getValidationTimeout","parameterTypes":[] }, 
-    {"name":"isAllowPoolSuspension","parameterTypes":[] }, 
-    {"name":"isAutoCommit","parameterTypes":[] }, 
-    {"name":"isIsolateInternalQueries","parameterTypes":[] }, 
-    {"name":"isReadOnly","parameterTypes":[] }, 
-    {"name":"isRegisterMbeans","parameterTypes":[] }
-  ]
+  "methods":[{"name":"getAllowPoolSuspension","parameterTypes":[] }, {"name":"getAutoCommit","parameterTypes":[] }, {"name":"getCatalog","parameterTypes":[] }, {"name":"getConnectionInitSql","parameterTypes":[] }, {"name":"getConnectionTestQuery","parameterTypes":[] }, {"name":"getConnectionTimeout","parameterTypes":[] }, {"name":"getCredentials","parameterTypes":[] }, {"name":"getDataSource","parameterTypes":[] }, {"name":"getDataSourceClassName","parameterTypes":[] }, {"name":"getDataSourceJNDI","parameterTypes":[] }, {"name":"getDataSourceProperties","parameterTypes":[] }, {"name":"getDriverClassName","parameterTypes":[] }, {"name":"getExceptionOverride","parameterTypes":[] }, {"name":"getExceptionOverrideClassName","parameterTypes":[] }, {"name":"getHealthCheckProperties","parameterTypes":[] }, {"name":"getHealthCheckRegistry","parameterTypes":[] }, {"name":"getIdleTimeout","parameterTypes":[] }, {"name":"getInitializationFailTimeout","parameterTypes":[] }, {"name":"getIsolateInternalQueries","parameterTypes":[] }, {"name":"getJdbcUrl","parameterTypes":[] }, {"name":"getKeepaliveTime","parameterTypes":[] }, {"name":"getLeakDetectionThreshold","parameterTypes":[] }, {"name":"getMaxLifetime","parameterTypes":[] }, {"name":"getMaximumPoolSize","parameterTypes":[] }, {"name":"getMetricRegistry","parameterTypes":[] }, {"name":"getMetricsTrackerFactory","parameterTypes":[] }, {"name":"getMinimumIdle","parameterTypes":[] }, {"name":"getPassword","parameterTypes":[] }, {"name":"getPoolName","parameterTypes":[] }, {"name":"getReadOnly","parameterTypes":[] }, {"name":"getRegisterMbeans","parameterTypes":[] }, {"name":"getScheduledExecutor","parameterTypes":[] }, {"name":"getSchema","parameterTypes":[] }, {"name":"getThreadFactory","parameterTypes":[] }, {"name":"getTransactionIsolation","parameterTypes":[] }, {"name":"getUsername","parameterTypes":[] }, {"name":"getValidationTimeout","parameterTypes":[] }, {"name":"isAllowPoolSuspension","parameterTypes":[] }, {"name":"isAutoCommit","parameterTypes":[] }, {"name":"isIsolateInternalQueries","parameterTypes":[] }, {"name":"isReadOnly","parameterTypes":[] }, {"name":"isRegisterMbeans","parameterTypes":[] }, {"name":"setAllowPoolSuspension","parameterTypes":["boolean"] }, {"name":"setAutoCommit","parameterTypes":["boolean"] }, {"name":"setCatalog","parameterTypes":["java.lang.String"] }, {"name":"setClass","parameterTypes":["java.lang.Class"] }, {"name":"setConnectionInitSql","parameterTypes":["java.lang.String"] }, {"name":"setConnectionTestQuery","parameterTypes":["java.lang.String"] }, {"name":"setConnectionTimeout","parameterTypes":["long"] }, {"name":"setCredentials","parameterTypes":["com.zaxxer.hikari.util.Credentials"] }, {"name":"setDataSource","parameterTypes":["javax.sql.DataSource"] }, {"name":"setDataSourceClassName","parameterTypes":["java.lang.String"] }, {"name":"setDataSourceJNDI","parameterTypes":["java.lang.String"] }, {"name":"setDataSourceProperties","parameterTypes":["java.util.Properties"] }, {"name":"setDriverClassName","parameterTypes":["java.lang.String"] }, {"name":"setExceptionOverride","parameterTypes":["com.zaxxer.hikari.SQLExceptionOverride"] }, {"name":"setExceptionOverrideClassName","parameterTypes":["java.lang.String"] }, {"name":"setHealthCheckProperties","parameterTypes":["java.util.Properties"] }, {"name":"setHealthCheckRegistry","parameterTypes":["java.lang.Object"] }, {"name":"setIdleTimeout","parameterTypes":["long"] }, {"name":"setInitializationFailTimeout","parameterTypes":["long"] }, {"name":"setIsolateInternalQueries","parameterTypes":["boolean"] }, {"name":"setJdbcUrl","parameterTypes":["java.lang.String"] }, {"name":"setKeepaliveTime","parameterTypes":["long"] }, {"name":"setLeakDetectionThreshold","parameterTypes":["long"] }, {"name":"setMaxLifetime","parameterTypes":["long"] }, {"name":"setMaximumPoolSize","parameterTypes":["int"] }, {"name":"setMetricRegistry","parameterTypes":["java.lang.Object"] }, {"name":"setMetricsTrackerFactory","parameterTypes":["com.zaxxer.hikari.metrics.MetricsTrackerFactory"] }, {"name":"setMinimumIdle","parameterTypes":["int"] }, {"name":"setPassword","parameterTypes":["java.lang.String"] }, {"name":"setPoolName","parameterTypes":["java.lang.String"] }, {"name":"setReadOnly","parameterTypes":["boolean"] }, {"name":"setRegisterMbeans","parameterTypes":["boolean"] }, {"name":"setScheduledExecutor","parameterTypes":["java.util.concurrent.ScheduledExecutorService"] }, {"name":"setSchema","parameterTypes":["java.lang.String"] }, {"name":"setThreadFactory","parameterTypes":["java.util.concurrent.ThreadFactory"] }, {"name":"setTransactionIsolation","parameterTypes":["java.lang.String"] }, {"name":"setUsername","parameterTypes":["java.lang.String"] }, {"name":"setValidationTimeout","parameterTypes":["long"] }]
+},
+{
+  "name":"com.zaxxer.hikari.pool.PoolBase",
+  "fields":[{"name":"catalog"}]
+},
+{
+  "name":"com.zaxxer.hikari.pool.PoolEntry",
+  "fields":[{"name":"state"}]
 },
 {
   "name":"int",
@@ -202,24 +232,33 @@
 },
 {
   "name":"java.io.File",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }, {"name":"valueOf","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"java.io.FilePermission"
 },
+{
+  "name":"java.io.OutputStream"
+},
 {
   "name":"java.io.Serializable",
-  "allDeclaredMethods":true
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "allDeclaredClasses":true
 },
 {
   "name":"java.lang.Boolean",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"java.lang.Class",
-  "methods":[{"name":"getRecordComponents","parameterTypes":[] }]
+  "methods":[{"name":"getPermittedSubclasses","parameterTypes":[] }, {"name":"getRecordComponents","parameterTypes":[] }, {"name":"isRecord","parameterTypes":[] }, {"name":"isSealed","parameterTypes":[] }]
+},
+{
+  "name":"java.lang.ClassValue"
 },
 {
   "name":"java.lang.Comparable",
@@ -233,11 +272,18 @@
   "name":"java.lang.Enum",
   "allDeclaredMethods":true
 },
+{
+  "name":"java.lang.Float",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
 {
   "name":"java.lang.Integer",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"java.lang.Iterable",
@@ -247,16 +293,22 @@
   "name":"java.lang.Long",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"java.lang.Number",
   "allDeclaredFields":true,
   "allDeclaredMethods":true
 },
+{
+  "name":"java.lang.Object",
+  "methods":[{"name":"equals","parameterTypes":["java.lang.Object"] }, {"name":"hashCode","parameterTypes":[] }, {"name":"toString","parameterTypes":[] }]
+},
 {
   "name":"java.lang.Record",
   "allDeclaredFields":true,
+  "allDeclaredClasses":true,
   "queryAllDeclaredMethods":true
 },
 {
@@ -266,24 +318,48 @@
   "name":"java.lang.String",
   "allPublicMethods":true
 },
+{
+  "name":"java.lang.Thread",
+  "fields":[{"name":"threadLocalRandomProbe"}]
+},
 {
   "name":"java.lang.Throwable",
   "queryAllPublicMethods":true,
-  "methods":[
-    {"name":"addSuppressed","parameterTypes":["java.lang.Throwable"] }, 
-    {"name":"getSuppressed","parameterTypes":[] }
-  ]
+  "methods":[{"name":"addSuppressed","parameterTypes":["java.lang.Throwable"] }, {"name":"getSuppressed","parameterTypes":[] }]
+},
+{
+  "name":"java.lang.annotation.Retention",
+  "queryAllDeclaredMethods":true,
+  "methods":[{"name":"value","parameterTypes":[] }]
+},
+{
+  "name":"java.lang.annotation.Target",
+  "queryAllDeclaredMethods":true,
+  "methods":[{"name":"value","parameterTypes":[] }]
+},
+{
+  "name":"java.lang.constant.Constable",
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"java.lang.constant.ConstantDesc",
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"java.lang.reflect.Executable",
+  "methods":[{"name":"getParameters","parameterTypes":[] }]
 },
 {
   "name":"java.lang.reflect.Method",
   "methods":[{"name":"isDefault","parameterTypes":[] }]
 },
+{
+  "name":"java.lang.reflect.Parameter",
+  "methods":[{"name":"getName","parameterTypes":[] }]
+},
 {
   "name":"java.lang.reflect.RecordComponent",
-  "methods":[
-    {"name":"getName","parameterTypes":[] }, 
-    {"name":"getType","parameterTypes":[] }
-  ]
+  "methods":[{"name":"getAccessor","parameterTypes":[] }, {"name":"getName","parameterTypes":[] }, {"name":"getType","parameterTypes":[] }]
 },
 {
   "name":"java.net.NetPermission"
@@ -317,6 +393,9 @@
 {
   "name":"java.security.SecurityPermission"
 },
+{
+  "name":"java.security.cert.CertStoreParameters"
+},
 {
   "name":"java.security.cert.PKIXRevocationChecker"
 },
@@ -332,6 +411,10 @@
 {
   "name":"java.security.interfaces.RSAPublicKey"
 },
+{
+  "name":"java.sql.SQLException",
+  "fields":[{"name":"next"}]
+},
 {
   "name":"java.util.AbstractCollection",
   "allDeclaredFields":true,
@@ -342,6 +425,11 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true
 },
+{
+  "name":"java.util.AbstractMap",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true
+},
 {
   "name":"java.util.ArrayList",
   "allDeclaredMethods":true,
@@ -356,6 +444,45 @@
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true
 },
+{
+  "name":"java.util.ImmutableCollections$AbstractImmutableCollection",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"java.util.ImmutableCollections$AbstractImmutableList",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"java.util.ImmutableCollections$AbstractImmutableMap",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"java.util.ImmutableCollections$List12",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "name":"java.util.ImmutableCollections$ListN",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "name":"java.util.ImmutableCollections$Map1",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "name":"java.util.ImmutableCollections$MapN",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
 {
   "name":"java.util.LinkedHashMap",
   "allDeclaredMethods":true,
@@ -369,6 +496,10 @@
   "name":"java.util.Locale",
   "methods":[{"name":"getUnicodeLocaleType","parameterTypes":["java.lang.String"] }]
 },
+{
+  "name":"java.util.Map",
+  "queryAllDeclaredMethods":true
+},
 {
   "name":"java.util.Optional",
   "allDeclaredFields":true,
@@ -388,10 +519,150 @@
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true
 },
+{
+  "name":"java.util.concurrent.ForkJoinTask",
+  "fields":[{"name":"aux"}, {"name":"status"}]
+},
+{
+  "name":"java.util.concurrent.atomic.AtomicBoolean",
+  "fields":[{"name":"value"}]
+},
+{
+  "name":"java.util.concurrent.atomic.AtomicMarkableReference",
+  "fields":[{"name":"pair"}]
+},
+{
+  "name":"java.util.concurrent.atomic.AtomicReference",
+  "fields":[{"name":"value"}]
+},
+{
+  "name":"java.util.concurrent.atomic.Striped64",
+  "fields":[{"name":"base"}, {"name":"cellsBusy"}]
+},
+{
+  "name":"java.util.concurrent.atomic.Striped64$Cell",
+  "fields":[{"name":"value"}]
+},
 {
   "name":"javax.security.auth.x500.X500Principal",
   "methods":[{"name":"<init>","parameterTypes":["sun.security.x509.X500Name"] }]
 },
+{
+  "name":"javax.smartcardio.CardPermission"
+},
+{
+  "name":"jdk.internal.misc.Unsafe"
+},
+{
+  "name":"kotlin.Any"
+},
+{
+  "name":"kotlin.Boolean"
+},
+{
+  "name":"kotlin.BooleanArray"
+},
+{
+  "name":"kotlin.Byte"
+},
+{
+  "name":"kotlin.ByteArray"
+},
+{
+  "name":"kotlin.Char"
+},
+{
+  "name":"kotlin.CharArray"
+},
+{
+  "name":"kotlin.Double"
+},
+{
+  "name":"kotlin.DoubleArray"
+},
+{
+  "name":"kotlin.Float"
+},
+{
+  "name":"kotlin.FloatArray"
+},
+{
+  "name":"kotlin.Int"
+},
+{
+  "name":"kotlin.IntArray"
+},
+{
+  "name":"kotlin.Long"
+},
+{
+  "name":"kotlin.LongArray"
+},
+{
+  "name":"kotlin.Metadata",
+  "queryAllDeclaredMethods":true,
+  "methods":[{"name":"bv","parameterTypes":[] }, {"name":"d1","parameterTypes":[] }, {"name":"d2","parameterTypes":[] }, {"name":"k","parameterTypes":[] }, {"name":"mv","parameterTypes":[] }, {"name":"pn","parameterTypes":[] }, {"name":"xi","parameterTypes":[] }, {"name":"xs","parameterTypes":[] }]
+},
+{
+  "name":"kotlin.SafePublicationLazyImpl",
+  "fields":[{"name":"_value"}]
+},
+{
+  "name":"kotlin.Short"
+},
+{
+  "name":"kotlin.ShortArray"
+},
+{
+  "name":"kotlin.String"
+},
+{
+  "name":"kotlin.Unit"
+},
+{
+  "name":"kotlin.collections.AbstractCollection",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"kotlin.collections.AbstractList",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"kotlin.collections.List"
+},
+{
+  "name":"kotlin.collections.Map"
+},
+{
+  "name":"kotlin.collections.MutableList"
+},
+{
+  "name":"kotlin.collections.MutableMap"
+},
+{
+  "name":"kotlin.jvm.JvmStatic",
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"kotlin.jvm.internal.DefaultConstructorMarker"
+},
+{
+  "name":"kotlin.jvm.internal.markers.KMappedMarker",
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"kotlin.reflect.jvm.internal.ReflectionFactoryImpl",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"kotlin.reflect.jvm.internal.impl.resolve.scopes.DescriptorKindFilter",
+  "allPublicFields":true
+},
+{
+  "name":"libcore.io.Memory"
+},
 {
   "name":"long",
   "allDeclaredMethods":true,
@@ -400,10 +671,21 @@
 {
   "name":"long[]"
 },
+{
+  "name":"okhttp3.internal.connection.RealConnectionPool",
+  "fields":[{"name":"addressStates"}]
+},
+{
+  "name":"okio.BufferedSink"
+},
+{
+  "name":"okio.ByteString"
+},
 {
   "name":"org.asamk.Signal",
   "allDeclaredMethods":true,
-  "allDeclaredClasses":true
+  "allDeclaredClasses":true,
+  "methods":[{"name":"getContactName","parameterTypes":["java.lang.String"] }, {"name":"getDevice","parameterTypes":["long"] }, {"name":"getGroup","parameterTypes":["byte[]"] }, {"name":"getSelfNumber","parameterTypes":[] }, {"name":"getThisDevice","parameterTypes":[] }, {"name":"listDevices","parameterTypes":[] }, {"name":"listIdentities","parameterTypes":[] }, {"name":"sendGroupMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","byte[]"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.lang.String"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.util.List"] }, {"name":"sendMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","java.util.List"] }, {"name":"subscribeReceive","parameterTypes":[] }, {"name":"unsubscribeReceive","parameterTypes":[] }, {"name":"version","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.Signal$Configuration",
@@ -415,6 +697,11 @@
   "allDeclaredMethods":true,
   "allDeclaredClasses":true
 },
+{
+  "name":"org.asamk.Signal$EditMessageReceived",
+  "queryAllDeclaredConstructors":true,
+  "queryAllPublicConstructors":true
+},
 {
   "name":"org.asamk.Signal$Error$AttachmentInvalid",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
@@ -436,6 +723,11 @@
   "allDeclaredMethods":true,
   "allDeclaredClasses":true
 },
+{
+  "name":"org.asamk.Signal$Identity",
+  "allDeclaredClasses":true,
+  "queryAllDeclaredMethods":true
+},
 {
   "name":"org.asamk.Signal$MessageReceived",
   "allDeclaredConstructors":true,
@@ -470,6 +762,12 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":["org.freedesktop.dbus.DBusPath","byte[]","java.lang.String"] }]
 },
+{
+  "name":"org.asamk.Signal$StructIdentity",
+  "allDeclaredFields":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["org.freedesktop.dbus.DBusPath","java.lang.String","java.lang.String"] }]
+},
 {
   "name":"org.asamk.Signal$SyncMessageReceived",
   "allDeclaredConstructors":true,
@@ -484,7 +782,8 @@
 {
   "name":"org.asamk.SignalControl",
   "allDeclaredMethods":true,
-  "allDeclaredClasses":true
+  "allDeclaredClasses":true,
+  "methods":[{"name":"listAccounts","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.SignalControl$Error$Failure",
@@ -495,11 +794,7 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }, 
-    {"name":"deviceLinkUri","parameterTypes":[] }, 
-    {"name":"deviceName","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"deviceLinkUri","parameterTypes":[] }, {"name":"deviceName","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.FinishLinkCommand$JsonFinishLink",
@@ -512,7 +807,8 @@
   "name":"org.asamk.signal.commands.GetUserStatusCommand$JsonUserStatus",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"isRegistered","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"recipient","parameterTypes":[] }, {"name":"username","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.ListAccountsCommand$JsonAccount",
@@ -525,82 +821,71 @@
   "name":"org.asamk.signal.commands.ListContactsCommand$JsonContact",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"color","parameterTypes":[] }, {"name":"isBlocked","parameterTypes":[] }, {"name":"messageExpirationTime","parameterTypes":[] }, {"name":"name","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"profile","parameterTypes":[] }, {"name":"username","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.ListContactsCommand$JsonContact$JsonProfile",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"about","parameterTypes":[] }, 
-    {"name":"aboutEmoji","parameterTypes":[] }, 
-    {"name":"familyName","parameterTypes":[] }, 
-    {"name":"givenName","parameterTypes":[] }, 
-    {"name":"lastUpdateTimestamp","parameterTypes":[] }, 
-    {"name":"mobileCoinAddress","parameterTypes":[] }
-  ]
+  "methods":[{"name":"about","parameterTypes":[] }, {"name":"aboutEmoji","parameterTypes":[] }, {"name":"familyName","parameterTypes":[] }, {"name":"givenName","parameterTypes":[] }, {"name":"lastUpdateTimestamp","parameterTypes":[] }, {"name":"mobileCoinAddress","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.ListDevicesCommand$JsonDevice",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"createdTimestamp","parameterTypes":[] }, {"name":"id","parameterTypes":[] }, {"name":"lastSeenTimestamp","parameterTypes":[] }, {"name":"name","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.ListGroupsCommand$JsonGroup",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"admins","parameterTypes":[] }, {"name":"banned","parameterTypes":[] }, {"name":"description","parameterTypes":[] }, {"name":"groupInviteLink","parameterTypes":[] }, {"name":"id","parameterTypes":[] }, {"name":"isBlocked","parameterTypes":[] }, {"name":"isMember","parameterTypes":[] }, {"name":"members","parameterTypes":[] }, {"name":"messageExpirationTime","parameterTypes":[] }, {"name":"name","parameterTypes":[] }, {"name":"pendingMembers","parameterTypes":[] }, {"name":"permissionAddMember","parameterTypes":[] }, {"name":"permissionEditDetails","parameterTypes":[] }, {"name":"permissionSendMessage","parameterTypes":[] }, {"name":"requestingMembers","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.ListGroupsCommand$JsonGroupMember",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"number","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.ListIdentitiesCommand$JsonIdentity",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"addedTimestamp","parameterTypes":[] }, {"name":"fingerprint","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"safetyNumber","parameterTypes":[] }, {"name":"scannableSafetyNumber","parameterTypes":[] }, {"name":"trustLevel","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.ListStickerPacksCommand$JsonStickerPack",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"author","parameterTypes":[] }, 
-    {"name":"cover","parameterTypes":[] }, 
-    {"name":"installed","parameterTypes":[] }, 
-    {"name":"packId","parameterTypes":[] }, 
-    {"name":"stickers","parameterTypes":[] }, 
-    {"name":"title","parameterTypes":[] }, 
-    {"name":"url","parameterTypes":[] }
-  ]
+  "methods":[{"name":"author","parameterTypes":[] }, {"name":"cover","parameterTypes":[] }, {"name":"installed","parameterTypes":[] }, {"name":"packId","parameterTypes":[] }, {"name":"stickers","parameterTypes":[] }, {"name":"title","parameterTypes":[] }, {"name":"url","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.ListStickerPacksCommand$JsonStickerPack$JsonSticker",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"contentType","parameterTypes":[] }, 
-    {"name":"emoji","parameterTypes":[] }, 
-    {"name":"id","parameterTypes":[] }
-  ]
+  "methods":[{"name":"contentType","parameterTypes":[] }, {"name":"emoji","parameterTypes":[] }, {"name":"id","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.commands.ReceiveCommand$ReceiveParams",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.Double","java.lang.Integer"] }, {"name":"maxMessages","parameterTypes":[] }, {"name":"timeout","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.RegisterCommand$RegistrationParams",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.String"] }, 
-    {"name":"captcha","parameterTypes":[] }, 
-    {"name":"voice","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.String"] }, {"name":"captcha","parameterTypes":[] }, {"name":"voice","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.StartLinkCommand$JsonLink",
@@ -609,39 +894,75 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"deviceLinkUri","parameterTypes":[] }]
 },
+{
+  "name":"org.asamk.signal.commands.UpdateAccountCommand$JsonAccountResponse",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"username","parameterTypes":[] }, {"name":"usernameLink","parameterTypes":[] }]
+},
 {
   "name":"org.asamk.signal.commands.VerifyCommand$VerifyParams",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }, 
-    {"name":"pin","parameterTypes":[] }, 
-    {"name":"verificationCode","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"pin","parameterTypes":[] }, {"name":"verificationCode","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.dbus.DbusProperties",
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"org.asamk.signal.dbus.DbusSignalControlImpl",
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"org.asamk.signal.dbus.DbusSignalImpl",
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"org.asamk.signal.dbus.DbusSignalImpl$DbusSignalConfigurationImpl",
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"org.asamk.signal.dbus.DbusSignalImpl$DbusSignalDeviceImpl",
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"org.asamk.signal.dbus.DbusSignalImpl$DbusSignalGroupImpl",
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"org.asamk.signal.dbus.DbusSignalImpl$DbusSignalIdentityImpl",
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"org.asamk.signal.json.JsonAttachment",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"caption","parameterTypes":[] }, {"name":"contentType","parameterTypes":[] }, {"name":"filename","parameterTypes":[] }, {"name":"height","parameterTypes":[] }, {"name":"id","parameterTypes":[] }, {"name":"size","parameterTypes":[] }, {"name":"uploadTimestamp","parameterTypes":[] }, {"name":"width","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.json.JsonAttachmentData",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"data","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonCallMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"answerMessage","parameterTypes":[] }, {"name":"busyMessage","parameterTypes":[] }, {"name":"hangupMessage","parameterTypes":[] }, {"name":"iceUpdateMessages","parameterTypes":[] }, {"name":"offerMessage","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonCallMessage$Answer",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"id","parameterTypes":[] }, 
-    {"name":"opaque","parameterTypes":[] }, 
-    {"name":"sdp","parameterTypes":[] }
-  ]
+  "methods":[{"name":"id","parameterTypes":[] }, {"name":"opaque","parameterTypes":[] }, {"name":"sdp","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonCallMessage$Busy",
@@ -655,171 +976,182 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"deviceId","parameterTypes":[] }, 
-    {"name":"id","parameterTypes":[] }, 
-    {"name":"isLegacy","parameterTypes":[] }, 
-    {"name":"type","parameterTypes":[] }
-  ]
+  "methods":[{"name":"deviceId","parameterTypes":[] }, {"name":"id","parameterTypes":[] }, {"name":"isLegacy","parameterTypes":[] }, {"name":"type","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonCallMessage$IceUpdate",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"id","parameterTypes":[] }, 
-    {"name":"opaque","parameterTypes":[] }, 
-    {"name":"sdp","parameterTypes":[] }
-  ]
+  "methods":[{"name":"id","parameterTypes":[] }, {"name":"opaque","parameterTypes":[] }, {"name":"sdp","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonCallMessage$Offer",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"id","parameterTypes":[] }, 
-    {"name":"opaque","parameterTypes":[] }, 
-    {"name":"sdp","parameterTypes":[] }, 
-    {"name":"type","parameterTypes":[] }
-  ]
+  "methods":[{"name":"id","parameterTypes":[] }, {"name":"opaque","parameterTypes":[] }, {"name":"sdp","parameterTypes":[] }, {"name":"type","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.json.JsonContact",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"color","parameterTypes":[] }, {"name":"familyName","parameterTypes":[] }, {"name":"givenName","parameterTypes":[] }, {"name":"internal","parameterTypes":[] }, {"name":"isBlocked","parameterTypes":[] }, {"name":"isHidden","parameterTypes":[] }, {"name":"messageExpirationTime","parameterTypes":[] }, {"name":"name","parameterTypes":[] }, {"name":"nickFamilyName","parameterTypes":[] }, {"name":"nickGivenName","parameterTypes":[] }, {"name":"nickName","parameterTypes":[] }, {"name":"note","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"profile","parameterTypes":[] }, {"name":"profileSharing","parameterTypes":[] }, {"name":"unregistered","parameterTypes":[] }, {"name":"username","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.json.JsonContact$JsonInternal",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"capabilities","parameterTypes":[] }, {"name":"discoverableByPhonenumber","parameterTypes":[] }, {"name":"sharesPhoneNumber","parameterTypes":[] }, {"name":"unidentifiedAccessMode","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.json.JsonContact$JsonProfile",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"about","parameterTypes":[] }, {"name":"aboutEmoji","parameterTypes":[] }, {"name":"familyName","parameterTypes":[] }, {"name":"givenName","parameterTypes":[] }, {"name":"hasAvatar","parameterTypes":[] }, {"name":"lastUpdateTimestamp","parameterTypes":[] }, {"name":"mobileCoinAddress","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonContactAddress",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"city","parameterTypes":[] }, {"name":"country","parameterTypes":[] }, {"name":"label","parameterTypes":[] }, {"name":"neighborhood","parameterTypes":[] }, {"name":"pobox","parameterTypes":[] }, {"name":"postcode","parameterTypes":[] }, {"name":"region","parameterTypes":[] }, {"name":"street","parameterTypes":[] }, {"name":"type","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonContactAvatar",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"attachment","parameterTypes":[] }, {"name":"isProfile","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonContactEmail",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"label","parameterTypes":[] }, {"name":"type","parameterTypes":[] }, {"name":"value","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonContactName",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"display","parameterTypes":[] }, {"name":"family","parameterTypes":[] }, {"name":"given","parameterTypes":[] }, {"name":"middle","parameterTypes":[] }, {"name":"nickname","parameterTypes":[] }, {"name":"prefix","parameterTypes":[] }, {"name":"suffix","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonContactPhone",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"label","parameterTypes":[] }, {"name":"type","parameterTypes":[] }, {"name":"value","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonDataMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"attachments","parameterTypes":[] }, {"name":"contacts","parameterTypes":[] }, {"name":"expiresInSeconds","parameterTypes":[] }, {"name":"groupInfo","parameterTypes":[] }, {"name":"mentions","parameterTypes":[] }, {"name":"message","parameterTypes":[] }, {"name":"payment","parameterTypes":[] }, {"name":"previews","parameterTypes":[] }, {"name":"quote","parameterTypes":[] }, {"name":"reaction","parameterTypes":[] }, {"name":"remoteDelete","parameterTypes":[] }, {"name":"sticker","parameterTypes":[] }, {"name":"storyContext","parameterTypes":[] }, {"name":"textStyles","parameterTypes":[] }, {"name":"timestamp","parameterTypes":[] }, {"name":"viewOnce","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.json.JsonEditMessage",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"dataMessage","parameterTypes":[] }, {"name":"targetSentTimestamp","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonError",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"message","parameterTypes":[] }, {"name":"type","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonGroupInfo",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"groupId","parameterTypes":[] }, {"name":"groupName","parameterTypes":[] }, {"name":"revision","parameterTypes":[] }, {"name":"type","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonMention",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"length","parameterTypes":[] }, {"name":"name","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"start","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonMessageEnvelope",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"callMessage","parameterTypes":[] }, {"name":"dataMessage","parameterTypes":[] }, {"name":"editMessage","parameterTypes":[] }, {"name":"receiptMessage","parameterTypes":[] }, {"name":"serverDeliveredTimestamp","parameterTypes":[] }, {"name":"serverReceivedTimestamp","parameterTypes":[] }, {"name":"source","parameterTypes":[] }, {"name":"sourceDevice","parameterTypes":[] }, {"name":"sourceName","parameterTypes":[] }, {"name":"sourceNumber","parameterTypes":[] }, {"name":"sourceUuid","parameterTypes":[] }, {"name":"storyMessage","parameterTypes":[] }, {"name":"syncMessage","parameterTypes":[] }, {"name":"timestamp","parameterTypes":[] }, {"name":"typingMessage","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonPayment",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"note","parameterTypes":[] }, 
-    {"name":"receipt","parameterTypes":[] }
-  ]
+  "methods":[{"name":"note","parameterTypes":[] }, {"name":"receipt","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonPreview",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"date","parameterTypes":[] }, 
-    {"name":"description","parameterTypes":[] }, 
-    {"name":"image","parameterTypes":[] }, 
-    {"name":"title","parameterTypes":[] }, 
-    {"name":"url","parameterTypes":[] }
-  ]
+  "methods":[{"name":"description","parameterTypes":[] }, {"name":"image","parameterTypes":[] }, {"name":"title","parameterTypes":[] }, {"name":"url","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonQuote",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"attachments","parameterTypes":[] }, {"name":"author","parameterTypes":[] }, {"name":"authorNumber","parameterTypes":[] }, {"name":"authorUuid","parameterTypes":[] }, {"name":"id","parameterTypes":[] }, {"name":"mentions","parameterTypes":[] }, {"name":"text","parameterTypes":[] }, {"name":"textStyles","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonQuotedAttachment",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"contentType","parameterTypes":[] }, {"name":"filename","parameterTypes":[] }, {"name":"thumbnail","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonReaction",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"emoji","parameterTypes":[] }, {"name":"isRemove","parameterTypes":[] }, {"name":"targetAuthor","parameterTypes":[] }, {"name":"targetAuthorNumber","parameterTypes":[] }, {"name":"targetAuthorUuid","parameterTypes":[] }, {"name":"targetSentTimestamp","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonReceiptMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"isDelivery","parameterTypes":[] }, {"name":"isRead","parameterTypes":[] }, {"name":"isViewed","parameterTypes":[] }, {"name":"timestamps","parameterTypes":[] }, {"name":"when","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonRecipientAddress",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"number","parameterTypes":[] }, 
-    {"name":"uuid","parameterTypes":[] }
-  ]
+  "methods":[{"name":"number","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonRemoteDelete",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"timestamp","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonSendMessageResult",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"groupId","parameterTypes":[] }, 
-    {"name":"recipientAddress","parameterTypes":[] }, 
-    {"name":"retryAfterSeconds","parameterTypes":[] }, 
-    {"name":"token","parameterTypes":[] }, 
-    {"name":"type","parameterTypes":[] }
-  ]
+  "methods":[{"name":"groupId","parameterTypes":[] }, {"name":"recipientAddress","parameterTypes":[] }, {"name":"retryAfterSeconds","parameterTypes":[] }, {"name":"token","parameterTypes":[] }, {"name":"type","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonSendMessageResult$Type",
@@ -830,25 +1162,57 @@
   "name":"org.asamk.signal.json.JsonSharedContact",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"address","parameterTypes":[] }, {"name":"avatar","parameterTypes":[] }, {"name":"email","parameterTypes":[] }, {"name":"name","parameterTypes":[] }, {"name":"organization","parameterTypes":[] }, {"name":"phone","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonSticker",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"packId","parameterTypes":[] }, {"name":"stickerId","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.json.JsonStoryContext",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"authorNumber","parameterTypes":[] }, {"name":"authorUuid","parameterTypes":[] }, {"name":"sentTimestamp","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.json.JsonStoryMessage",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"allowsReplies","parameterTypes":[] }, {"name":"fileAttachment","parameterTypes":[] }, {"name":"groupId","parameterTypes":[] }, {"name":"textAttachment","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.json.JsonStoryMessage$TextAttachment",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"backgroundColor","parameterTypes":[] }, {"name":"backgroundGradient","parameterTypes":[] }, {"name":"preview","parameterTypes":[] }, {"name":"style","parameterTypes":[] }, {"name":"text","parameterTypes":[] }, {"name":"textBackgroundColor","parameterTypes":[] }, {"name":"textForegroundColor","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.json.JsonStoryMessage$TextAttachment$Gradient",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"angle","parameterTypes":[] }, {"name":"colors","parameterTypes":[] }, {"name":"endColor","parameterTypes":[] }, {"name":"positions","parameterTypes":[] }, {"name":"startColor","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonSyncDataMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"dataMessage","parameterTypes":[] }, {"name":"destination","parameterTypes":[] }, {"name":"destinationNumber","parameterTypes":[] }, {"name":"destinationUuid","parameterTypes":[] }, {"name":"editMessage","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonSyncMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"blockedGroupIds","parameterTypes":[] }, {"name":"blockedNumbers","parameterTypes":[] }, {"name":"readMessages","parameterTypes":[] }, {"name":"sentMessage","parameterTypes":[] }, {"name":"sentStoryMessage","parameterTypes":[] }, {"name":"type","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonSyncMessageType",
@@ -859,13 +1223,29 @@
   "name":"org.asamk.signal.json.JsonSyncReadMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"sender","parameterTypes":[] }, {"name":"senderNumber","parameterTypes":[] }, {"name":"senderUuid","parameterTypes":[] }, {"name":"timestamp","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.json.JsonSyncStoryMessage",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"dataMessage","parameterTypes":[] }, {"name":"destinationNumber","parameterTypes":[] }, {"name":"destinationUuid","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.json.JsonTextStyle",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"length","parameterTypes":[] }, {"name":"start","parameterTypes":[] }, {"name":"style","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonTypingMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"action","parameterTypes":[] }, {"name":"groupId","parameterTypes":[] }, {"name":"timestamp","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.jsonrpc.JsonRpcBatchMessage",
@@ -889,74 +1269,84 @@
   "name":"org.asamk.signal.jsonrpc.JsonRpcRequest",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getId","parameterTypes":[] }, {"name":"getJsonrpc","parameterTypes":[] }, {"name":"getMethod","parameterTypes":[] }, {"name":"getParams","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.jsonrpc.JsonRpcResponse",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getError","parameterTypes":[] }, {"name":"getId","parameterTypes":[] }, {"name":"getJsonrpc","parameterTypes":[] }, {"name":"getResult","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.jsonrpc.JsonRpcResponse$Error",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"getCode","parameterTypes":[] }, {"name":"getData","parameterTypes":[] }, {"name":"getMessage","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.api.PhoneNumberSharingMode",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true
 },
+{
+  "name":"org.asamk.signal.manager.storage.SignalAccount$Storage",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["int","long","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"<init>","parameterTypes":["int","long","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"<init>","parameterTypes":["int","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"<init>","parameterTypes":["int","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"accountEntropyPool","parameterTypes":[] }, {"name":"aciAccountData","parameterTypes":[] }, {"name":"deviceId","parameterTypes":[] }, {"name":"encryptedDeviceName","parameterTypes":[] }, {"name":"isMultiDevice","parameterTypes":[] }, {"name":"mediaRootBackupKey","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"password","parameterTypes":[] }, {"name":"pinMasterKey","parameterTypes":[] }, {"name":"pniAccountData","parameterTypes":[] }, {"name":"profileKey","parameterTypes":[] }, {"name":"registered","parameterTypes":[] }, {"name":"registrationLockPin","parameterTypes":[] }, {"name":"serviceEnvironment","parameterTypes":[] }, {"name":"storageKey","parameterTypes":[] }, {"name":"timestamp","parameterTypes":[] }, {"name":"username","parameterTypes":[] }, {"name":"usernameLinkEntropy","parameterTypes":[] }, {"name":"usernameLinkServerId","parameterTypes":[] }, {"name":"version","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","int","java.lang.String","java.lang.String","int","int","int","int","int"] }, {"name":"activeLastResortKyberPreKeyId","parameterTypes":[] }, {"name":"activeSignedPreKeyId","parameterTypes":[] }, {"name":"identityPrivateKey","parameterTypes":[] }, {"name":"identityPublicKey","parameterTypes":[] }, {"name":"nextKyberPreKeyId","parameterTypes":[] }, {"name":"nextPreKeyId","parameterTypes":[] }, {"name":"nextSignedPreKeyId","parameterTypes":[] }, {"name":"registrationId","parameterTypes":[] }, {"name":"serviceId","parameterTypes":[] }]
+},
 {
   "name":"org.asamk.signal.manager.storage.accounts.AccountsStorage",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.util.List"] }, 
-    {"name":"accounts","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.util.List","java.lang.Integer"] }, {"name":"accounts","parameterTypes":[] }, {"name":"version","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.accounts.AccountsStorage$Account",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String"] }, 
-    {"name":"number","parameterTypes":[] }, 
-    {"name":"path","parameterTypes":[] }, 
-    {"name":"uuid","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"environment","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"path","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.configuration.ConfigurationStore$Storage",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","org.asamk.signal.manager.api.PhoneNumberSharingMode"] }, 
-    {"name":"linkPreviews","parameterTypes":[] }, 
-    {"name":"phoneNumberSharingMode","parameterTypes":[] }, 
-    {"name":"phoneNumberUnlisted","parameterTypes":[] }, 
-    {"name":"readReceipts","parameterTypes":[] }, 
-    {"name":"typingIndicators","parameterTypes":[] }, 
-    {"name":"unidentifiedDeliveryIndicators","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","org.asamk.signal.manager.api.PhoneNumberSharingMode"] }, {"name":"linkPreviews","parameterTypes":[] }, {"name":"phoneNumberSharingMode","parameterTypes":[] }, {"name":"phoneNumberUnlisted","parameterTypes":[] }, {"name":"readReceipts","parameterTypes":[] }, {"name":"typingIndicators","parameterTypes":[] }, {"name":"unidentifiedDeliveryIndicators","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.manager.storage.configuration.LegacyConfigurationStore$Storage",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","org.asamk.signal.manager.api.PhoneNumberSharingMode"] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.contacts.LegacyContactInfo",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
-  "queryAllDeclaredConstructors":true
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.contacts.LegacyJsonContactsStore",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "fields":[{"name":"contacts", "allowWrite":true}]
+  "fields":[{"name":"contacts", "allowWrite":true}],
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.groups.GroupInfo",
@@ -970,51 +1360,47 @@
   "allDeclaredConstructors":true
 },
 {
-  "name":"org.asamk.signal.manager.storage.groups.GroupStore$GroupsDeserializer",
+  "name":"org.asamk.signal.manager.storage.groups.LegacyGroupStore$GroupsDeserializer",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
-  "name":"org.asamk.signal.manager.storage.groups.GroupStore$Storage",
-  "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
-},
-{
-  "name":"org.asamk.signal.manager.storage.groups.GroupStore$Storage$GroupV1",
-  "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
-},
-{
-  "name":"org.asamk.signal.manager.storage.groups.GroupStore$Storage$GroupV1$JsonRecipientAddress",
+  "name":"org.asamk.signal.manager.storage.groups.LegacyGroupStore$Storage",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }, 
-    {"name":"number","parameterTypes":[] }, 
-    {"name":"uuid","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.util.List"] }, {"name":"groups","parameterTypes":[] }]
 },
 {
-  "name":"org.asamk.signal.manager.storage.groups.GroupStore$Storage$GroupV1$MembersDeserializer",
+  "name":"org.asamk.signal.manager.storage.groups.LegacyGroupStore$Storage$GroupV1",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","java.lang.String","int","boolean","boolean","java.util.List"] }, {"name":"archived","parameterTypes":[] }, {"name":"blocked","parameterTypes":[] }, {"name":"color","parameterTypes":[] }, {"name":"expectedV2Id","parameterTypes":[] }, {"name":"groupId","parameterTypes":[] }, {"name":"members","parameterTypes":[] }, {"name":"messageExpirationTime","parameterTypes":[] }, {"name":"name","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.manager.storage.groups.LegacyGroupStore$Storage$GroupV1$JsonRecipientAddress",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"number","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.manager.storage.groups.LegacyGroupStore$Storage$GroupV1$MembersDeserializer",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
-  "name":"org.asamk.signal.manager.storage.groups.GroupStore$Storage$GroupV1$MembersSerializer",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "name":"org.asamk.signal.manager.storage.groups.LegacyGroupStore$Storage$GroupV2",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","boolean","boolean"] }, {"name":"blocked","parameterTypes":[] }, {"name":"distributionId","parameterTypes":[] }, {"name":"groupId","parameterTypes":[] }, {"name":"masterKey","parameterTypes":[] }, {"name":"permissionDenied","parameterTypes":[] }]
 },
 {
-  "name":"org.asamk.signal.manager.storage.groups.GroupStore$Storage$GroupV2",
+  "name":"org.asamk.signal.manager.storage.identities.LegacyIdentityKeyStore$IdentityStorage",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
-},
-{
-  "name":"org.asamk.signal.manager.storage.identities.IdentityKeyStore$IdentityStorage",
-  "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","int","long"] }, {"name":"addedTimestamp","parameterTypes":[] }, {"name":"identityKey","parameterTypes":[] }, {"name":"trustLevel","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.profiles.LegacyProfileStore",
@@ -1027,6 +1413,12 @@
   "name":"org.asamk.signal.manager.storage.profiles.LegacyProfileStore$ProfileStoreDeserializer",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.asamk.signal.manager.storage.profiles.LegacySignalProfile",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "allDeclaredConstructors":true
+},
 {
   "name":"org.asamk.signal.manager.storage.profiles.LegacySignalProfileEntry",
   "allDeclaredFields":true,
@@ -1039,18 +1431,6 @@
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true
 },
-{
-  "name":"org.asamk.signal.manager.storage.profiles.SignalProfile",
-  "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
-},
-{
-  "name":"org.asamk.signal.manager.storage.profiles.SignalProfile$Capabilities",
-  "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
-},
 {
   "name":"org.asamk.signal.manager.storage.protocol.LegacyJsonIdentityKeyStore$JsonIdentityKeyStoreDeserializer",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -1067,7 +1447,8 @@
   "name":"org.asamk.signal.manager.storage.protocol.LegacyJsonSignalProtocolStore",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.protocol.LegacyJsonSignedPreKeyStore$JsonSignedPreKeyStoreDeserializer",
@@ -1085,104 +1466,102 @@
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
-  "name":"org.asamk.signal.manager.storage.recipients.RecipientAddress",
+  "name":"org.asamk.signal.manager.storage.recipients.LegacyRecipientStore2$Storage",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"number","parameterTypes":[] }, 
-    {"name":"uuid","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.util.List","long"] }, {"name":"lastId","parameterTypes":[] }, {"name":"recipients","parameterTypes":[] }]
 },
 {
-  "name":"org.asamk.signal.manager.storage.recipients.RecipientStore$Storage",
+  "name":"org.asamk.signal.manager.storage.recipients.LegacyRecipientStore2$Storage$Recipient",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["long","java.lang.String","java.lang.String","java.lang.String","java.lang.String","org.asamk.signal.manager.storage.recipients.LegacyRecipientStore2$Storage$Recipient$Contact","org.asamk.signal.manager.storage.recipients.LegacyRecipientStore2$Storage$Recipient$Profile"] }, {"name":"contact","parameterTypes":[] }, {"name":"expiringProfileKeyCredential","parameterTypes":[] }, {"name":"id","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"profile","parameterTypes":[] }, {"name":"profileKey","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
 },
 {
-  "name":"org.asamk.signal.manager.storage.recipients.RecipientStore$Storage$Recipient",
+  "name":"org.asamk.signal.manager.storage.recipients.LegacyRecipientStore2$Storage$Recipient$Contact",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","int","boolean","boolean","boolean"] }, {"name":"archived","parameterTypes":[] }, {"name":"blocked","parameterTypes":[] }, {"name":"color","parameterTypes":[] }, {"name":"messageExpirationTime","parameterTypes":[] }, {"name":"name","parameterTypes":[] }, {"name":"profileSharingEnabled","parameterTypes":[] }]
 },
 {
-  "name":"org.asamk.signal.manager.storage.recipients.RecipientStore$Storage$Recipient$Contact",
+  "name":"org.asamk.signal.manager.storage.recipients.LegacyRecipientStore2$Storage$Recipient$Profile",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["long","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.util.Set"] }, {"name":"about","parameterTypes":[] }, {"name":"aboutEmoji","parameterTypes":[] }, {"name":"avatarUrlPath","parameterTypes":[] }, {"name":"capabilities","parameterTypes":[] }, {"name":"familyName","parameterTypes":[] }, {"name":"givenName","parameterTypes":[] }, {"name":"lastUpdateTimestamp","parameterTypes":[] }, {"name":"mobileCoinAddress","parameterTypes":[] }, {"name":"unidentifiedAccessMode","parameterTypes":[] }]
 },
 {
-  "name":"org.asamk.signal.manager.storage.recipients.RecipientStore$Storage$Recipient$Profile",
+  "name":"org.asamk.signal.manager.storage.senderKeys.LegacySenderKeySharedStore$Storage",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.util.List"] }, {"name":"sharedSenderKeys","parameterTypes":[] }]
 },
 {
-  "name":"org.asamk.signal.manager.storage.senderKeys.SenderKeySharedStore$Storage",
+  "name":"org.asamk.signal.manager.storage.senderKeys.LegacySenderKeySharedStore$Storage$SharedSenderKey",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
-},
-{
-  "name":"org.asamk.signal.manager.storage.senderKeys.SenderKeySharedStore$Storage$SharedSenderKey",
-  "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["long","int","java.lang.String"] }, {"name":"deviceId","parameterTypes":[] }, {"name":"distributionId","parameterTypes":[] }, {"name":"recipientId","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.stickerPacks.JsonStickerPack",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","org.asamk.signal.manager.storage.stickerPacks.JsonStickerPack$JsonSticker","java.util.List"] }, 
-    {"name":"author","parameterTypes":[] }, 
-    {"name":"cover","parameterTypes":[] }, 
-    {"name":"stickers","parameterTypes":[] }, 
-    {"name":"title","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","org.asamk.signal.manager.storage.stickerPacks.JsonStickerPack$JsonSticker","java.util.List"] }, {"name":"author","parameterTypes":[] }, {"name":"cover","parameterTypes":[] }, {"name":"stickers","parameterTypes":[] }, {"name":"title","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.stickerPacks.JsonStickerPack$JsonSticker",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.Integer","java.lang.String","java.lang.String","java.lang.String"] }, 
-    {"name":"contentType","parameterTypes":[] }, 
-    {"name":"emoji","parameterTypes":[] }, 
-    {"name":"file","parameterTypes":[] }, 
-    {"name":"id","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.Integer","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"contentType","parameterTypes":[] }, {"name":"emoji","parameterTypes":[] }, {"name":"file","parameterTypes":[] }, {"name":"id","parameterTypes":[] }]
 },
 {
-  "name":"org.asamk.signal.manager.storage.stickers.StickerStore",
+  "name":"org.asamk.signal.manager.storage.stickers.LegacyStickerStore$Storage",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true,
-  "fields":[{"name":"stickers", "allowWrite":true}]
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.util.List"] }, {"name":"stickers","parameterTypes":[] }]
 },
 {
-  "name":"org.asamk.signal.manager.storage.stickers.StickerStore$Storage",
+  "name":"org.asamk.signal.manager.storage.stickers.LegacyStickerStore$Storage$Sticker",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","boolean"] }, {"name":"installed","parameterTypes":[] }, {"name":"packId","parameterTypes":[] }, {"name":"packKey","parameterTypes":[] }]
 },
 {
-  "name":"org.asamk.signal.manager.storage.stickers.StickerStore$Storage$Sticker",
+  "name":"org.asamk.signal.manager.storage.threads.LegacyJsonThreadStore",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
-},
-{
-  "name":"org.asamk.signal.util.SecurityProvider$DefaultRandom",
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.asamk.signal.manager.storage.threads.LegacyJsonThreadStore$ThreadsDeserializer",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.util.SecurityProvider$DefaultRandom",
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"<init>","parameterTypes":["java.security.SecureRandomParameters"] }]
+},
 {
   "name":"org.bouncycastle.jcajce.provider.asymmetric.COMPOSITE$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.CONTEXT$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.CompositeSignatures$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.bouncycastle.jcajce.provider.asymmetric.DH$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -1195,6 +1574,10 @@
   "name":"org.bouncycastle.jcajce.provider.asymmetric.DSTU4145$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.Dilithium$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.bouncycastle.jcajce.provider.asymmetric.EC$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -1203,6 +1586,10 @@
   "name":"org.bouncycastle.jcajce.provider.asymmetric.ECGOST$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.EXTERNAL$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.bouncycastle.jcajce.provider.asymmetric.EdEC$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -1211,6 +1598,10 @@
   "name":"org.bouncycastle.jcajce.provider.asymmetric.ElGamal$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.Falcon$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.bouncycastle.jcajce.provider.asymmetric.GM$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -1223,10 +1614,38 @@
   "name":"org.bouncycastle.jcajce.provider.asymmetric.IES$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.LMS$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.MLDSA$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.MLKEM$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.NTRU$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.NoSig$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.bouncycastle.jcajce.provider.asymmetric.RSA$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.SLHDSA$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.SPHINCSPlus$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.bouncycastle.jcajce.provider.asymmetric.X509$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -1251,6 +1670,10 @@
   "name":"org.bouncycastle.jcajce.provider.digest.Blake2s$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.digest.Blake3$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.bouncycastle.jcajce.provider.digest.DSTU7564$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -1359,6 +1782,9 @@
   "name":"org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi$Std",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi.Std"
+},
 {
   "name":"org.bouncycastle.jcajce.provider.symmetric.AES$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -1571,6 +1997,10 @@
   "name":"org.bouncycastle.pqc.jcajce.provider.XMSS$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.freedesktop.dbus.connections.base.GlobalHandler",
+  "queryAllDeclaredMethods":true
+},
 {
   "name":"org.freedesktop.dbus.errors.ServiceUnknown",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
@@ -1585,12 +2015,14 @@
 },
 {
   "name":"org.freedesktop.dbus.interfaces.DBus$NameAcquired",
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }]
 },
 {
   "name":"org.freedesktop.dbus.interfaces.Introspectable",
   "allDeclaredMethods":true,
-  "allDeclaredClasses":true
+  "allDeclaredClasses":true,
+  "methods":[{"name":"Introspect","parameterTypes":[] }]
 },
 {
   "name":"org.freedesktop.dbus.interfaces.Peer",
@@ -1600,12 +2032,42 @@
 {
   "name":"org.freedesktop.dbus.interfaces.Properties",
   "allDeclaredMethods":true,
-  "allDeclaredClasses":true
+  "allDeclaredClasses":true,
+  "methods":[{"name":"Get","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"GetAll","parameterTypes":["java.lang.String"] }, {"name":"Set","parameterTypes":["java.lang.String","java.lang.String","java.lang.Object"] }]
 },
 {
   "name":"org.freedesktop.dbus.interfaces.Properties$PropertiesChanged",
   "allPublicConstructors":true
 },
+{
+  "name":"org.robolectric.Robolectric"
+},
+{
+  "name":"org.signal.cdsi.proto.ClientRequest",
+  "fields":[{"name":"aciUakPairs_"}, {"name":"discardE164S_"}, {"name":"newE164S_"}, {"name":"prevE164S_"}, {"name":"returnAcisWithoutUaks_"}, {"name":"tokenAck_"}, {"name":"token_"}]
+},
+{
+  "name":"org.signal.cdsi.proto.ClientResponse",
+  "fields":[{"name":"debugPermitsUsed_"}, {"name":"e164PniAciTriples_"}, {"name":"retryAfterSecs_"}, {"name":"token_"}]
+},
+{
+  "name":"org.signal.libsignal.protocol.IdentityKey"
+},
+{
+  "name":"org.signal.libsignal.protocol.ServiceId",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "name":"org.signal.libsignal.protocol.SignalProtocolAddress"
+},
+{
+  "name":"org.signal.libsignal.protocol.ecc.ECPublicKey"
+},
+{
+  "name":"org.signal.libsignal.protocol.kem.KEMPublicKey"
+},
 {
   "name":"org.signal.libsignal.protocol.state.IdentityKeyStore",
   "allDeclaredMethods":true
@@ -1631,105 +2093,45 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true
 },
+{
+  "name":"org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
 {
   "name":"org.signal.libsignal.zkgroup.profiles.ProfileKey",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true
 },
-{
-  "name":"org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential",
-  "allDeclaredFields":true,
-  "queryAllDeclaredMethods":true,
-  "queryAllDeclaredConstructors":true
-},
 {
   "name":"org.signal.storageservice.protos.groups.AccessControl",
-  "fields":[
-    {"name":"addFromInviteLink_"}, 
-    {"name":"attributes_"}, 
-    {"name":"members_"}
-  ]
+  "fields":[{"name":"addFromInviteLink_"}, {"name":"attributes_"}, {"name":"members_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.AvatarUploadAttributes",
-  "fields":[
-    {"name":"acl_"}, 
-    {"name":"algorithm_"}, 
-    {"name":"credential_"}, 
-    {"name":"date_"}, 
-    {"name":"key_"}, 
-    {"name":"policy_"}, 
-    {"name":"signature_"}
-  ]
+  "fields":[{"name":"acl_"}, {"name":"algorithm_"}, {"name":"credential_"}, {"name":"date_"}, {"name":"key_"}, {"name":"policy_"}, {"name":"signature_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.BannedMember",
-  "fields":[
-    {"name":"timestamp_"}, 
-    {"name":"userId_"}
-  ]
+  "fields":[{"name":"timestamp_"}, {"name":"userId_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.Group",
-  "fields":[
-    {"name":"accessControl_"}, 
-    {"name":"announcementsOnly_"}, 
-    {"name":"avatar_"}, 
-    {"name":"bannedMembers_"}, 
-    {"name":"description_"}, 
-    {"name":"disappearingMessagesTimer_"}, 
-    {"name":"inviteLinkPassword_"}, 
-    {"name":"members_"}, 
-    {"name":"pendingMembers_"}, 
-    {"name":"publicKey_"}, 
-    {"name":"requestingMembers_"}, 
-    {"name":"revision_"}, 
-    {"name":"title_"}
-  ]
+  "fields":[{"name":"accessControl_"}, {"name":"announcementsOnly_"}, {"name":"avatar_"}, {"name":"bannedMembers_"}, {"name":"description_"}, {"name":"disappearingMessagesTimer_"}, {"name":"inviteLinkPassword_"}, {"name":"members_"}, {"name":"pendingMembers_"}, {"name":"publicKey_"}, {"name":"requestingMembers_"}, {"name":"revision_"}, {"name":"title_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupAttributeBlob",
-  "fields":[
-    {"name":"contentCase_"}, 
-    {"name":"content_"}
-  ]
+  "fields":[{"name":"contentCase_"}, {"name":"content_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange",
-  "fields":[
-    {"name":"actions_"}, 
-    {"name":"changeEpoch_"}, 
-    {"name":"serverSignature_"}
-  ]
+  "fields":[{"name":"actions_"}, {"name":"changeEpoch_"}, {"name":"serverSignature_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions",
-  "fields":[
-    {"name":"addBannedMembers_"}, 
-    {"name":"addMembers_"}, 
-    {"name":"addPendingMembers_"}, 
-    {"name":"addRequestingMembers_"}, 
-    {"name":"deleteBannedMembers_"}, 
-    {"name":"deleteMembers_"}, 
-    {"name":"deletePendingMembers_"}, 
-    {"name":"deleteRequestingMembers_"}, 
-    {"name":"modifyAddFromInviteLinkAccess_"}, 
-    {"name":"modifyAnnouncementsOnly_"}, 
-    {"name":"modifyAttributesAccess_"}, 
-    {"name":"modifyAvatar_"}, 
-    {"name":"modifyDescription_"}, 
-    {"name":"modifyDisappearingMessagesTimer_"}, 
-    {"name":"modifyInviteLinkPassword_"}, 
-    {"name":"modifyMemberAccess_"}, 
-    {"name":"modifyMemberProfileKeys_"}, 
-    {"name":"modifyMemberRoles_"}, 
-    {"name":"modifyTitle_"}, 
-    {"name":"promotePendingMembers_"}, 
-    {"name":"promoteRequestingMembers_"}, 
-    {"name":"revision_"}, 
-    {"name":"sourceUuid_"}
-  ]
+  "fields":[{"name":"addBannedMembers_"}, {"name":"addMembers_"}, {"name":"addPendingMembers_"}, {"name":"addRequestingMembers_"}, {"name":"deleteBannedMembers_"}, {"name":"deleteMembers_"}, {"name":"deletePendingMembers_"}, {"name":"deleteRequestingMembers_"}, {"name":"modifyAddFromInviteLinkAccess_"}, {"name":"modifyAnnouncementsOnly_"}, {"name":"modifyAttributesAccess_"}, {"name":"modifyAvatar_"}, {"name":"modifyDescription_"}, {"name":"modifyDisappearingMessagesTimer_"}, {"name":"modifyInviteLinkPassword_"}, {"name":"modifyMemberAccess_"}, {"name":"modifyMemberProfileKeys_"}, {"name":"modifyMemberRoles_"}, {"name":"modifyTitle_"}, {"name":"promotePendingMembers_"}, {"name":"promotePendingPniAciMembers_"}, {"name":"promoteRequestingMembers_"}, {"name":"revision_"}, {"name":"sourceServiceId_"}, {"name":"sourceUuid_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$AddBannedMemberAction",
@@ -1737,10 +2139,7 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$AddMemberAction",
-  "fields":[
-    {"name":"added_"}, 
-    {"name":"joinFromInviteLink_"}
-  ]
+  "fields":[{"name":"added_"}, {"name":"joinFromInviteLink_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$AddPendingMemberAction",
@@ -1796,14 +2195,11 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$ModifyMemberProfileKeyAction",
-  "fields":[{"name":"presentation_"}]
+  "fields":[{"name":"presentation_"}, {"name":"profileKey_"}, {"name":"userId_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$ModifyMemberRoleAction",
-  "fields":[
-    {"name":"role_"}, 
-    {"name":"userId_"}
-  ]
+  "fields":[{"name":"role_"}, {"name":"userId_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$ModifyMembersAccessControlAction",
@@ -1815,14 +2211,15 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$PromotePendingMemberAction",
-  "fields":[{"name":"presentation_"}]
+  "fields":[{"name":"presentation_"}, {"name":"profileKey_"}, {"name":"userId_"}]
+},
+{
+  "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$PromotePendingPniAciMemberProfileKeyAction",
+  "fields":[{"name":"pni_"}, {"name":"presentation_"}, {"name":"profileKey_"}, {"name":"userId_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$PromoteRequestingMemberAction",
-  "fields":[
-    {"name":"role_"}, 
-    {"name":"userId_"}
-  ]
+  "fields":[{"name":"role_"}, {"name":"userId_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChanges",
@@ -1830,177 +2227,71 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChanges$GroupChangeState",
-  "fields":[
-    {"name":"groupChange_"}, 
-    {"name":"groupState_"}
-  ]
+  "fields":[{"name":"groupChange_"}, {"name":"groupState_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupInviteLink",
-  "fields":[
-    {"name":"contentsCase_"}, 
-    {"name":"contents_"}
-  ]
+  "fields":[{"name":"contentsCase_"}, {"name":"contents_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupInviteLink$GroupInviteLinkContentsV1",
-  "fields":[
-    {"name":"groupMasterKey_"}, 
-    {"name":"inviteLinkPassword_"}
-  ]
+  "fields":[{"name":"groupMasterKey_"}, {"name":"inviteLinkPassword_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupJoinInfo",
-  "fields":[
-    {"name":"addFromInviteLink_"}, 
-    {"name":"avatar_"}, 
-    {"name":"description_"}, 
-    {"name":"memberCount_"}, 
-    {"name":"pendingAdminApproval_"}, 
-    {"name":"publicKey_"}, 
-    {"name":"revision_"}, 
-    {"name":"title_"}
-  ]
+  "fields":[{"name":"addFromInviteLink_"}, {"name":"avatar_"}, {"name":"description_"}, {"name":"memberCount_"}, {"name":"pendingAdminApproval_"}, {"name":"publicKey_"}, {"name":"revision_"}, {"name":"title_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.Member",
-  "fields":[
-    {"name":"joinedAtRevision_"}, 
-    {"name":"presentation_"}, 
-    {"name":"profileKey_"}, 
-    {"name":"role_"}, 
-    {"name":"userId_"}
-  ]
+  "fields":[{"name":"joinedAtRevision_"}, {"name":"presentation_"}, {"name":"profileKey_"}, {"name":"role_"}, {"name":"userId_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.PendingMember",
-  "fields":[
-    {"name":"addedByUserId_"}, 
-    {"name":"member_"}, 
-    {"name":"timestamp_"}
-  ]
+  "fields":[{"name":"addedByUserId_"}, {"name":"member_"}, {"name":"timestamp_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.RequestingMember",
-  "fields":[
-    {"name":"presentation_"}, 
-    {"name":"profileKey_"}, 
-    {"name":"timestamp_"}, 
-    {"name":"userId_"}
-  ]
+  "fields":[{"name":"presentation_"}, {"name":"profileKey_"}, {"name":"timestamp_"}, {"name":"userId_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedApproveMember",
-  "fields":[
-    {"name":"role_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"role_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedBannedMember",
-  "fields":[
-    {"name":"timestamp_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"serviceIdBinary_"}, {"name":"serviceIdBytes_"}, {"name":"timestamp_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedGroup",
-  "fields":[
-    {"name":"accessControl_"}, 
-    {"name":"avatar_"}, 
-    {"name":"bannedMembers_"}, 
-    {"name":"description_"}, 
-    {"name":"disappearingMessagesTimer_"}, 
-    {"name":"inviteLinkPassword_"}, 
-    {"name":"isAnnouncementGroup_"}, 
-    {"name":"members_"}, 
-    {"name":"pendingMembers_"}, 
-    {"name":"requestingMembers_"}, 
-    {"name":"revision_"}, 
-    {"name":"title_"}
-  ]
+  "fields":[{"name":"accessControl_"}, {"name":"avatar_"}, {"name":"bannedMembers_"}, {"name":"description_"}, {"name":"disappearingMessagesTimer_"}, {"name":"inviteLinkPassword_"}, {"name":"isAnnouncementGroup_"}, {"name":"members_"}, {"name":"pendingMembers_"}, {"name":"requestingMembers_"}, {"name":"revision_"}, {"name":"title_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedGroupChange",
-  "fields":[
-    {"name":"deleteBannedMembers_"}, 
-    {"name":"deleteMembers_"}, 
-    {"name":"deletePendingMembers_"}, 
-    {"name":"deleteRequestingMembers_"}, 
-    {"name":"editor_"}, 
-    {"name":"modifiedProfileKeys_"}, 
-    {"name":"modifyMemberRoles_"}, 
-    {"name":"newAttributeAccess_"}, 
-    {"name":"newAvatar_"}, 
-    {"name":"newBannedMembers_"}, 
-    {"name":"newDescription_"}, 
-    {"name":"newInviteLinkAccess_"}, 
-    {"name":"newInviteLinkPassword_"}, 
-    {"name":"newIsAnnouncementGroup_"}, 
-    {"name":"newMemberAccess_"}, 
-    {"name":"newMembers_"}, 
-    {"name":"newPendingMembers_"}, 
-    {"name":"newRequestingMembers_"}, 
-    {"name":"newTimer_"}, 
-    {"name":"newTitle_"}, 
-    {"name":"promotePendingMembers_"}, 
-    {"name":"promoteRequestingMembers_"}, 
-    {"name":"revision_"}
-  ]
+  "fields":[{"name":"deleteBannedMembers_"}, {"name":"deleteMembers_"}, {"name":"deletePendingMembers_"}, {"name":"deleteRequestingMembers_"}, {"name":"editorServiceIdBytes_"}, {"name":"editor_"}, {"name":"modifiedProfileKeys_"}, {"name":"modifyMemberRoles_"}, {"name":"newAttributeAccess_"}, {"name":"newAvatar_"}, {"name":"newBannedMembers_"}, {"name":"newDescription_"}, {"name":"newInviteLinkAccess_"}, {"name":"newInviteLinkPassword_"}, {"name":"newIsAnnouncementGroup_"}, {"name":"newMemberAccess_"}, {"name":"newMembers_"}, {"name":"newPendingMembers_"}, {"name":"newRequestingMembers_"}, {"name":"newTimer_"}, {"name":"newTitle_"}, {"name":"promotePendingMembers_"}, {"name":"promotePendingPniAciMembers_"}, {"name":"promoteRequestingMembers_"}, {"name":"revision_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo",
-  "fields":[
-    {"name":"addFromInviteLink_"}, 
-    {"name":"avatar_"}, 
-    {"name":"description_"}, 
-    {"name":"isAnnouncementGroup_"}, 
-    {"name":"memberCount_"}, 
-    {"name":"pendingAdminApproval_"}, 
-    {"name":"revision_"}, 
-    {"name":"title_"}
-  ]
+  "fields":[{"name":"addFromInviteLink_"}, {"name":"avatar_"}, {"name":"description_"}, {"name":"isAnnouncementGroup_"}, {"name":"memberCount_"}, {"name":"pendingAdminApproval_"}, {"name":"revision_"}, {"name":"title_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedMember",
-  "fields":[
-    {"name":"joinedAtRevision_"}, 
-    {"name":"profileKey_"}, 
-    {"name":"role_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"aciBytes_"}, {"name":"joinedAtRevision_"}, {"name":"pniBytes_"}, {"name":"pni_"}, {"name":"profileKey_"}, {"name":"role_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedModifyMemberRole",
-  "fields":[
-    {"name":"role_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"role_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedPendingMember",
-  "fields":[
-    {"name":"addedByUuid_"}, 
-    {"name":"role_"}, 
-    {"name":"timestamp_"}, 
-    {"name":"uuidCipherText_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"addedByAci_"}, {"name":"addedByUuid_"}, {"name":"role_"}, {"name":"serviceIdBinary_"}, {"name":"serviceIdBytes_"}, {"name":"serviceIdCipherText_"}, {"name":"timestamp_"}, {"name":"uuidCipherText_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedPendingMemberRemoval",
-  "fields":[
-    {"name":"uuidCipherText_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"uuidCipherText_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedRequestingMember",
-  "fields":[
-    {"name":"profileKey_"}, 
-    {"name":"timestamp_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"aciBytes_"}, {"name":"profileKey_"}, {"name":"timestamp_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedString",
@@ -2010,6 +2301,9 @@
   "name":"org.signal.storageservice.protos.groups.local.DecryptedTimer",
   "fields":[{"name":"duration_"}]
 },
+{
+  "name":"org.slf4j.Logger"
+},
 {
   "name":"org.sqlite.JDBC"
 },
@@ -2017,40 +2311,55 @@
   "name":"org.whispersystems.signalservice.api.account.AccountAttributes",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"getCapabilities","parameterTypes":[] }, {"name":"getDiscoverableByPhoneNumber","parameterTypes":[] }, {"name":"getFetchesMessages","parameterTypes":[] }, {"name":"getName","parameterTypes":[] }, {"name":"getPniRegistrationId","parameterTypes":[] }, {"name":"getRecoveryPassword","parameterTypes":[] }, {"name":"getRegistrationId","parameterTypes":[] }, {"name":"getRegistrationLock","parameterTypes":[] }, {"name":"getSignalingKey","parameterTypes":[] }, {"name":"getUnidentifiedAccessKey","parameterTypes":[] }, {"name":"getUnrestrictedUnidentifiedAccess","parameterTypes":[] }, {"name":"getVideo","parameterTypes":[] }, {"name":"getVoice","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.account.AccountAttributes$Capabilities",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"getAnnouncementGroup","parameterTypes":[] }, {"name":"getAttachmentBackfill","parameterTypes":[] }, {"name":"getChangeNumber","parameterTypes":[] }, {"name":"getDeleteSync","parameterTypes":[] }, {"name":"getGiftBadges","parameterTypes":[] }, {"name":"getPaymentActivation","parameterTypes":[] }, {"name":"getPni","parameterTypes":[] }, {"name":"getSenderKey","parameterTypes":[] }, {"name":"getStorage","parameterTypes":[] }, {"name":"getStorageServiceEncryptionV2","parameterTypes":[] }, {"name":"getStories","parameterTypes":[] }, {"name":"getVersionedExpirationTimer","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest",
   "allDeclaredFields":true,
+  "allDeclaredClasses":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"getCode","parameterTypes":[] }, 
-    {"name":"getNumber","parameterTypes":[] }, 
-    {"name":"getRegistrationLock","parameterTypes":[] }
-  ]
+  "methods":[{"name":"getDeviceMessages","parameterTypes":[] }, {"name":"getDevicePniSignedPrekeys","parameterTypes":[] }, {"name":"getNumber","parameterTypes":[] }, {"name":"getPniIdentityKey","parameterTypes":[] }, {"name":"getPniRegistrationIds","parameterTypes":[] }, {"name":"getRegistrationLock","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.groupsv2.CredentialResponse",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.groupsv2.TemporalCredential",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.groupsv2.TemporalCredential[]"
 },
+{
+  "name":"org.whispersystems.signalservice.api.keys.OneTimePreKeyCounts",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.api.link.LinkedDeviceVerificationCodeResponse",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
+},
 {
   "name":"org.whispersystems.signalservice.api.messages.calls.HangupMessage",
   "allDeclaredFields":true,
@@ -2083,34 +2392,39 @@
   "name":"org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.profiles.SignalServiceProfile",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.profiles.SignalServiceProfile$Badge",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.profiles.SignalServiceProfile$Capabilities",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.profiles.SignalServiceProfileWrite",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","byte[]","byte[]","byte[]","byte[]","byte[]","boolean","boolean","byte[]","java.util.List"] }, {"name":"getAbout","parameterTypes":[] }, {"name":"getAboutEmoji","parameterTypes":[] }, {"name":"getAvatar","parameterTypes":[] }, {"name":"getBadgeIds","parameterTypes":[] }, {"name":"getCommitment","parameterTypes":[] }, {"name":"getName","parameterTypes":[] }, {"name":"getPaymentAddress","parameterTypes":[] }, {"name":"getPhoneNumberSharing","parameterTypes":[] }, {"name":"getSameAvatar","parameterTypes":[] }, {"name":"getVersion","parameterTypes":[] }]
 },
 {
-  "name":"org.whispersystems.signalservice.api.push.ACI",
+  "name":"org.whispersystems.signalservice.api.provisioning.ProvisioningMessage",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true
@@ -2119,13 +2433,29 @@
   "name":"org.whispersystems.signalservice.api.push.ServiceId",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
-  "queryAllDeclaredConstructors":true
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["org.signal.libsignal.protocol.ServiceId"] }, {"name":"equals","parameterTypes":["java.lang.Object"] }, {"name":"hashCode","parameterTypes":[] }, {"name":"logString","parameterTypes":[] }, {"name":"toByteArray","parameterTypes":[] }, {"name":"toByteString","parameterTypes":[] }, {"name":"toProtocolAddress","parameterTypes":["int"] }, {"name":"toString","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.api.push.ServiceId$ACI"
+},
+{
+  "name":"org.whispersystems.signalservice.api.push.ServiceId$Companion",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"equals","parameterTypes":["java.lang.Object"] }, {"name":"fromLibSignal","parameterTypes":["org.signal.libsignal.protocol.ServiceId"] }, {"name":"hashCode","parameterTypes":[] }, {"name":"parseOrNull","parameterTypes":["java.lang.String"] }, {"name":"parseOrNull","parameterTypes":["java.lang.String","boolean"] }, {"name":"parseOrNull","parameterTypes":["okio.ByteString"] }, {"name":"parseOrNull","parameterTypes":["byte[]"] }, {"name":"parseOrThrow","parameterTypes":["java.lang.String"] }, {"name":"parseOrThrow","parameterTypes":["okio.ByteString"] }, {"name":"parseOrThrow","parameterTypes":["byte[]"] }, {"name":"toString","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.api.push.ServiceId$PNI"
 },
 {
   "name":"org.whispersystems.signalservice.api.push.SignedPreKeyEntity",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "allDeclaredClasses":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getSignature","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.push.SignedPreKeyEntity$ByteArrayDeserializer",
@@ -2135,17 +2465,39 @@
   "name":"org.whispersystems.signalservice.api.push.SignedPreKeyEntity$ByteArraySerializer",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.whispersystems.signalservice.api.push.exceptions.NonNormalizedPhoneNumberException$JsonResponse",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }]
+},
+{
+  "name":"org.whispersystems.signalservice.api.ratelimit.SubmitRecaptchaChallengePayload",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
 {
   "name":"org.whispersystems.signalservice.api.storage.StorageAuthResponse",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.api.svr.Svr3Credentials",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","byte[]"] }, {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","byte[]","int","kotlin.jvm.internal.DefaultConstructorMarker"] }, {"name":"getAuthCredentials","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.contacts.crypto.SignatureBodyEntity",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.contacts.entities.DiscoveryRequest",
@@ -2163,13 +2515,16 @@
   "name":"org.whispersystems.signalservice.internal.contacts.entities.KeyBackupRequest",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "allDeclaredClasses":true,
+  "methods":[{"name":"getData","parameterTypes":[] }, {"name":"getIv","parameterTypes":[] }, {"name":"getMac","parameterTypes":[] }, {"name":"getRequestId","parameterTypes":[] }, {"name":"getType","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.contacts.entities.KeyBackupResponse",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.contacts.entities.MultiRemoteAttestationResponse",
@@ -2187,108 +2542,87 @@
   "name":"org.whispersystems.signalservice.internal.contacts.entities.RemoteAttestationRequest",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "allDeclaredClasses":true,
+  "methods":[{"name":"getClientPublic","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.contacts.entities.RemoteAttestationResponse",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.contacts.entities.TokenResponse",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.devices.DeviceNameProtos$DeviceName",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"ciphertext_"}, 
-    {"name":"ephemeralPublic_"}, 
-    {"name":"syntheticIv_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"ciphertext_"}, {"name":"ephemeralPublic_"}, {"name":"syntheticIv_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.keybackup.protos.BackupRequest",
-  "fields":[
-    {"name":"backupId_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"data_"}, 
-    {"name":"pin_"}, 
-    {"name":"serviceId_"}, 
-    {"name":"token_"}, 
-    {"name":"tries_"}, 
-    {"name":"validFrom_"}
-  ]
+  "fields":[{"name":"backupId_"}, {"name":"bitField0_"}, {"name":"data_"}, {"name":"pin_"}, {"name":"serviceId_"}, {"name":"token_"}, {"name":"tries_"}, {"name":"validFrom_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.keybackup.protos.BackupResponse",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"status_"}, 
-    {"name":"token_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"status_"}, {"name":"token_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.keybackup.protos.DeleteRequest",
-  "fields":[
-    {"name":"backupId_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"serviceId_"}
-  ]
+  "fields":[{"name":"backupId_"}, {"name":"bitField0_"}, {"name":"serviceId_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.keybackup.protos.Request",
-  "fields":[
-    {"name":"backup_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"delete_"}, 
-    {"name":"restore_"}
-  ]
+  "fields":[{"name":"backup_"}, {"name":"bitField0_"}, {"name":"delete_"}, {"name":"restore_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.keybackup.protos.Response",
-  "fields":[
-    {"name":"backup_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"delete_"}, 
-    {"name":"restore_"}
-  ]
+  "fields":[{"name":"backup_"}, {"name":"bitField0_"}, {"name":"delete_"}, {"name":"restore_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.keybackup.protos.RestoreRequest",
-  "fields":[
-    {"name":"backupId_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"pin_"}, 
-    {"name":"serviceId_"}, 
-    {"name":"token_"}, 
-    {"name":"validFrom_"}
-  ]
+  "fields":[{"name":"backupId_"}, {"name":"bitField0_"}, {"name":"pin_"}, {"name":"serviceId_"}, {"name":"token_"}, {"name":"validFrom_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.keybackup.protos.RestoreResponse",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"data_"}, 
-    {"name":"status_"}, 
-    {"name":"token_"}, 
-    {"name":"tries_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"data_"}, {"name":"status_"}, {"name":"token_"}, {"name":"tries_"}]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.AttachmentUploadForm",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["int","java.lang.String","java.util.Map","java.lang.String"] }, {"name":"<init>","parameterTypes":["int","java.lang.String","java.util.Map","java.lang.String","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.AttachmentV2UploadAttributes",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.AuthCredentials",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.ByteArrayDeserializerBase64",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.CdsiAuthResponse",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.ConfirmCodeMessage",
@@ -2296,23 +2630,60 @@
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.ConfirmUsernameRequest",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.ConfirmUsernameResponse",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.util.UUID"] }, {"name":"<init>","parameterTypes":["java.lang.String","java.util.UUID","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.DeviceCode",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.DeviceId",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.DeviceInfoList",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.GcmRegistrationId",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","boolean"] }, {"name":"getGcmRegistrationId","parameterTypes":[] }, {"name":"getWebSocketChannel","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.GetAciByUsernameResponse",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.GetUsernameFromLinkResponseBody",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }, {"name":"<init>","parameterTypes":["java.lang.String","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.GroupMismatchedDevices",
@@ -2328,29 +2699,75 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.KyberPreKeyEntity",
+  "allDeclaredFields":true,
+  "allDeclaredClasses":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getKeyId","parameterTypes":[] }, {"name":"getPublicKey","parameterTypes":[] }, {"name":"getSignature","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.KyberPreKeyEntity$ByteArrayDeserializer",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.KyberPreKeyEntity$ByteArraySerializer",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.KyberPreKeyEntity$KEMPublicKeyDeserializer",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.KyberPreKeyEntity$KEMPublicKeySerializer",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.LinkDeviceRequest",
+  "allDeclaredFields":true,
+  "allDeclaredClasses":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"accountAttributes","parameterTypes":[] }, {"name":"aciPqLastResortPreKey","parameterTypes":[] }, {"name":"aciSignedPreKey","parameterTypes":[] }, {"name":"pniPqLastResortPreKey","parameterTypes":[] }, {"name":"pniSignedPreKey","parameterTypes":[] }, {"name":"verificationCode","parameterTypes":[] }]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.MismatchedDevices",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.OneTimePreKeyCounts",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.OutgoingPushMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "allDeclaredClasses":true,
+  "methods":[{"name":"getDestinationDeviceId","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.OutgoingPushMessageList",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "allDeclaredClasses":true,
+  "methods":[{"name":"getDestination","parameterTypes":[] }, {"name":"getMessages","parameterTypes":[] }, {"name":"getTimestamp","parameterTypes":[] }, {"name":"isOnline","parameterTypes":[] }, {"name":"isUrgent","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.PreKeyEntity",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "allDeclaredClasses":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getKeyId","parameterTypes":[] }, {"name":"getPublicKey","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.PreKeyEntity$ECPublicKeyDeserializer",
@@ -2364,31 +2781,37 @@
   "name":"org.whispersystems.signalservice.internal.push.PreKeyResponse",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.PreKeyResponseItem",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.PreKeyState",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.PreKeyStatus",
-  "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "allDeclaredClasses":true,
+  "methods":[{"name":"getIdentityKey","parameterTypes":[] }, {"name":"getPreKeys","parameterTypes":[] }, {"name":"getSignedPreKey","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.ProfileAvatarUploadAttributes",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.ProofRequiredResponse",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.ProvisioningMessage",
@@ -2398,42 +2821,22 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.ProvisioningProtos$ProvisionEnvelope",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"body_"}, 
-    {"name":"publicKey_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"body_"}, {"name":"publicKey_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.ProvisioningProtos$ProvisionMessage",
-  "fields":[
-    {"name":"aciIdentityKeyPrivate_"}, 
-    {"name":"aciIdentityKeyPublic_"}, 
-    {"name":"aci_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"number_"}, 
-    {"name":"pniIdentityKeyPrivate_"}, 
-    {"name":"pniIdentityKeyPublic_"}, 
-    {"name":"pni_"}, 
-    {"name":"profileKey_"}, 
-    {"name":"provisioningCode_"}, 
-    {"name":"provisioningVersion_"}, 
-    {"name":"readReceipts_"}, 
-    {"name":"userAgent_"}
-  ]
+  "fields":[{"name":"aciIdentityKeyPrivate_"}, {"name":"aciIdentityKeyPublic_"}, {"name":"aci_"}, {"name":"bitField0_"}, {"name":"number_"}, {"name":"pniIdentityKeyPrivate_"}, {"name":"pniIdentityKeyPublic_"}, {"name":"pni_"}, {"name":"profileKey_"}, {"name":"provisioningCode_"}, {"name":"provisioningVersion_"}, {"name":"readReceipts_"}, {"name":"userAgent_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.ProvisioningProtos$ProvisioningUuid",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.PushServiceSocket$RegistrationLockFailure",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.PushServiceSocket$RegistrationLockV2",
@@ -2441,6 +2844,33 @@
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataJson",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.Integer","java.lang.Integer","java.lang.Integer","boolean","java.util.List","boolean"] }, {"name":"<init>","parameterTypes":["java.lang.String","java.lang.Integer","java.lang.Integer","java.lang.Integer","boolean","java.util.List","boolean","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.RegistrationSessionRequestBody",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","org.whispersystems.signalservice.api.account.AccountAttributes","java.lang.String","java.lang.String","org.whispersystems.signalservice.api.push.SignedPreKeyEntity","org.whispersystems.signalservice.api.push.SignedPreKeyEntity","org.whispersystems.signalservice.internal.push.KyberPreKeyEntity","org.whispersystems.signalservice.internal.push.KyberPreKeyEntity","org.whispersystems.signalservice.internal.push.GcmRegistrationId","boolean","boolean"] }, {"name":"getAccountAttributes","parameterTypes":[] }, {"name":"getAciIdentityKey","parameterTypes":[] }, {"name":"getAciPqLastResortPreKey","parameterTypes":[] }, {"name":"getAciSignedPreKey","parameterTypes":[] }, {"name":"getGcmToken","parameterTypes":[] }, {"name":"getPniIdentityKey","parameterTypes":[] }, {"name":"getPniPqLastResortPreKey","parameterTypes":[] }, {"name":"getPniSignedPreKey","parameterTypes":[] }, {"name":"getRecoveryPassword","parameterTypes":[] }, {"name":"getRequireAtomic","parameterTypes":[] }, {"name":"getSessionId","parameterTypes":[] }, {"name":"getSkipDeviceTransfer","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.ReserveUsernameRequest",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.ReserveUsernameResponse",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.SendGroupMessageResponse",
   "allDeclaredFields":true,
@@ -2452,660 +2882,33 @@
   "name":"org.whispersystems.signalservice.internal.push.SendMessageResponse",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SenderCertificate",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SenderCertificate$ByteArrayDesieralizer",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$AttachmentPointer",
-  "fields":[
-    {"name":"attachmentIdentifierCase_"}, 
-    {"name":"attachmentIdentifier_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"blurHash_"}, 
-    {"name":"caption_"}, 
-    {"name":"cdnNumber_"}, 
-    {"name":"contentType_"}, 
-    {"name":"digest_"}, 
-    {"name":"fileName_"}, 
-    {"name":"flags_"}, 
-    {"name":"height_"}, 
-    {"name":"key_"}, 
-    {"name":"size_"}, 
-    {"name":"thumbnail_"}, 
-    {"name":"uploadTimestamp_"}, 
-    {"name":"width_"}
-  ]
+  "name":"org.whispersystems.signalservice.internal.push.SetUsernameLinkRequestBody",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }, {"name":"<init>","parameterTypes":["java.lang.String","boolean"] }, {"name":"getKeepLinkHandle","parameterTypes":[] }, {"name":"getUsernameLinkEncryptedValue","parameterTypes":[] }]
 },
 {
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage",
-  "fields":[
-    {"name":"answer_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"busy_"}, 
-    {"name":"destinationDeviceId_"}, 
-    {"name":"hangup_"}, 
-    {"name":"iceUpdate_"}, 
-    {"name":"legacyHangup_"}, 
-    {"name":"multiRing_"}, 
-    {"name":"offer_"}, 
-    {"name":"opaque_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage$Answer",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"id_"}, 
-    {"name":"opaque_"}, 
-    {"name":"sdp_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage$Hangup",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"deviceId_"}, 
-    {"name":"id_"}, 
-    {"name":"type_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage$IceUpdate",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"id_"}, 
-    {"name":"line_"}, 
-    {"name":"mid_"}, 
-    {"name":"opaque_"}, 
-    {"name":"sdp_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage$Offer",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"id_"}, 
-    {"name":"opaque_"}, 
-    {"name":"sdp_"}, 
-    {"name":"type_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage$Opaque",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"data_"}, 
-    {"name":"urgency_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$ContactDetails",
-  "fields":[
-    {"name":"archived_"}, 
-    {"name":"avatar_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"blocked_"}, 
-    {"name":"color_"}, 
-    {"name":"expireTimer_"}, 
-    {"name":"inboxPosition_"}, 
-    {"name":"name_"}, 
-    {"name":"number_"}, 
-    {"name":"profileKey_"}, 
-    {"name":"uuid_"}, 
-    {"name":"verified_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$ContactDetails$Avatar",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"contentType_"}, 
-    {"name":"length_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$Content",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"callMessage_"}, 
-    {"name":"dataMessage_"}, 
-    {"name":"decryptionErrorMessage_"}, 
-    {"name":"nullMessage_"}, 
-    {"name":"receiptMessage_"}, 
-    {"name":"senderKeyDistributionMessage_"}, 
-    {"name":"storyMessage_"}, 
-    {"name":"syncMessage_"}, 
-    {"name":"typingMessage_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage",
-  "fields":[
-    {"name":"attachments_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"bodyRanges_"}, 
-    {"name":"body_"}, 
-    {"name":"contact_"}, 
-    {"name":"delete_"}, 
-    {"name":"expireTimer_"}, 
-    {"name":"flags_"}, 
-    {"name":"giftBadge_"}, 
-    {"name":"groupCallUpdate_"}, 
-    {"name":"groupV2_"}, 
-    {"name":"group_"}, 
-    {"name":"isViewOnce_"}, 
-    {"name":"payment_"}, 
-    {"name":"preview_"}, 
-    {"name":"profileKey_"}, 
-    {"name":"quote_"}, 
-    {"name":"reaction_"}, 
-    {"name":"requiredProtocolVersion_"}, 
-    {"name":"sticker_"}, 
-    {"name":"storyContext_"}, 
-    {"name":"timestamp_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$BodyRange",
-  "fields":[
-    {"name":"associatedValueCase_"}, 
-    {"name":"associatedValue_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"length_"}, 
-    {"name":"start_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Contact",
-  "fields":[
-    {"name":"address_"}, 
-    {"name":"avatar_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"email_"}, 
-    {"name":"name_"}, 
-    {"name":"number_"}, 
-    {"name":"organization_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Contact$Avatar",
-  "fields":[
-    {"name":"avatar_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"isProfile_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Contact$Email",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"label_"}, 
-    {"name":"type_"}, 
-    {"name":"value_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Contact$Name",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"displayName_"}, 
-    {"name":"familyName_"}, 
-    {"name":"givenName_"}, 
-    {"name":"middleName_"}, 
-    {"name":"prefix_"}, 
-    {"name":"suffix_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Contact$Phone",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"label_"}, 
-    {"name":"type_"}, 
-    {"name":"value_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Contact$PostalAddress",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"city_"}, 
-    {"name":"country_"}, 
-    {"name":"label_"}, 
-    {"name":"neighborhood_"}, 
-    {"name":"pobox_"}, 
-    {"name":"postcode_"}, 
-    {"name":"region_"}, 
-    {"name":"street_"}, 
-    {"name":"type_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Delete",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"targetSentTimestamp_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$GroupCallUpdate",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"eraId_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Payment",
-  "fields":[
-    {"name":"itemCase_"}, 
-    {"name":"item_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Payment$Notification",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"note_"}, 
-    {"name":"transactionCase_"}, 
-    {"name":"transaction_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Payment$Notification$MobileCoin",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"receipt_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Quote",
-  "fields":[
-    {"name":"attachments_"}, 
-    {"name":"authorUuid_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"bodyRanges_"}, 
-    {"name":"id_"}, 
-    {"name":"text_"}, 
-    {"name":"type_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Quote$QuotedAttachment",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"contentType_"}, 
-    {"name":"fileName_"}, 
-    {"name":"thumbnail_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Reaction",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"emoji_"}, 
-    {"name":"remove_"}, 
-    {"name":"targetAuthorUuid_"}, 
-    {"name":"targetSentTimestamp_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Sticker",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"data_"}, 
-    {"name":"emoji_"}, 
-    {"name":"packId_"}, 
-    {"name":"packKey_"}, 
-    {"name":"stickerId_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$StoryContext",
-  "fields":[
-    {"name":"authorUuid_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"sentTimestamp_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$Envelope",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"content_"}, 
-    {"name":"destinationUuid_"}, 
-    {"name":"legacyMessage_"}, 
-    {"name":"relay_"}, 
-    {"name":"serverGuid_"}, 
-    {"name":"serverTimestamp_"}, 
-    {"name":"sourceDevice_"}, 
-    {"name":"sourceE164_"}, 
-    {"name":"sourceUuid_"}, 
-    {"name":"timestamp_"}, 
-    {"name":"type_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupContext",
-  "fields":[
-    {"name":"avatar_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"id_"}, 
-    {"name":"membersE164_"}, 
-    {"name":"members_"}, 
-    {"name":"name_"}, 
-    {"name":"type_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupContext$Member",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"e164_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupContextV2",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"groupChange_"}, 
-    {"name":"masterKey_"}, 
-    {"name":"revision_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupDetails",
-  "fields":[
-    {"name":"active_"}, 
-    {"name":"archived_"}, 
-    {"name":"avatar_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"blocked_"}, 
-    {"name":"color_"}, 
-    {"name":"expireTimer_"}, 
-    {"name":"id_"}, 
-    {"name":"inboxPosition_"}, 
-    {"name":"membersE164_"}, 
-    {"name":"members_"}, 
-    {"name":"name_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupDetails$Avatar",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"contentType_"}, 
-    {"name":"length_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupDetails$Member",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"e164_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$NullMessage",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"padding_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$PaymentAddress",
-  "fields":[
-    {"name":"addressCase_"}, 
-    {"name":"address_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$PaymentAddress$MobileCoinAddress",
-  "fields":[
-    {"name":"address_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"signature_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$Preview",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"date_"}, 
-    {"name":"description_"}, 
-    {"name":"image_"}, 
-    {"name":"title_"}, 
-    {"name":"url_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$ReceiptMessage",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"timestamp_"}, 
-    {"name":"type_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$StoryMessage",
-  "fields":[
-    {"name":"allowsReplies_"}, 
-    {"name":"attachmentCase_"}, 
-    {"name":"attachment_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"group_"}, 
-    {"name":"profileKey_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"blocked_"}, 
-    {"name":"configuration_"}, 
-    {"name":"contacts_"}, 
-    {"name":"fetchLatest_"}, 
-    {"name":"groups_"}, 
-    {"name":"keys_"}, 
-    {"name":"messageRequestResponse_"}, 
-    {"name":"outgoingPayment_"}, 
-    {"name":"padding_"}, 
-    {"name":"pniIdentity_"}, 
-    {"name":"read_"}, 
-    {"name":"request_"}, 
-    {"name":"sent_"}, 
-    {"name":"stickerPackOperation_"}, 
-    {"name":"verified_"}, 
-    {"name":"viewOnceOpen_"}, 
-    {"name":"viewed_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Blocked",
-  "fields":[
-    {"name":"groupIds_"}, 
-    {"name":"numbers_"}, 
-    {"name":"uuids_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Configuration",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"linkPreviews_"}, 
-    {"name":"provisioningVersion_"}, 
-    {"name":"readReceipts_"}, 
-    {"name":"typingIndicators_"}, 
-    {"name":"unidentifiedDeliveryIndicators_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Contacts",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"blob_"}, 
-    {"name":"complete_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$FetchLatest",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"type_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Groups",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"blob_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Keys",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"storageService_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$MessageRequestResponse",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"groupId_"}, 
-    {"name":"threadUuid_"}, 
-    {"name":"type_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$OutgoingPayment",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"note_"}, 
-    {"name":"paymentDetailCase_"}, 
-    {"name":"paymentDetail_"}, 
-    {"name":"recipientUuid_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$OutgoingPayment$MobileCoin",
-  "fields":[
-    {"name":"amountPicoMob_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"feePicoMob_"}, 
-    {"name":"ledgerBlockIndex_"}, 
-    {"name":"ledgerBlockTimestamp_"}, 
-    {"name":"outputPublicKeys_"}, 
-    {"name":"receipt_"}, 
-    {"name":"recipientAddress_"}, 
-    {"name":"spentKeyImages_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$PniIdentity",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"privateKey_"}, 
-    {"name":"publicKey_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Read",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"senderUuid_"}, 
-    {"name":"timestamp_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Request",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"type_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Sent",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"destinationUuid_"}, 
-    {"name":"expirationStartTimestamp_"}, 
-    {"name":"isRecipientUpdate_"}, 
-    {"name":"message_"}, 
-    {"name":"storyMessageRecipients_"}, 
-    {"name":"storyMessage_"}, 
-    {"name":"timestamp_"}, 
-    {"name":"unidentifiedStatus_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Sent$StoryMessageRecipient",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"destinationUuid_"}, 
-    {"name":"distributionListIds_"}, 
-    {"name":"isAllowedToReply_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Sent$UnidentifiedDeliveryStatus",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"destinationUuid_"}, 
-    {"name":"unidentified_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$StickerPackOperation",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"packId_"}, 
-    {"name":"packKey_"}, 
-    {"name":"type_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$ViewOnceOpen",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"senderUuid_"}, 
-    {"name":"timestamp_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Viewed",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"senderUuid_"}, 
-    {"name":"timestamp_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$TypingMessage",
-  "fields":[
-    {"name":"action_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"groupId_"}, 
-    {"name":"timestamp_"}
-  ]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$Verified",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"destinationUuid_"}, 
-    {"name":"identityKey_"}, 
-    {"name":"nullMessage_"}, 
-    {"name":"state_"}
-  ]
+  "name":"org.whispersystems.signalservice.internal.push.SetUsernameLinkResponseBody",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.util.UUID"] }, {"name":"<init>","parameterTypes":["java.util.UUID","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.StaleDevices",
@@ -3114,114 +2917,181 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.SubmitRecaptchaChallengePayload",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.UpdateVerificationSessionRequestBody",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"getCaptcha","parameterTypes":[] }, {"name":"getMcc","parameterTypes":[] }, {"name":"getMnc","parameterTypes":[] }, {"name":"getPushChallenge","parameterTypes":[] }, {"name":"getPushToken","parameterTypes":[] }, {"name":"getPushTokenType","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.VerificationCodeFailureResponseBody",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["boolean","java.lang.String"] }, {"name":"<init>","parameterTypes":["boolean","java.lang.String","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.VerificationSessionMetadataRequestBody",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"getMcc","parameterTypes":[] }, {"name":"getMnc","parameterTypes":[] }, {"name":"getNumber","parameterTypes":[] }, {"name":"getPushToken","parameterTypes":[] }, {"name":"getPushTokenType","parameterTypes":[] }]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.VerifyAccountResponse",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.WhoAmIResponse",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","java.lang.String","org.whispersystems.signalservice.internal.push.WhoAmIResponse$Entitlements"] }, {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","java.lang.String","org.whispersystems.signalservice.internal.push.WhoAmIResponse$Entitlements","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.WhoAmIResponse$BackupEntitlement",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.Long","java.lang.Long"] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.WhoAmIResponse$BadgeEntitlement",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.Boolean","java.lang.Long"] }, {"name":"<init>","parameterTypes":["java.lang.String","java.lang.Boolean","java.lang.Long","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.WhoAmIResponse$Entitlements",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.util.List","org.whispersystems.signalservice.internal.push.WhoAmIResponse$BackupEntitlement"] }, {"name":"<init>","parameterTypes":["java.util.List","org.whispersystems.signalservice.internal.push.WhoAmIResponse$BackupEntitlement","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.serialize.protos.AddressProto",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"e164_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"e164_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.serialize.protos.MetadataProto",
-  "fields":[
-    {"name":"address_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"destinationUuid_"}, 
-    {"name":"groupId_"}, 
-    {"name":"needsReceipt_"}, 
-    {"name":"senderDevice_"}, 
-    {"name":"serverDeliveredTimestamp_"}, 
-    {"name":"serverGuid_"}, 
-    {"name":"serverReceivedTimestamp_"}, 
-    {"name":"timestamp_"}
-  ]
+  "fields":[{"name":"address_"}, {"name":"bitField0_"}, {"name":"destinationUuid_"}, {"name":"groupId_"}, {"name":"needsReceipt_"}, {"name":"senderDevice_"}, {"name":"serverDeliveredTimestamp_"}, {"name":"serverGuid_"}, {"name":"serverReceivedTimestamp_"}, {"name":"timestamp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"dataCase_"}, 
-    {"name":"data_"}, 
-    {"name":"localAddress_"}, 
-    {"name":"metadata_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"dataCase_"}, {"name":"data_"}, {"name":"localAddress_"}, {"name":"metadata_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.sticker.StickerProtos$Pack",
-  "fields":[
-    {"name":"author_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"cover_"}, 
-    {"name":"stickers_"}, 
-    {"name":"title_"}
-  ]
+  "fields":[{"name":"author_"}, {"name":"bitField0_"}, {"name":"cover_"}, {"name":"stickers_"}, {"name":"title_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.sticker.StickerProtos$Pack$Sticker",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"contentType_"}, 
-    {"name":"emoji_"}, 
-    {"name":"id_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"contentType_"}, {"name":"emoji_"}, {"name":"id_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord",
-  "allDeclaredFields":true
+  "allDeclaredFields":true,
+  "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$BackupTierHistory"
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$Builder"
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$Companion"
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$IAPSubscriberData"
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$NotificationProfileManualOverride"
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$PhoneNumberSharingMode"
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$PinnedConversation",
-  "fields":[
-    {"name":"identifierCase_"}, 
-    {"name":"identifier_"}
-  ]
+  "fields":[{"name":"identifierCase_"}, {"name":"identifier_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$PinnedConversation$Contact",
-  "fields":[
-    {"name":"e164_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"e164_"}, {"name":"serviceId_"}, {"name":"uuid_"}]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$UsernameLink",
+  "allDeclaredFields":true
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.AvatarColor"
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord",
+  "allDeclaredFields":true,
+  "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord$Builder"
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord$Companion"
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord$IdentityState"
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord$Name",
   "allDeclaredFields":true
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV1Record",
-  "allDeclaredFields":true
+  "allDeclaredFields":true,
+  "fields":[{"name":"archived"}, {"name":"blocked"}, {"name":"id"}, {"name":"markedUnread"}, {"name":"mutedUntilTimestamp"}, {"name":"whitelisted"}],
+  "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV1Record$Builder"
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV1Record$Companion"
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV2Record",
-  "allDeclaredFields":true
+  "allDeclaredFields":true,
+  "fields":[{"name":"archived"}, {"name":"avatarColor"}, {"name":"blocked"}, {"name":"dontNotifyForMentionsIfMuted"}, {"name":"hideStory"}, {"name":"markedUnread"}, {"name":"masterKey"}, {"name":"mutedUntilTimestamp"}, {"name":"storySendMode"}, {"name":"whitelisted"}],
+  "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV2Record$Builder"
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV2Record$Companion"
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV2Record$StorySendMode"
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ManifestRecord",
-  "fields":[
-    {"name":"identifiers_"}, 
-    {"name":"version_"}
-  ]
+  "fields":[{"name":"identifiers_"}, {"name":"sourceDevice_"}, {"name":"version_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ManifestRecord$Identifier",
-  "fields":[
-    {"name":"raw_"}, 
-    {"name":"type_"}
-  ]
+  "fields":[{"name":"raw_"}, {"name":"type_"}]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.OptionalBool"
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.Payments",
@@ -3233,10 +3103,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.StorageItem",
-  "fields":[
-    {"name":"key_"}, 
-    {"name":"value_"}
-  ]
+  "fields":[{"name":"key_"}, {"name":"value_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.StorageItems",
@@ -3244,17 +3111,11 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.StorageManifest",
-  "fields":[
-    {"name":"value_"}, 
-    {"name":"version_"}
-  ]
+  "fields":[{"name":"value_"}, {"name":"version_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.StorageRecord",
-  "fields":[
-    {"name":"recordCase_"}, 
-    {"name":"record_"}
-  ]
+  "fields":[{"name":"recordCase_"}, {"name":"record_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.StoryDistributionListRecord",
@@ -3282,75 +3143,20 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.websocket.WebSocketProtos$WebSocketMessage",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"request_"}, 
-    {"name":"response_"}, 
-    {"name":"type_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"request_"}, {"name":"response_"}, {"name":"type_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.websocket.WebSocketProtos$WebSocketRequestMessage",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"body_"}, 
-    {"name":"headers_"}, 
-    {"name":"id_"}, 
-    {"name":"path_"}, 
-    {"name":"verb_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"body_"}, {"name":"headers_"}, {"name":"id_"}, {"name":"path_"}, {"name":"verb_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.websocket.WebSocketProtos$WebSocketResponseMessage",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"body_"}, 
-    {"name":"headers_"}, 
-    {"name":"id_"}, 
-    {"name":"message_"}, 
-    {"name":"status_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"body_"}, {"name":"headers_"}, {"name":"id_"}, {"name":"message_"}, {"name":"status_"}]
 },
 {
   "name":"sun.misc.Unsafe",
   "allDeclaredFields":true,
-  "methods":[
-    {"name":"allocateMemory","parameterTypes":["long"] }, 
-    {"name":"arrayBaseOffset","parameterTypes":["java.lang.Class"] }, 
-    {"name":"arrayIndexScale","parameterTypes":["java.lang.Class"] }, 
-    {"name":"copyMemory","parameterTypes":["long","long","long"] }, 
-    {"name":"copyMemory","parameterTypes":["java.lang.Object","long","java.lang.Object","long","long"] }, 
-    {"name":"freeMemory","parameterTypes":["long"] }, 
-    {"name":"getAddress","parameterTypes":["long"] }, 
-    {"name":"getBoolean","parameterTypes":["java.lang.Object","long"] }, 
-    {"name":"getByte","parameterTypes":["long"] }, 
-    {"name":"getByte","parameterTypes":["java.lang.Object","long"] }, 
-    {"name":"getDouble","parameterTypes":["long"] }, 
-    {"name":"getDouble","parameterTypes":["java.lang.Object","long"] }, 
-    {"name":"getFloat","parameterTypes":["long"] }, 
-    {"name":"getFloat","parameterTypes":["java.lang.Object","long"] }, 
-    {"name":"getInt","parameterTypes":["long"] }, 
-    {"name":"getInt","parameterTypes":["java.lang.Object","long"] }, 
-    {"name":"getLong","parameterTypes":["long"] }, 
-    {"name":"getLong","parameterTypes":["java.lang.Object","long"] }, 
-    {"name":"getObject","parameterTypes":["java.lang.Object","long"] }, 
-    {"name":"getShort","parameterTypes":["long"] }, 
-    {"name":"objectFieldOffset","parameterTypes":["java.lang.reflect.Field"] }, 
-    {"name":"putAddress","parameterTypes":["long","long"] }, 
-    {"name":"putBoolean","parameterTypes":["java.lang.Object","long","boolean"] }, 
-    {"name":"putByte","parameterTypes":["long","byte"] }, 
-    {"name":"putByte","parameterTypes":["java.lang.Object","long","byte"] }, 
-    {"name":"putDouble","parameterTypes":["long","double"] }, 
-    {"name":"putDouble","parameterTypes":["java.lang.Object","long","double"] }, 
-    {"name":"putFloat","parameterTypes":["long","float"] }, 
-    {"name":"putFloat","parameterTypes":["java.lang.Object","long","float"] }, 
-    {"name":"putInt","parameterTypes":["long","int"] }, 
-    {"name":"putInt","parameterTypes":["java.lang.Object","long","int"] }, 
-    {"name":"putLong","parameterTypes":["long","long"] }, 
-    {"name":"putLong","parameterTypes":["java.lang.Object","long","long"] }, 
-    {"name":"putObject","parameterTypes":["java.lang.Object","long","java.lang.Object"] }, 
-    {"name":"putShort","parameterTypes":["long","short"] }
-  ]
+  "methods":[{"name":"allocateMemory","parameterTypes":["long"] }, {"name":"arrayBaseOffset","parameterTypes":["java.lang.Class"] }, {"name":"arrayIndexScale","parameterTypes":["java.lang.Class"] }, {"name":"copyMemory","parameterTypes":["long","long","long"] }, {"name":"copyMemory","parameterTypes":["java.lang.Object","long","java.lang.Object","long","long"] }, {"name":"freeMemory","parameterTypes":["long"] }, {"name":"getAddress","parameterTypes":["long"] }, {"name":"getBoolean","parameterTypes":["java.lang.Object","long"] }, {"name":"getByte","parameterTypes":["long"] }, {"name":"getByte","parameterTypes":["java.lang.Object","long"] }, {"name":"getDouble","parameterTypes":["long"] }, {"name":"getDouble","parameterTypes":["java.lang.Object","long"] }, {"name":"getFloat","parameterTypes":["long"] }, {"name":"getFloat","parameterTypes":["java.lang.Object","long"] }, {"name":"getInt","parameterTypes":["long"] }, {"name":"getInt","parameterTypes":["java.lang.Object","long"] }, {"name":"getLong","parameterTypes":["long"] }, {"name":"getLong","parameterTypes":["java.lang.Object","long"] }, {"name":"getObject","parameterTypes":["java.lang.Object","long"] }, {"name":"getShort","parameterTypes":["long"] }, {"name":"objectFieldOffset","parameterTypes":["java.lang.reflect.Field"] }, {"name":"putAddress","parameterTypes":["long","long"] }, {"name":"putBoolean","parameterTypes":["java.lang.Object","long","boolean"] }, {"name":"putByte","parameterTypes":["long","byte"] }, {"name":"putByte","parameterTypes":["java.lang.Object","long","byte"] }, {"name":"putDouble","parameterTypes":["long","double"] }, {"name":"putDouble","parameterTypes":["java.lang.Object","long","double"] }, {"name":"putFloat","parameterTypes":["long","float"] }, {"name":"putFloat","parameterTypes":["java.lang.Object","long","float"] }, {"name":"putInt","parameterTypes":["long","int"] }, {"name":"putInt","parameterTypes":["java.lang.Object","long","int"] }, {"name":"putLong","parameterTypes":["long","long"] }, {"name":"putLong","parameterTypes":["java.lang.Object","long","long"] }, {"name":"putObject","parameterTypes":["java.lang.Object","long","java.lang.Object"] }, {"name":"putShort","parameterTypes":["long","short"] }]
 },
 {
   "name":"sun.security.provider.DSA$SHA224withDSA",
@@ -3366,11 +3172,11 @@
 },
 {
   "name":"sun.security.provider.NativePRNG",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"<init>","parameterTypes":["java.security.SecureRandomParameters"] }]
 },
 {
   "name":"sun.security.provider.NativePRNG$NonBlocking",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"<init>","parameterTypes":["java.security.SecureRandomParameters"] }]
 },
 {
   "name":"sun.security.provider.SHA",
@@ -3394,12 +3200,20 @@
 },
 {
   "name":"sun.security.provider.SecureRandom",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"<init>","parameterTypes":["java.security.SecureRandomParameters"] }]
+},
+{
+  "name":"sun.security.provider.certpath.CollectionCertStore",
+  "methods":[{"name":"<init>","parameterTypes":["java.security.cert.CertStoreParameters"] }]
 },
 {
   "name":"sun.security.provider.certpath.PKIXCertPathValidator",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"sun.security.provider.certpath.SunCertPathBuilder",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"sun.security.rsa.PSSParameters",
   "methods":[{"name":"<init>","parameterTypes":[] }]
diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index 1de22f76..8bd8a7af 100644
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -1,241 +1,226 @@
 {
   "resources":{
-  "includes":[
-    {
-      "pattern":"\\QMETA-INF/maven/org.xerial/sqlite-jdbc/pom.properties\\E"
-    }, 
-    {
-      "pattern":"\\QMETA-INF/services/ch.qos.logback.classic.spi.Configurator\\E"
-    }, 
-    {
-      "pattern":"\\QMETA-INF/services/java.sql.Driver\\E"
-    }, 
-    {
-      "pattern":"\\QMETA-INF/services/org.freedesktop.dbus.spi.transport.ITransportProvider\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK\\E"
-    }, 
-    {
-      "pattern":"\\Qjni/x86_64-Linux/libjffi-1.2.so\\E"
-    }, 
-    {
-      "pattern":"\\Qlibsignal_jni.so\\E"
-    }, 
-    {
-      "pattern":"\\Qorg/asamk/signal/manager/config/ias.store\\E"
-    }, 
-    {
-      "pattern":"\\Qorg/asamk/signal/manager/config/whisper.store\\E"
-    }, 
-    {
-      "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
-    }, 
-    {
-      "pattern":"\\Qorg/sqlite/native/Linux/x86_64/libsqlitejdbc.so\\E"
-    }, 
-    {
-      "pattern":"\\Qsqlite-jdbc.properties\\E"
-    }, 
-    {
-      "pattern":"com/google/i18n/phonenumbers/data/.*"
-    }
-  ]},
+  "includes":[{
+    "pattern":"\\QMETA-INF/maven/org.xerial/sqlite-jdbc/pom.properties\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/ch.qos.logback.classic.spi.Configurator\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/com.sun.net.httpserver.spi.HttpServerProvider\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/java.lang.System$LoggerFinder\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/java.net.spi.InetAddressResolverProvider\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/java.net.spi.URLStreamHandlerProvider\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/java.nio.channels.spi.SelectorProvider\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/java.nio.file.spi.FileTypeDetector\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/java.sql.Driver\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/java.time.zone.ZoneRulesProvider\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/java.util.spi.ResourceBundleControlProvider\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/kotlin.reflect.jvm.internal.impl.builtins.BuiltInsLoader\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/kotlin.reflect.jvm.internal.impl.resolve.ExternalOverridabilityCondition\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/kotlin.reflect.jvm.internal.impl.util.ModuleVisibilityHelper\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/org.freedesktop.dbus.spi.message.ISocketProvider\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/org.freedesktop.dbus.spi.transport.ITransportProvider\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/org.slf4j.spi.SLF4JServiceProvider\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK\\E"
+  }, {
+    "pattern":"\\Qjni/x86_64-Linux/libjffi-1.2.so\\E"
+  }, {
+    "pattern":"\\Qkotlin/annotation/annotation.kotlin_builtins\\E"
+  }, {
+    "pattern":"\\Qkotlin/collections/collections.kotlin_builtins\\E"
+  }, {
+    "pattern":"\\Qkotlin/coroutines/coroutines.kotlin_builtins\\E"
+  }, {
+    "pattern":"\\Qkotlin/internal/internal.kotlin_builtins\\E"
+  }, {
+    "pattern":"\\Qkotlin/jvm/jvm.kotlin_builtins\\E"
+  }, {
+    "pattern":"\\Qkotlin/kotlin.kotlin_builtins\\E"
+  }, {
+    "pattern":"\\Qkotlin/ranges/ranges.kotlin_builtins\\E"
+  }, {
+    "pattern":"\\Qkotlin/reflect/reflect.kotlin_builtins\\E"
+  }, {
+    "pattern":"\\Qlibsignal_jni.so\\E"
+  }, {
+    "pattern":"\\Qlibsignal_jni_aarch64.dylib\\E"
+  }, {
+    "pattern":"\\Qlibsignal_jni_amd64.dylib\\E"
+  }, {
+    "pattern":"\\Qlibsignal_jni_amd64.so\\E"
+  }, {
+    "pattern":"\\Qorg/asamk/signal/manager/config/ias.store\\E"
+  }, {
+    "pattern":"\\Qorg/asamk/signal/manager/config/whisper.store\\E"
+  }, {
+    "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
+  }, {
+    "pattern":"\\Qorg/sqlite/native/Linux/x86_64/libsqlitejdbc.so\\E"
+  }, {
+    "pattern":"\\Qsignal_jni.dll\\E"
+  }, {
+    "pattern":"\\Qsignal_jni_amd64.dll\\E"
+  }, {
+    "pattern":"\\Qsqlite-jdbc.properties\\E"
+  }, {
+    "pattern":"com/google/i18n/phonenumbers/data/.*"
+  }, {
+    "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt67b/nfc.nrm\\E"
+  }, {
+    "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt67b/uprops.icu\\E"
+  }, {
+    "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt72b/nfc.nrm\\E"
+  }, {
+    "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt72b/uprops.icu\\E"
+  }, {
+    "pattern":"java.base:\\Qsun/net/idn/uidna.spp\\E"
+  }, {
+    "pattern":"java.base:\\Qsun/net/www/content-types.properties\\E"
+  }, {
+    "pattern":"java.base:\\Qsun/text/resources/LineBreakIteratorData\\E"
+  }]},
   "bundles":[{
-      "name":"net.sourceforge.argparse4j.internal.ArgumentParserImpl",
-      "locales":[
-        "", 
-        "en", 
-        "und"
-      ]
-    }]
+    "name":"net.sourceforge.argparse4j.internal.ArgumentParserImpl",
+    "locales":["", "de", "en", "und"]
+  }]
 }
diff --git a/graalvm-config-dir/serialization-config.json b/graalvm-config-dir/serialization-config.json
index bf554e06..f3d7e06e 100644
--- a/graalvm-config-dir/serialization-config.json
+++ b/graalvm-config-dir/serialization-config.json
@@ -2,5 +2,7 @@
   "types":[
   ],
   "lambdaCapturingTypes":[
+  ],
+  "proxies":[
   ]
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 00000000..fec44a43
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,17 @@
+[versions]
+slf4j = "2.0.17"
+
+[libraries]
+bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.81"
+jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.19.1"
+argparse4j = "net.sourceforge.argparse4j:argparse4j:0.9.0"
+dbusjava = "com.github.hypfvieh:dbus-java-transport-native-unixsocket:5.0.0"
+slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
+slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
+logback = "ch.qos.logback:logback-classic:1.5.18"
+
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_127"
+sqlite = "org.xerial:sqlite-jdbc:3.50.2.0"
+hikari = "com.zaxxer:HikariCP:6.3.0"
+junit-jupiter = "org.junit.jupiter:junit-jupiter:5.13.2"
+junit-launcher = "org.junit.platform:junit-platform-launcher:1.13.2"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927a..8bdaf60c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa991fce..2a84e188 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c7873..ef07e016 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -133,22 +133,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +200,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f9..5eed7ee8 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,32 +59,34 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index cad9ca8b..c8f22f7c 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -4,23 +4,37 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
 }
 
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
+val libsignalClientPath = project.findProperty("libsignal_client_path")?.toString()
 
 dependencies {
-    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_49")
-    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.3")
-    implementation("com.google.protobuf", "protobuf-javalite", "3.11.4")
-    implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
-    implementation("org.slf4j", "slf4j-api", "1.7.36")
-    implementation("org.xerial", "sqlite-jdbc", "3.36.0.3")
-    implementation("com.zaxxer", "HikariCP", "5.0.1")
+    if (libsignalClientPath == null) {
+        implementation(libs.signalservice)
+    } else {
+        implementation(libs.signalservice) {
+            exclude(group = "org.signal", module = "libsignal-client")
+        }
+        implementation(files(libsignalClientPath))
+    }
+    implementation(libs.jackson.databind)
+    implementation(libs.bouncycastle)
+    implementation(libs.slf4j.api)
+    implementation(libs.sqlite)
+    implementation(libs.hikari)
+
+    testImplementation(libs.junit.jupiter)
+    testRuntimeOnly(libs.junit.launcher)
+}
+
+tasks.named<Test>("test") {
+    useJUnitPlatform()
 }
 
 configurations {
diff --git a/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java b/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java
deleted file mode 100644
index f983a90b..00000000
--- a/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.asamk.signal.manager;
-
-import org.asamk.signal.manager.util.IOUtils;
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-public class AttachmentStore {
-
-    private final File attachmentsPath;
-
-    public AttachmentStore(final File attachmentsPath) {
-        this.attachmentsPath = attachmentsPath;
-    }
-
-    public void storeAttachmentPreview(
-            final SignalServiceAttachmentRemoteId attachmentId, final AttachmentStorer storer
-    ) throws IOException {
-        storeAttachment(getAttachmentPreviewFile(attachmentId), storer);
-    }
-
-    public void storeAttachment(
-            final SignalServiceAttachmentRemoteId attachmentId, final AttachmentStorer storer
-    ) throws IOException {
-        storeAttachment(getAttachmentFile(attachmentId), storer);
-    }
-
-    private void storeAttachment(final File attachmentFile, final AttachmentStorer storer) throws IOException {
-        createAttachmentsDir();
-        try (OutputStream output = new FileOutputStream(attachmentFile)) {
-            storer.store(output);
-        }
-    }
-
-    private File getAttachmentPreviewFile(SignalServiceAttachmentRemoteId attachmentId) {
-        return new File(attachmentsPath, attachmentId.toString() + ".preview");
-    }
-
-    public File getAttachmentFile(SignalServiceAttachmentRemoteId attachmentId) {
-        return new File(attachmentsPath, attachmentId.toString());
-    }
-
-    private void createAttachmentsDir() throws IOException {
-        IOUtils.createPrivateDirectories(attachmentsPath);
-    }
-
-    @FunctionalInterface
-    public interface AttachmentStorer {
-
-        void store(OutputStream outputStream) throws IOException;
-    }
-}
diff --git a/lib/src/main/java/org/asamk/signal/manager/JobExecutor.java b/lib/src/main/java/org/asamk/signal/manager/JobExecutor.java
deleted file mode 100644
index 12ade9ca..00000000
--- a/lib/src/main/java/org/asamk/signal/manager/JobExecutor.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.asamk.signal.manager;
-
-import org.asamk.signal.manager.helper.Context;
-import org.asamk.signal.manager.jobs.Job;
-
-public class JobExecutor {
-
-    private final Context context;
-
-    public JobExecutor(final Context context) {
-        this.context = context;
-    }
-
-    public void enqueueJob(Job job) {
-        job.run(context);
-    }
-}
diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 4bc4019c..ccb661e1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -1,22 +1,45 @@
 package org.asamk.signal.manager;
 
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+
+import org.asamk.signal.manager.api.AlreadyReceivingException;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.CaptchaRejectedException;
+import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Device;
+import org.asamk.signal.manager.api.DeviceLimitExceededException;
+import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.Group;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.api.Identity;
+import org.asamk.signal.manager.api.IdentityVerificationCode;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
+import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidStickerException;
+import org.asamk.signal.manager.api.InvalidUsernameException;
+import org.asamk.signal.manager.api.LastGroupAdminException;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.PendingAdminApprovalException;
+import org.asamk.signal.manager.api.PinLockMissingException;
+import org.asamk.signal.manager.api.PinLockedException;
+import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.ReceiveConfig;
+import org.asamk.signal.manager.api.Recipient;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendGroupMessageResults;
 import org.asamk.signal.manager.api.SendMessageResults;
 import org.asamk.signal.manager.api.StickerPack;
+import org.asamk.signal.manager.api.StickerPackId;
 import org.asamk.signal.manager.api.StickerPackInvalidException;
 import org.asamk.signal.manager.api.StickerPackUrl;
 import org.asamk.signal.manager.api.TypingAction;
@@ -24,20 +47,16 @@ import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.LastGroupAdminException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
-import org.asamk.signal.manager.storage.recipients.Profile;
-import org.asamk.signal.manager.storage.recipients.Recipient;
-import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
+import org.asamk.signal.manager.api.UsernameLinkUrl;
+import org.asamk.signal.manager.api.UsernameStatus;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
-import java.net.URI;
+import java.io.InputStream;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.List;
@@ -48,7 +67,22 @@ import java.util.Set;
 public interface Manager extends Closeable {
 
     static boolean isValidNumber(final String e164Number, final String countryCode) {
-        return PhoneNumberFormatter.isValidNumber(e164Number, countryCode);
+        return PhoneNumberUtil.getInstance().isPossibleNumber(e164Number, countryCode);
+    }
+
+    static boolean isSignalClientAvailable() {
+        final Logger logger = LoggerFactory.getLogger(Manager.class);
+        try {
+            try {
+                org.signal.libsignal.internal.Native.UuidCiphertext_CheckValidContents(new byte[0]);
+            } catch (Exception e) {
+                logger.trace("Expected exception when checking libsignal-client: {}", e.getMessage());
+            }
+            return true;
+        } catch (UnsatisfiedLinkError e) {
+            logger.warn("Failed to call libsignal-client: {}", e.getMessage());
+            return false;
+        }
     }
 
     String getSelfNumber();
@@ -60,13 +94,20 @@ public interface Manager extends Closeable {
      * @return A map of numbers to canonicalized number and uuid. If a number is not registered the uuid is null.
      * @throws IOException if it's unable to get the contacts to check if they're registered
      */
-    Map<String, UserStatus> getUserStatus(Set<String> numbers) throws IOException;
+    Map<String, UserStatus> getUserStatus(Set<String> numbers) throws IOException, RateLimitException;
 
-    void updateAccountAttributes(String deviceName) throws IOException;
+    Map<String, UsernameStatus> getUsernameStatus(Set<String> usernames) throws IOException;
+
+    void updateAccountAttributes(
+            String deviceName,
+            Boolean unrestrictedUnidentifiedSender,
+            final Boolean discoverableByNumber,
+            final Boolean numberSharing
+    ) throws IOException;
 
     Configuration getConfiguration();
 
-    void updateConfiguration(Configuration configuration) throws IOException, NotPrimaryDeviceException;
+    void updateConfiguration(Configuration configuration) throws NotPrimaryDeviceException;
 
     /**
      * Update the user's profile.
@@ -74,60 +115,99 @@ public interface Manager extends Closeable {
      */
     void updateProfile(UpdateProfile updateProfile) throws IOException;
 
+    String getUsername();
+
+    UsernameLinkUrl getUsernameLink();
+
+    /**
+     * Set a username for the account.
+     * If the username is null, it will be deleted.
+     */
+    void setUsername(String username) throws IOException, InvalidUsernameException;
+
+    /**
+     * Set a username for the account.
+     * If the username is null, it will be deleted.
+     */
+    void deleteUsername() throws IOException;
+
+    void startChangeNumber(
+            String newNumber,
+            boolean voiceVerification,
+            String captcha
+    ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, NotPrimaryDeviceException, VerificationMethodNotAvailableException;
+
+    void finishChangeNumber(
+            String newNumber,
+            String verificationCode,
+            String pin
+    ) throws IncorrectPinException, PinLockedException, IOException, NotPrimaryDeviceException, PinLockMissingException;
+
     void unregister() throws IOException;
 
     void deleteAccount() throws IOException;
 
-    void submitRateLimitRecaptchaChallenge(String challenge, String captcha) throws IOException;
+    void submitRateLimitRecaptchaChallenge(
+            String challenge,
+            String captcha
+    ) throws IOException, CaptchaRejectedException;
 
     List<Device> getLinkedDevices() throws IOException;
 
-    void removeLinkedDevices(int deviceId) throws IOException;
+    void removeLinkedDevices(int deviceId) throws IOException, NotPrimaryDeviceException;
 
-    void addDeviceLink(URI linkUri) throws IOException, InvalidDeviceLinkException;
+    void addDeviceLink(DeviceLinkUrl linkUri) throws IOException, InvalidDeviceLinkException, NotPrimaryDeviceException, DeviceLimitExceededException;
 
     void setRegistrationLockPin(Optional<String> pin) throws IOException, NotPrimaryDeviceException;
 
-    Profile getRecipientProfile(RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException;
-
     List<Group> getGroups();
 
     SendGroupMessageResults quitGroup(
-            GroupId groupId, Set<RecipientIdentifier.Single> groupAdmins
+            GroupId groupId,
+            Set<RecipientIdentifier.Single> groupAdmins
     ) throws GroupNotFoundException, IOException, NotAGroupMemberException, LastGroupAdminException, UnregisteredRecipientException;
 
     void deleteGroup(GroupId groupId) throws IOException;
 
     Pair<GroupId, SendGroupMessageResults> createGroup(
-            String name, Set<RecipientIdentifier.Single> members, File avatarFile
+            String name,
+            Set<RecipientIdentifier.Single> members,
+            String avatarFile
     ) throws IOException, AttachmentInvalidException, UnregisteredRecipientException;
 
     SendGroupMessageResults updateGroup(
-            final GroupId groupId, final UpdateGroup updateGroup
+            final GroupId groupId,
+            final UpdateGroup updateGroup
     ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException, GroupSendingNotAllowedException, UnregisteredRecipientException;
 
     Pair<GroupId, SendGroupMessageResults> joinGroup(
             GroupInviteLinkUrl inviteLinkUrl
-    ) throws IOException, InactiveGroupLinkException;
+    ) throws IOException, InactiveGroupLinkException, PendingAdminApprovalException;
 
     SendMessageResults sendTypingMessage(
-            TypingAction action, Set<RecipientIdentifier> recipients
+            TypingAction action,
+            Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException;
 
-    SendMessageResults sendReadReceipt(
-            RecipientIdentifier.Single sender, List<Long> messageIds
-    ) throws IOException;
+    SendMessageResults sendReadReceipt(RecipientIdentifier.Single sender, List<Long> messageIds);
 
-    SendMessageResults sendViewedReceipt(
-            RecipientIdentifier.Single sender, List<Long> messageIds
-    ) throws IOException;
+    SendMessageResults sendViewedReceipt(RecipientIdentifier.Single sender, List<Long> messageIds);
 
     SendMessageResults sendMessage(
-            Message message, Set<RecipientIdentifier> recipients
+            Message message,
+            Set<RecipientIdentifier> recipients,
+            boolean notifySelf
+    ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException;
+
+    SendMessageResults sendEditMessage(
+            Message message,
+            Set<RecipientIdentifier> recipients,
+            long editTargetTimestamp
     ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException;
 
     SendMessageResults sendRemoteDeleteMessage(
-            long targetSentTimestamp, Set<RecipientIdentifier> recipients
+            long targetSentTimestamp,
+            Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException;
 
     SendMessageResults sendMessageReaction(
@@ -135,36 +215,54 @@ public interface Manager extends Closeable {
             boolean remove,
             RecipientIdentifier.Single targetAuthor,
             long targetSentTimestamp,
-            Set<RecipientIdentifier> recipients
+            Set<RecipientIdentifier> recipients,
+            final boolean isStory
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException;
 
     SendMessageResults sendPaymentNotificationMessage(
-            byte[] receipt, String note, RecipientIdentifier.Single recipient
+            byte[] receipt,
+            String note,
+            RecipientIdentifier.Single recipient
     ) throws IOException;
 
     SendMessageResults sendEndSessionMessage(Set<RecipientIdentifier.Single> recipients) throws IOException;
 
+    SendMessageResults sendMessageRequestResponse(
+            MessageEnvelope.Sync.MessageRequestResponse.Type type,
+            Set<RecipientIdentifier> recipientIdentifiers
+    );
+
+    void hideRecipient(RecipientIdentifier.Single recipient);
+
     void deleteRecipient(RecipientIdentifier.Single recipient);
 
     void deleteContact(RecipientIdentifier.Single recipient);
 
     void setContactName(
-            RecipientIdentifier.Single recipient, String givenName, final String familyName
-    ) throws NotPrimaryDeviceException, IOException, UnregisteredRecipientException;
+            final RecipientIdentifier.Single recipient,
+            final String givenName,
+            final String familyName,
+            final String nickGivenName,
+            final String nickFamilyName,
+            final String note
+    ) throws NotPrimaryDeviceException, UnregisteredRecipientException;
 
     void setContactsBlocked(
-            Collection<RecipientIdentifier.Single> recipient, boolean blocked
+            Collection<RecipientIdentifier.Single> recipient,
+            boolean blocked
     ) throws NotPrimaryDeviceException, IOException, UnregisteredRecipientException;
 
     void setGroupsBlocked(
-            Collection<GroupId> groupId, boolean blocked
+            Collection<GroupId> groupId,
+            boolean blocked
     ) throws GroupNotFoundException, IOException, NotPrimaryDeviceException;
 
     /**
      * Change the expiration timer for a contact
      */
     void setExpirationTimer(
-            RecipientIdentifier.Single recipient, int messageExpirationTimer
+            RecipientIdentifier.Single recipient,
+            int messageExpirationTimer
     ) throws IOException, UnregisteredRecipientException;
 
     /**
@@ -175,6 +273,8 @@ public interface Manager extends Closeable {
      */
     StickerPackUrl uploadStickerPack(File path) throws IOException, StickerPackInvalidException;
 
+    void installStickerPack(StickerPackUrl url) throws IOException;
+
     List<StickerPack> getStickerPacks();
 
     void requestAllSyncData() throws IOException;
@@ -200,17 +300,16 @@ public interface Manager extends Closeable {
     /**
      * Receive new messages from server, returns if no new message arrive in a timespan of timeout.
      */
-    void receiveMessages(Duration timeout, ReceiveMessageHandler handler) throws IOException;
+    void receiveMessages(
+            Optional<Duration> timeout,
+            Optional<Integer> maxMessages,
+            ReceiveMessageHandler handler
+    ) throws IOException, AlreadyReceivingException;
 
-    /**
-     * Receive new messages from server, returns only if the thread is interrupted.
-     */
-    void receiveMessages(ReceiveMessageHandler handler) throws IOException;
+    void stopReceiveMessages();
 
     void setReceiveConfig(ReceiveConfig receiveConfig);
 
-    boolean hasCaughtUpWithOldMessages();
-
     boolean isContactBlocked(RecipientIdentifier.Single recipient);
 
     void sendContacts() throws IOException;
@@ -231,33 +330,13 @@ public interface Manager extends Closeable {
     List<Identity> getIdentities(RecipientIdentifier.Single recipient);
 
     /**
-     * Trust this the identity with this fingerprint
+     * Trust this the identity with this fingerprint/safetyNumber
      *
-     * @param recipient   account of the identity
-     * @param fingerprint Fingerprint
+     * @param recipient account of the identity
      */
     boolean trustIdentityVerified(
-            RecipientIdentifier.Single recipient, byte[] fingerprint
-    ) throws UnregisteredRecipientException;
-
-    /**
-     * Trust this the identity with this safety number
-     *
-     * @param recipient    account of the identity
-     * @param safetyNumber Safety number
-     */
-    boolean trustIdentityVerifiedSafetyNumber(
-            RecipientIdentifier.Single recipient, String safetyNumber
-    ) throws UnregisteredRecipientException;
-
-    /**
-     * Trust this the identity with this scannable safety number
-     *
-     * @param recipient    account of the identity
-     * @param safetyNumber Scannable safety number
-     */
-    boolean trustIdentityVerifiedSafetyNumber(
-            RecipientIdentifier.Single recipient, byte[] safetyNumber
+            RecipientIdentifier.Single recipient,
+            IdentityVerificationCode verificationCode
     ) throws UnregisteredRecipientException;
 
     /**
@@ -271,8 +350,18 @@ public interface Manager extends Closeable {
 
     void addClosedListener(Runnable listener);
 
+    InputStream retrieveAttachment(final String id) throws IOException;
+
+    InputStream retrieveContactAvatar(final RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException;
+
+    InputStream retrieveProfileAvatar(final RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException;
+
+    InputStream retrieveGroupAvatar(final GroupId groupId) throws IOException;
+
+    InputStream retrieveSticker(final StickerPackId stickerPackId, final int stickerId) throws IOException;
+
     @Override
-    void close() throws IOException;
+    void close();
 
     interface ReceiveMessageHandler {
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerLogger.java b/lib/src/main/java/org/asamk/signal/manager/ManagerLogger.java
index e5dc2c0d..c8437882 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerLogger.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerLogger.java
@@ -1,5 +1,7 @@
 package org.asamk.signal.manager;
 
+import org.asamk.signal.manager.internal.LibSignalLogger;
+
 public class ManagerLogger {
 
     public static void initLogger() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
index a92792c7..5f4f4463 100644
--- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
@@ -3,7 +3,10 @@ package org.asamk.signal.manager;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.PinLockMissingException;
 import org.asamk.signal.manager.api.PinLockedException;
+import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -11,12 +14,15 @@ import java.io.IOException;
 public interface RegistrationManager extends Closeable {
 
     void register(
-            boolean voiceVerification, String captcha
-    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException;
+            boolean voiceVerification,
+            String captcha,
+            final boolean forceRegister
+    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethodNotAvailableException;
 
     void verifyAccount(
-            String verificationCode, String pin
-    ) throws IOException, PinLockedException, IncorrectPinException;
+            String verificationCode,
+            String pin
+    ) throws IOException, PinLockedException, IncorrectPinException, PinLockMissingException;
 
     void deleteLocalAccountData() throws IOException;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java
deleted file mode 100644
index 3ce77557..00000000
--- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
-  Copyright (C) 2015-2022 AsamK and contributors
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.asamk.signal.manager;
-
-import org.asamk.signal.manager.api.CaptchaRequiredException;
-import org.asamk.signal.manager.api.IncorrectPinException;
-import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
-import org.asamk.signal.manager.api.PinLockedException;
-import org.asamk.signal.manager.api.UpdateProfile;
-import org.asamk.signal.manager.config.ServiceConfig;
-import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
-import org.asamk.signal.manager.helper.AccountFileUpdater;
-import org.asamk.signal.manager.helper.PinHelper;
-import org.asamk.signal.manager.storage.SignalAccount;
-import org.asamk.signal.manager.util.NumberVerificationUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
-import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
-import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
-import org.whispersystems.signalservice.api.push.ACI;
-import org.whispersystems.signalservice.api.push.PNI;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-import org.whispersystems.signalservice.internal.ServiceResponse;
-import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
-import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
-
-import java.io.IOException;
-import java.util.function.Consumer;
-
-import static org.asamk.signal.manager.config.ServiceConfig.capabilities;
-
-class RegistrationManagerImpl implements RegistrationManager {
-
-    private final static Logger logger = LoggerFactory.getLogger(RegistrationManagerImpl.class);
-
-    private SignalAccount account;
-    private final PathConfig pathConfig;
-    private final ServiceEnvironmentConfig serviceEnvironmentConfig;
-    private final String userAgent;
-    private final Consumer<Manager> newManagerListener;
-
-    private final SignalServiceAccountManager accountManager;
-    private final PinHelper pinHelper;
-    private final AccountFileUpdater accountFileUpdater;
-
-    RegistrationManagerImpl(
-            SignalAccount account,
-            PathConfig pathConfig,
-            ServiceEnvironmentConfig serviceEnvironmentConfig,
-            String userAgent,
-            Consumer<Manager> newManagerListener,
-            AccountFileUpdater accountFileUpdater
-    ) {
-        this.account = account;
-        this.pathConfig = pathConfig;
-        this.accountFileUpdater = accountFileUpdater;
-        this.serviceEnvironmentConfig = serviceEnvironmentConfig;
-        this.userAgent = userAgent;
-        this.newManagerListener = newManagerListener;
-
-        GroupsV2Operations groupsV2Operations;
-        try {
-            groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()),
-                    ServiceConfig.GROUP_MAX_SIZE);
-        } catch (Throwable ignored) {
-            groupsV2Operations = null;
-        }
-        this.accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.getSignalServiceConfiguration(),
-                new DynamicCredentialsProvider(
-                        // Using empty UUID, because registering doesn't work otherwise
-                        null, null, account.getNumber(), account.getPassword(), SignalServiceAddress.DEFAULT_DEVICE_ID),
-                userAgent,
-                groupsV2Operations,
-                ServiceConfig.AUTOMATIC_NETWORK_RETRY);
-        final var keyBackupService = accountManager.getKeyBackupService(ServiceConfig.getIasKeyStore(),
-                serviceEnvironmentConfig.getKeyBackupConfig().getEnclaveName(),
-                serviceEnvironmentConfig.getKeyBackupConfig().getServiceId(),
-                serviceEnvironmentConfig.getKeyBackupConfig().getMrenclave(),
-                10);
-        this.pinHelper = new PinHelper(keyBackupService);
-    }
-
-    @Override
-    public void register(
-            boolean voiceVerification, String captcha
-    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException {
-        if (account.isRegistered()
-                && account.getServiceEnvironment() != null
-                && account.getServiceEnvironment() != serviceEnvironmentConfig.getType()) {
-            throw new IOException("Account is registered in another environment: " + account.getServiceEnvironment());
-        }
-
-        if (account.getAci() != null && attemptReactivateAccount()) {
-            return;
-        }
-
-        NumberVerificationUtils.requestVerificationCode(accountManager, captcha, voiceVerification);
-    }
-
-    @Override
-    public void verifyAccount(
-            String verificationCode, String pin
-    ) throws IOException, PinLockedException, IncorrectPinException {
-        final var result = NumberVerificationUtils.verifyNumber(verificationCode,
-                pin,
-                pinHelper,
-                this::verifyAccountWithCode);
-        final var response = result.first();
-        final var masterKey = result.second();
-        if (masterKey == null) {
-            pin = null;
-        }
-
-        //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
-        final var aci = ACI.parseOrNull(response.getUuid());
-        final var pni = PNI.parseOrNull(response.getPni());
-        account.finishRegistration(aci, pni, masterKey, pin);
-        accountFileUpdater.updateAccountIdentifiers(account.getNumber(), aci);
-
-        ManagerImpl m = null;
-        try {
-            m = new ManagerImpl(account, pathConfig, accountFileUpdater, serviceEnvironmentConfig, userAgent);
-            account = null;
-
-            m.refreshPreKeys();
-            if (response.isStorageCapable()) {
-                m.retrieveRemoteStorage();
-            }
-            // Set an initial empty profile so user can be added to groups
-            try {
-                m.updateProfile(UpdateProfile.newBuilder().build());
-            } catch (NoClassDefFoundError e) {
-                logger.warn("Failed to set default profile: {}", e.getMessage());
-            }
-
-            if (newManagerListener != null) {
-                newManagerListener.accept(m);
-                m = null;
-            }
-        } finally {
-            if (m != null) {
-                m.close();
-            }
-        }
-    }
-
-    @Override
-    public void deleteLocalAccountData() throws IOException {
-        account.deleteAccountData();
-        accountFileUpdater.removeAccount();
-        account = null;
-    }
-
-    @Override
-    public boolean isRegistered() {
-        return account.isRegistered();
-    }
-
-    private boolean attemptReactivateAccount() {
-        try {
-            final var accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.getSignalServiceConfiguration(),
-                    account.getCredentialsProvider(),
-                    userAgent,
-                    null,
-                    ServiceConfig.AUTOMATIC_NETWORK_RETRY);
-            accountManager.setAccountAttributes(null,
-                    account.getLocalRegistrationId(),
-                    true,
-                    null,
-                    account.getPinMasterKey() == null ? null : account.getPinMasterKey().deriveRegistrationLock(),
-                    account.getSelfUnidentifiedAccessKey(),
-                    account.isUnrestrictedUnidentifiedAccess(),
-                    capabilities,
-                    account.isDiscoverableByPhoneNumber(),
-                    account.getEncryptedDeviceName());
-            account.setRegistered(true);
-            logger.info("Reactivated existing account, verify is not necessary.");
-            if (newManagerListener != null) {
-                final var m = new ManagerImpl(account,
-                        pathConfig,
-                        accountFileUpdater,
-                        serviceEnvironmentConfig,
-                        userAgent);
-                account = null;
-                newManagerListener.accept(m);
-            }
-            return true;
-        } catch (IOException e) {
-            logger.debug("Failed to reactivate account");
-        }
-        return false;
-    }
-
-    private ServiceResponse<VerifyAccountResponse> verifyAccountWithCode(
-            final String verificationCode, final String registrationLock
-    ) {
-        if (registrationLock == null) {
-            return accountManager.verifyAccount(verificationCode,
-                    account.getLocalRegistrationId(),
-                    true,
-                    account.getSelfUnidentifiedAccessKey(),
-                    account.isUnrestrictedUnidentifiedAccess(),
-                    ServiceConfig.capabilities,
-                    account.isDiscoverableByPhoneNumber());
-        } else {
-            return accountManager.verifyAccountWithRegistrationLockPin(verificationCode,
-                    account.getLocalRegistrationId(),
-                    true,
-                    registrationLock,
-                    account.getSelfUnidentifiedAccessKey(),
-                    account.isUnrestrictedUnidentifiedAccess(),
-                    ServiceConfig.capabilities,
-                    account.isDiscoverableByPhoneNumber());
-        }
-    }
-
-    @Override
-    public void close() {
-        if (account != null) {
-            account.close();
-            account = null;
-        }
-    }
-}
diff --git a/lib/src/main/java/org/asamk/signal/manager/Settings.java b/lib/src/main/java/org/asamk/signal/manager/Settings.java
new file mode 100644
index 00000000..5fd4e36b
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/Settings.java
@@ -0,0 +1,8 @@
+package org.asamk.signal.manager;
+
+import org.asamk.signal.manager.api.TrustNewIdentity;
+
+public record Settings(TrustNewIdentity trustNewIdentity, boolean disableMessageSendLog) {
+
+    public static final Settings DEFAULT = new Settings(TrustNewIdentity.ON_FIRST_USE, false);
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java b/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
index 3821a306..cd0b5a21 100644
--- a/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
+++ b/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
@@ -2,16 +2,22 @@ package org.asamk.signal.manager;
 
 import org.asamk.signal.manager.api.AccountCheckException;
 import org.asamk.signal.manager.api.NotRegisteredException;
+import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.ServiceEnvironment;
 import org.asamk.signal.manager.config.ServiceConfig;
-import org.asamk.signal.manager.config.ServiceEnvironment;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
+import org.asamk.signal.manager.internal.AccountFileUpdaterImpl;
+import org.asamk.signal.manager.internal.ManagerImpl;
+import org.asamk.signal.manager.internal.MultiAccountManagerImpl;
+import org.asamk.signal.manager.internal.PathConfig;
+import org.asamk.signal.manager.internal.ProvisioningManagerImpl;
+import org.asamk.signal.manager.internal.RegistrationManagerImpl;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.accounts.AccountsStore;
-import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
 import org.asamk.signal.manager.util.KeyUtils;
-import org.signal.libsignal.protocol.util.KeyHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,37 +33,59 @@ public class SignalAccountFiles {
     private final ServiceEnvironment serviceEnvironment;
     private final ServiceEnvironmentConfig serviceEnvironmentConfig;
     private final String userAgent;
-    private final TrustNewIdentity trustNewIdentity;
+    private final Settings settings;
     private final AccountsStore accountsStore;
 
     public SignalAccountFiles(
             final File settingsPath,
             final ServiceEnvironment serviceEnvironment,
             final String userAgent,
-            final TrustNewIdentity trustNewIdentity
+            final Settings settings
     ) throws IOException {
         this.pathConfig = PathConfig.createDefault(settingsPath);
         this.serviceEnvironment = serviceEnvironment;
         this.serviceEnvironmentConfig = ServiceConfig.getServiceEnvironmentConfig(this.serviceEnvironment, userAgent);
         this.userAgent = userAgent;
-        this.trustNewIdentity = trustNewIdentity;
-        this.accountsStore = new AccountsStore(pathConfig.dataPath());
+        this.settings = settings;
+        this.accountsStore = new AccountsStore(pathConfig.dataPath(), serviceEnvironment, accountPath -> {
+            if (accountPath == null || !SignalAccount.accountFileExists(pathConfig.dataPath(), accountPath)) {
+                return null;
+            }
+
+            try {
+                return SignalAccount.load(pathConfig.dataPath(), accountPath, false, settings);
+            } catch (Exception e) {
+                return null;
+            }
+        });
     }
 
-    public Set<String> getAllLocalAccountNumbers() {
+    public Set<String> getAllLocalAccountNumbers() throws IOException {
         return accountsStore.getAllNumbers();
     }
 
-    public MultiAccountManager initMultiAccountManager() {
-        final var managers = accountsStore.getAllAccounts().parallelStream().map(a -> {
+    public MultiAccountManager initMultiAccountManager() throws IOException, AccountCheckException {
+        final var managerPairs = accountsStore.getAllAccounts().parallelStream().map(a -> {
             try {
-                return initManager(a.number(), a.path());
-            } catch (NotRegisteredException | IOException | AccountCheckException e) {
+                return new Pair<Manager, Throwable>(initManager(a.number(), a.path()), null);
+            } catch (NotRegisteredException e) {
                 logger.warn("Ignoring {}: {} ({})", a.number(), e.getMessage(), e.getClass().getSimpleName());
                 return null;
+            } catch (AccountCheckException | IOException e) {
+                logger.error("Failed to load {}: {} ({})", a.number(), e.getMessage(), e.getClass().getSimpleName());
+                return new Pair<Manager, Throwable>(null, e);
             }
         }).filter(Objects::nonNull).toList();
 
+        for (final var pair : managerPairs) {
+            if (pair.second() instanceof IOException e) {
+                throw e;
+            } else if (pair.second() instanceof AccountCheckException e) {
+                throw e;
+            }
+        }
+
+        final var managers = managerPairs.stream().map(Pair::first).toList();
         return new MultiAccountManagerImpl(managers, this);
     }
 
@@ -67,7 +95,8 @@ public class SignalAccountFiles {
     }
 
     private Manager initManager(
-            String number, String accountPath
+            String number,
+            String accountPath
     ) throws IOException, NotRegisteredException, AccountCheckException {
         if (accountPath == null) {
             throw new NotRegisteredException();
@@ -76,7 +105,7 @@ public class SignalAccountFiles {
             throw new NotRegisteredException();
         }
 
-        var account = SignalAccount.load(pathConfig.dataPath(), accountPath, true, trustNewIdentity);
+        var account = SignalAccount.load(pathConfig.dataPath(), accountPath, true, settings);
         if (!number.equals(account.getNumber())) {
             account.close();
             throw new IOException("Number in account file doesn't match expected number: " + account.getNumber());
@@ -101,6 +130,9 @@ public class SignalAccountFiles {
 
         try {
             manager.checkAccountState();
+        } catch (DeprecatedVersionException e) {
+            manager.close();
+            throw new AccountCheckException("signal-cli version is too old for the Signal-Server, please update.");
         } catch (IOException e) {
             manager.close();
             throw new AccountCheckException("Error while checking account " + number + ": " + e.getMessage(), e);
@@ -108,6 +140,7 @@ public class SignalAccountFiles {
 
         if (account.getServiceEnvironment() == null) {
             account.setServiceEnvironment(serviceEnvironment);
+            accountsStore.updateAccount(accountPath, account.getNumber(), account.getAci());
         }
 
         return manager;
@@ -130,14 +163,14 @@ public class SignalAccountFiles {
     }
 
     public RegistrationManager initRegistrationManager(
-            String number, Consumer<Manager> newManagerListener
+            String number,
+            Consumer<Manager> newManagerListener
     ) throws IOException {
         final var accountPath = accountsStore.getPathByNumber(number);
         if (accountPath == null || !SignalAccount.accountFileExists(pathConfig.dataPath(), accountPath)) {
             final var newAccountPath = accountPath == null ? accountsStore.addAccount(number, null) : accountPath;
             var aciIdentityKey = KeyUtils.generateIdentityKeyPair();
             var pniIdentityKey = KeyUtils.generateIdentityKeyPair();
-            var registrationId = KeyHelper.generateRegistrationId(false);
 
             var profileKey = KeyUtils.createProfileKey();
             var account = SignalAccount.create(pathConfig.dataPath(),
@@ -146,9 +179,9 @@ public class SignalAccountFiles {
                     serviceEnvironment,
                     aciIdentityKey,
                     pniIdentityKey,
-                    registrationId,
                     profileKey,
-                    trustNewIdentity);
+                    settings);
+            account.initDatabase();
 
             return new RegistrationManagerImpl(account,
                     pathConfig,
@@ -158,11 +191,12 @@ public class SignalAccountFiles {
                     new AccountFileUpdaterImpl(accountsStore, newAccountPath));
         }
 
-        var account = SignalAccount.load(pathConfig.dataPath(), accountPath, true, trustNewIdentity);
+        var account = SignalAccount.load(pathConfig.dataPath(), accountPath, true, settings);
         if (!number.equals(account.getNumber())) {
             account.close();
             throw new IOException("Number in account file doesn't match expected number: " + account.getNumber());
         }
+        account.initDatabase();
 
         return new RegistrationManagerImpl(account,
                 pathConfig,
diff --git a/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java
deleted file mode 100644
index aeef7f15..00000000
--- a/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.asamk.signal.manager;
-
-import org.asamk.signal.manager.config.ServiceConfig;
-import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
-import org.signal.libsignal.metadata.certificate.CertificateValidator;
-import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations;
-import org.whispersystems.signalservice.api.KeyBackupService;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
-import org.whispersystems.signalservice.api.SignalServiceDataStore;
-import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
-import org.whispersystems.signalservice.api.SignalServiceMessageSender;
-import org.whispersystems.signalservice.api.SignalSessionLock;
-import org.whispersystems.signalservice.api.SignalWebSocket;
-import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;
-import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
-import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api;
-import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-import org.whispersystems.signalservice.api.services.ProfileService;
-import org.whispersystems.signalservice.api.util.CredentialsProvider;
-import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
-import org.whispersystems.signalservice.api.websocket.WebSocketFactory;
-import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
-
-import java.util.Optional;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Supplier;
-
-import static org.asamk.signal.manager.config.ServiceConfig.capabilities;
-
-public class SignalDependencies {
-
-    private final Object LOCK = new Object();
-
-    private final ServiceEnvironmentConfig serviceEnvironmentConfig;
-    private final String userAgent;
-    private final CredentialsProvider credentialsProvider;
-    private final SignalServiceDataStore dataStore;
-    private final ExecutorService executor;
-    private final SignalSessionLock sessionLock;
-
-    private SignalServiceAccountManager accountManager;
-    private GroupsV2Api groupsV2Api;
-    private GroupsV2Operations groupsV2Operations;
-    private ClientZkOperations clientZkOperations;
-
-    private SignalWebSocket signalWebSocket;
-    private SignalServiceMessageReceiver messageReceiver;
-    private SignalServiceMessageSender messageSender;
-
-    private KeyBackupService keyBackupService;
-    private ProfileService profileService;
-    private SignalServiceCipher cipher;
-
-    SignalDependencies(
-            final ServiceEnvironmentConfig serviceEnvironmentConfig,
-            final String userAgent,
-            final CredentialsProvider credentialsProvider,
-            final SignalServiceDataStore dataStore,
-            final ExecutorService executor,
-            final SignalSessionLock sessionLock
-    ) {
-        this.serviceEnvironmentConfig = serviceEnvironmentConfig;
-        this.userAgent = userAgent;
-        this.credentialsProvider = credentialsProvider;
-        this.dataStore = dataStore;
-        this.executor = executor;
-        this.sessionLock = sessionLock;
-    }
-
-    public void resetAfterAddressChange() {
-        this.messageSender = null;
-        this.cipher = null;
-    }
-
-    public ServiceEnvironmentConfig getServiceEnvironmentConfig() {
-        return serviceEnvironmentConfig;
-    }
-
-    public SignalServiceAccountManager getAccountManager() {
-        return getOrCreate(() -> accountManager,
-                () -> accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.getSignalServiceConfiguration(),
-                        credentialsProvider,
-                        userAgent,
-                        getGroupsV2Operations(),
-                        ServiceConfig.AUTOMATIC_NETWORK_RETRY));
-    }
-
-    public SignalServiceAccountManager createUnauthenticatedAccountManager(String number, String password) {
-        return new SignalServiceAccountManager(getServiceEnvironmentConfig().getSignalServiceConfiguration(),
-                null,
-                null,
-                number,
-                SignalServiceAddress.DEFAULT_DEVICE_ID,
-                password,
-                userAgent,
-                ServiceConfig.AUTOMATIC_NETWORK_RETRY,
-                ServiceConfig.GROUP_MAX_SIZE);
-    }
-
-    public GroupsV2Api getGroupsV2Api() {
-        return getOrCreate(() -> groupsV2Api, () -> groupsV2Api = getAccountManager().getGroupsV2Api());
-    }
-
-    public GroupsV2Operations getGroupsV2Operations() {
-        return getOrCreate(() -> groupsV2Operations,
-                () -> groupsV2Operations = capabilities.isGv2()
-                        ? new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()),
-                        ServiceConfig.GROUP_MAX_SIZE)
-                        : null);
-    }
-
-    private ClientZkOperations getClientZkOperations() {
-        return getOrCreate(() -> clientZkOperations,
-                () -> clientZkOperations = capabilities.isGv2()
-                        ? ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration())
-                        : null);
-    }
-
-    private ClientZkProfileOperations getClientZkProfileOperations() {
-        final var clientZkOperations = getClientZkOperations();
-        return clientZkOperations == null ? null : clientZkOperations.getProfileOperations();
-    }
-
-    public SignalWebSocket getSignalWebSocket() {
-        return getOrCreate(() -> signalWebSocket, () -> {
-            final var timer = new UptimeSleepTimer();
-            final var healthMonitor = new SignalWebSocketHealthMonitor(timer);
-            final var webSocketFactory = new WebSocketFactory() {
-                @Override
-                public WebSocketConnection createWebSocket() {
-                    return new WebSocketConnection("normal",
-                            serviceEnvironmentConfig.getSignalServiceConfiguration(),
-                            Optional.of(credentialsProvider),
-                            userAgent,
-                            healthMonitor);
-                }
-
-                @Override
-                public WebSocketConnection createUnidentifiedWebSocket() {
-                    return new WebSocketConnection("unidentified",
-                            serviceEnvironmentConfig.getSignalServiceConfiguration(),
-                            Optional.empty(),
-                            userAgent,
-                            healthMonitor);
-                }
-            };
-            signalWebSocket = new SignalWebSocket(webSocketFactory);
-            healthMonitor.monitor(signalWebSocket);
-        });
-    }
-
-    public SignalServiceMessageReceiver getMessageReceiver() {
-        return getOrCreate(() -> messageReceiver,
-                () -> messageReceiver = new SignalServiceMessageReceiver(serviceEnvironmentConfig.getSignalServiceConfiguration(),
-                        credentialsProvider,
-                        userAgent,
-                        getClientZkProfileOperations(),
-                        ServiceConfig.AUTOMATIC_NETWORK_RETRY));
-    }
-
-    public SignalServiceMessageSender getMessageSender() {
-        return getOrCreate(() -> messageSender,
-                () -> messageSender = new SignalServiceMessageSender(serviceEnvironmentConfig.getSignalServiceConfiguration(),
-                        credentialsProvider,
-                        dataStore,
-                        sessionLock,
-                        userAgent,
-                        getSignalWebSocket(),
-                        Optional.empty(),
-                        getClientZkProfileOperations(),
-                        executor,
-                        ServiceConfig.MAX_ENVELOPE_SIZE,
-                        ServiceConfig.AUTOMATIC_NETWORK_RETRY));
-    }
-
-    public KeyBackupService getKeyBackupService() {
-        return getOrCreate(() -> keyBackupService,
-                () -> keyBackupService = getAccountManager().getKeyBackupService(ServiceConfig.getIasKeyStore(),
-                        serviceEnvironmentConfig.getKeyBackupConfig().getEnclaveName(),
-                        serviceEnvironmentConfig.getKeyBackupConfig().getServiceId(),
-                        serviceEnvironmentConfig.getKeyBackupConfig().getMrenclave(),
-                        10));
-    }
-
-    public ProfileService getProfileService() {
-        return getOrCreate(() -> profileService,
-                () -> profileService = new ProfileService(getClientZkProfileOperations(),
-                        getMessageReceiver(),
-                        getSignalWebSocket()));
-    }
-
-    public SignalServiceCipher getCipher() {
-        return getOrCreate(() -> cipher, () -> {
-            final var certificateValidator = new CertificateValidator(serviceEnvironmentConfig.getUnidentifiedSenderTrustRoot());
-            final var address = new SignalServiceAddress(credentialsProvider.getAci(), credentialsProvider.getE164());
-            final var deviceId = credentialsProvider.getDeviceId();
-            cipher = new SignalServiceCipher(address, deviceId, dataStore.aci(), sessionLock, certificateValidator);
-        });
-    }
-
-    private <T> T getOrCreate(Supplier<T> supplier, Callable creator) {
-        var value = supplier.get();
-        if (value != null) {
-            return value;
-        }
-
-        synchronized (LOCK) {
-            value = supplier.get();
-            if (value != null) {
-                return value;
-            }
-            creator.call();
-            return supplier.get();
-        }
-    }
-
-    private interface Callable {
-
-        void call();
-    }
-}
diff --git a/lib/src/main/java/org/asamk/signal/manager/SignalWebSocketHealthMonitor.java b/lib/src/main/java/org/asamk/signal/manager/SignalWebSocketHealthMonitor.java
deleted file mode 100644
index 95d12674..00000000
--- a/lib/src/main/java/org/asamk/signal/manager/SignalWebSocketHealthMonitor.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package org.asamk.signal.manager;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.SignalWebSocket;
-import org.whispersystems.signalservice.api.util.Preconditions;
-import org.whispersystems.signalservice.api.util.SleepTimer;
-import org.whispersystems.signalservice.api.websocket.HealthMonitor;
-import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState;
-import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
-
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.rxjava3.schedulers.Schedulers;
-
-/**
- * Monitors the health of the identified and unidentified WebSockets. If either one appears to be
- * unhealthy, will trigger restarting both.
- * <p>
- * The monitor is also responsible for sending heartbeats/keep-alive messages to prevent
- * timeouts.
- */
-final class SignalWebSocketHealthMonitor implements HealthMonitor {
-
-    private final static Logger logger = LoggerFactory.getLogger(SignalWebSocketHealthMonitor.class);
-
-    private static final long KEEP_ALIVE_SEND_CADENCE = TimeUnit.SECONDS.toMillis(WebSocketConnection.KEEPALIVE_TIMEOUT_SECONDS);
-    private static final long MAX_TIME_SINCE_SUCCESSFUL_KEEP_ALIVE = KEEP_ALIVE_SEND_CADENCE * 3;
-
-    private SignalWebSocket signalWebSocket;
-    private final SleepTimer sleepTimer;
-
-    private volatile KeepAliveSender keepAliveSender;
-
-    private final HealthState identified = new HealthState();
-    private final HealthState unidentified = new HealthState();
-
-    public SignalWebSocketHealthMonitor(SleepTimer sleepTimer) {
-        this.sleepTimer = sleepTimer;
-    }
-
-    public void monitor(SignalWebSocket signalWebSocket) {
-        Preconditions.checkNotNull(signalWebSocket);
-        Preconditions.checkArgument(this.signalWebSocket == null, "monitor can only be called once");
-
-        this.signalWebSocket = signalWebSocket;
-
-        //noinspection ResultOfMethodCallIgnored
-        signalWebSocket.getWebSocketState()
-                .subscribeOn(Schedulers.computation())
-                .observeOn(Schedulers.computation())
-                .distinctUntilChanged()
-                .subscribe(s -> onStateChange(s, identified));
-
-        //noinspection ResultOfMethodCallIgnored
-        signalWebSocket.getUnidentifiedWebSocketState()
-                .subscribeOn(Schedulers.computation())
-                .observeOn(Schedulers.computation())
-                .distinctUntilChanged()
-                .subscribe(s -> onStateChange(s, unidentified));
-    }
-
-    private synchronized void onStateChange(WebSocketConnectionState connectionState, HealthState healthState) {
-        switch (connectionState) {
-            case CONNECTED -> logger.debug("WebSocket is now connected");
-            case AUTHENTICATION_FAILED -> logger.debug("WebSocket authentication failed");
-            case FAILED -> logger.debug("WebSocket connection failed");
-        }
-
-        healthState.needsKeepAlive = connectionState == WebSocketConnectionState.CONNECTED;
-
-        if (keepAliveSender == null && isKeepAliveNecessary()) {
-            keepAliveSender = new KeepAliveSender();
-            keepAliveSender.start();
-        } else if (keepAliveSender != null && !isKeepAliveNecessary()) {
-            keepAliveSender.shutdown();
-            keepAliveSender = null;
-        }
-    }
-
-    @Override
-    public void onKeepAliveResponse(long sentTimestamp, boolean isIdentifiedWebSocket) {
-        if (isIdentifiedWebSocket) {
-            identified.lastKeepAliveReceived = System.currentTimeMillis();
-        } else {
-            unidentified.lastKeepAliveReceived = System.currentTimeMillis();
-        }
-    }
-
-    @Override
-    public void onMessageError(int status, boolean isIdentifiedWebSocket) {
-        if (status == 409) {
-            HealthState healthState = (isIdentifiedWebSocket ? identified : unidentified);
-            if (healthState.mismatchErrorTracker.addSample(System.currentTimeMillis())) {
-                logger.warn("Received too many mismatch device errors, forcing new websockets.");
-                signalWebSocket.forceNewWebSockets();
-                signalWebSocket.connect();
-            }
-        }
-    }
-
-    private boolean isKeepAliveNecessary() {
-        return identified.needsKeepAlive || unidentified.needsKeepAlive;
-    }
-
-    private static class HealthState {
-
-        private final HttpErrorTracker mismatchErrorTracker = new HttpErrorTracker(5, TimeUnit.MINUTES.toMillis(1));
-
-        private volatile boolean needsKeepAlive;
-        private volatile long lastKeepAliveReceived;
-    }
-
-    /**
-     * Sends periodic heartbeats/keep-alives over both WebSockets to prevent connection timeouts. If
-     * either WebSocket fails 3 times to get a return heartbeat both are forced to be recreated.
-     */
-    private class KeepAliveSender extends Thread {
-
-        private volatile boolean shouldKeepRunning = true;
-
-        public void run() {
-            identified.lastKeepAliveReceived = System.currentTimeMillis();
-            unidentified.lastKeepAliveReceived = System.currentTimeMillis();
-
-            while (shouldKeepRunning && isKeepAliveNecessary()) {
-                try {
-                    sleepTimer.sleep(KEEP_ALIVE_SEND_CADENCE);
-
-                    if (shouldKeepRunning && isKeepAliveNecessary()) {
-                        long keepAliveRequiredSinceTime = System.currentTimeMillis()
-                                - MAX_TIME_SINCE_SUCCESSFUL_KEEP_ALIVE;
-
-                        if (identified.lastKeepAliveReceived < keepAliveRequiredSinceTime
-                                || unidentified.lastKeepAliveReceived < keepAliveRequiredSinceTime) {
-                            logger.warn("Missed keep alives, identified last: "
-                                    + identified.lastKeepAliveReceived
-                                    + " unidentified last: "
-                                    + unidentified.lastKeepAliveReceived
-                                    + " needed by: "
-                                    + keepAliveRequiredSinceTime);
-                            signalWebSocket.forceNewWebSockets();
-                            signalWebSocket.connect();
-                        } else {
-                            signalWebSocket.sendKeepAlive();
-                        }
-                    }
-                } catch (Throwable e) {
-                    logger.warn("Error occured in KeepAliveSender, ignoring ...", e);
-                }
-            }
-        }
-
-        public void shutdown() {
-            shouldKeepRunning = false;
-        }
-    }
-
-    private final static class HttpErrorTracker {
-
-        private final long[] timestamps;
-        private final long errorTimeRange;
-
-        public HttpErrorTracker(int samples, long errorTimeRange) {
-            this.timestamps = new long[samples];
-            this.errorTimeRange = errorTimeRange;
-        }
-
-        public synchronized boolean addSample(long now) {
-            long errorsMustBeAfter = now - errorTimeRange;
-            int count = 1;
-            int minIndex = 0;
-
-            for (int i = 0; i < timestamps.length; i++) {
-                if (timestamps[i] < errorsMustBeAfter) {
-                    timestamps[i] = 0;
-                } else if (timestamps[i] != 0) {
-                    count++;
-                }
-
-                if (timestamps[i] < timestamps[minIndex]) {
-                    minIndex = i;
-                }
-            }
-
-            timestamps[minIndex] = now;
-
-            if (count >= timestamps.length) {
-                Arrays.fill(timestamps, 0);
-                return true;
-            }
-            return false;
-        }
-    }
-}
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/RenewSessionAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/RenewSessionAction.java
index 093ca2d4..35058940 100644
--- a/lib/src/main/java/org/asamk/signal/manager/actions/RenewSessionAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/RenewSessionAction.java
@@ -2,21 +2,24 @@ package org.asamk.signal.manager.actions;
 
 import org.asamk.signal.manager.helper.Context;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
+import org.whispersystems.signalservice.api.push.ServiceId;
 
 public class RenewSessionAction implements HandleAction {
 
     private final RecipientId recipientId;
+    private final ServiceId serviceId;
+    private final ServiceId accountId;
 
-    public RenewSessionAction(final RecipientId recipientId) {
+    public RenewSessionAction(final RecipientId recipientId, final ServiceId serviceId, final ServiceId accountId) {
         this.recipientId = recipientId;
+        this.serviceId = serviceId;
+        this.accountId = accountId;
     }
 
     @Override
     public void execute(Context context) throws Throwable {
-        context.getAccount().getSessionStore().archiveSessions(recipientId);
-        if (!recipientId.equals(context.getAccount().getSelfRecipientId())) {
-            context.getSendHelper().sendNullMessage(recipientId);
-        }
+        context.getAccount().getAccountData(accountId).getSessionStore().archiveSessions(serviceId);
+        context.getSendHelper().sendNullMessage(recipientId);
     }
 
     @Override
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/ResendMessageAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/ResendMessageAction.java
index 9f399dd8..a8f67fd6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/actions/ResendMessageAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/ResendMessageAction.java
@@ -13,7 +13,9 @@ public class ResendMessageAction implements HandleAction {
     private final MessageSendLogEntry messageSendLogEntry;
 
     public ResendMessageAction(
-            final RecipientId recipientId, final long timestamp, final MessageSendLogEntry messageSendLogEntry
+            final RecipientId recipientId,
+            final long timestamp,
+            final MessageSendLogEntry messageSendLogEntry
     ) {
         this.recipientId = recipientId;
         this.timestamp = timestamp;
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/RetrieveStorageDataAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/RetrieveStorageDataAction.java
deleted file mode 100644
index 28b304ab..00000000
--- a/lib/src/main/java/org/asamk/signal/manager/actions/RetrieveStorageDataAction.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.asamk.signal.manager.actions;
-
-import org.asamk.signal.manager.helper.Context;
-
-public class RetrieveStorageDataAction implements HandleAction {
-
-    private static final RetrieveStorageDataAction INSTANCE = new RetrieveStorageDataAction();
-
-    private RetrieveStorageDataAction() {
-    }
-
-    public static RetrieveStorageDataAction create() {
-        return INSTANCE;
-    }
-
-    @Override
-    public void execute(Context context) throws Throwable {
-        if (context.getAccount().getStorageKey() != null) {
-            context.getStorageHelper().readDataFromStorage();
-        } else if (!context.getAccount().isPrimaryDevice()) {
-            context.getSyncHelper().requestSyncKeys();
-        }
-    }
-}
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/SendGroupInfoAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/SendGroupInfoAction.java
index 1f76f13e..2a39a38a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/actions/SendGroupInfoAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/SendGroupInfoAction.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.actions;
 
-import org.asamk.signal.manager.groups.GroupIdV1;
+import org.asamk.signal.manager.api.GroupIdV1;
 import org.asamk.signal.manager.helper.Context;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/SendGroupInfoRequestAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/SendGroupInfoRequestAction.java
index 19bf8193..e9dc2528 100644
--- a/lib/src/main/java/org/asamk/signal/manager/actions/SendGroupInfoRequestAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/SendGroupInfoRequestAction.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.actions;
 
-import org.asamk.signal.manager.groups.GroupIdV1;
+import org.asamk.signal.manager.api.GroupIdV1;
 import org.asamk.signal.manager.helper.Context;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/SendPniIdentityKeyAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/SendPniIdentityKeyAction.java
deleted file mode 100644
index fe70a661..00000000
--- a/lib/src/main/java/org/asamk/signal/manager/actions/SendPniIdentityKeyAction.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.asamk.signal.manager.actions;
-
-import org.asamk.signal.manager.helper.Context;
-
-public class SendPniIdentityKeyAction implements HandleAction {
-
-    private static final SendPniIdentityKeyAction INSTANCE = new SendPniIdentityKeyAction();
-
-    private SendPniIdentityKeyAction() {
-    }
-
-    public static SendPniIdentityKeyAction create() {
-        return INSTANCE;
-    }
-
-    @Override
-    public void execute(Context context) throws Throwable {
-        context.getSyncHelper().sendPniIdentity();
-    }
-}
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/SendReceiptAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/SendReceiptAction.java
index c08438b5..6a5cfd59 100644
--- a/lib/src/main/java/org/asamk/signal/manager/actions/SendReceiptAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/SendReceiptAction.java
@@ -15,7 +15,9 @@ public class SendReceiptAction implements HandleAction {
     private final List<Long> timestamps = new ArrayList<>();
 
     public SendReceiptAction(
-            final RecipientId recipientId, final SignalServiceReceiptMessage.Type type, final long timestamp
+            final RecipientId recipientId,
+            final SignalServiceReceiptMessage.Type type,
+            final long timestamp
     ) {
         this.recipientId = recipientId;
         this.type = type;
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
index 4ebbe99e..96a94128 100644
--- a/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
@@ -1,13 +1,13 @@
 package org.asamk.signal.manager.actions;
 
-import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.helper.Context;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.signal.libsignal.metadata.ProtocolException;
 import org.signal.libsignal.protocol.message.CiphertextMessage;
 import org.signal.libsignal.protocol.message.DecryptionErrorMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+import org.whispersystems.signalservice.internal.push.Envelope;
 
 import java.util.Optional;
 
@@ -29,8 +29,6 @@ public class SendRetryMessageRequestAction implements HandleAction {
 
     @Override
     public void execute(Context context) throws Throwable {
-        context.getAccount().getSessionStore().archiveSessions(recipientId);
-
         int senderDevice = protocolException.getSenderDevice();
         Optional<GroupId> groupId = protocolException.getGroupId().isPresent() ? Optional.of(GroupId.unknownVersion(
                 protocolException.getGroupId().get())) : Optional.empty();
@@ -43,7 +41,9 @@ public class SendRetryMessageRequestAction implements HandleAction {
             envelopeType = messageContent.getType();
         } else {
             originalContent = envelope.getContent();
-            envelopeType = envelopeTypeToCiphertextMessageType(envelope.getType());
+            envelopeType = envelope.getType() == null
+                    ? CiphertextMessage.WHISPER_TYPE
+                    : envelopeTypeToCiphertextMessageType(envelope.getType());
         }
 
         DecryptionErrorMessage decryptionErrorMessage = DecryptionErrorMessage.forOriginalMessage(originalContent,
@@ -55,10 +55,14 @@ public class SendRetryMessageRequestAction implements HandleAction {
     }
 
     private static int envelopeTypeToCiphertextMessageType(int envelopeType) {
-        return switch (envelopeType) {
-            case SignalServiceProtos.Envelope.Type.PREKEY_BUNDLE_VALUE -> CiphertextMessage.PREKEY_TYPE;
-            case SignalServiceProtos.Envelope.Type.UNIDENTIFIED_SENDER_VALUE -> CiphertextMessage.SENDERKEY_TYPE;
-            case SignalServiceProtos.Envelope.Type.PLAINTEXT_CONTENT_VALUE -> CiphertextMessage.PLAINTEXT_CONTENT_TYPE;
+        final var type = Envelope.Type.fromValue(envelopeType);
+        if (type == null) {
+            return CiphertextMessage.WHISPER_TYPE;
+        }
+        return switch (type) {
+            case PREKEY_BUNDLE -> CiphertextMessage.PREKEY_TYPE;
+            case UNIDENTIFIED_SENDER -> CiphertextMessage.SENDERKEY_TYPE;
+            case PLAINTEXT_CONTENT -> CiphertextMessage.PLAINTEXT_CONTENT_TYPE;
             default -> CiphertextMessage.WHISPER_TYPE;
         };
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/SyncStorageDataAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/SyncStorageDataAction.java
new file mode 100644
index 00000000..7101b3d1
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/SyncStorageDataAction.java
@@ -0,0 +1,21 @@
+package org.asamk.signal.manager.actions;
+
+import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.jobs.SyncStorageJob;
+
+public class SyncStorageDataAction implements HandleAction {
+
+    private static final SyncStorageDataAction INSTANCE = new SyncStorageDataAction();
+
+    private SyncStorageDataAction() {
+    }
+
+    public static SyncStorageDataAction create() {
+        return INSTANCE;
+    }
+
+    @Override
+    public void execute(Context context) throws Throwable {
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/AlreadyReceivingException.java b/lib/src/main/java/org/asamk/signal/manager/api/AlreadyReceivingException.java
new file mode 100644
index 00000000..298e3f2f
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/AlreadyReceivingException.java
@@ -0,0 +1,12 @@
+package org.asamk.signal.manager.api;
+
+public class AlreadyReceivingException extends Exception {
+
+    public AlreadyReceivingException(String message) {
+        super(message);
+    }
+
+    public AlreadyReceivingException(String message, Exception e) {
+        super(message, e);
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/CaptchaRejectedException.java b/lib/src/main/java/org/asamk/signal/manager/api/CaptchaRejectedException.java
new file mode 100644
index 00000000..a41a168e
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/CaptchaRejectedException.java
@@ -0,0 +1,16 @@
+package org.asamk.signal.manager.api;
+
+public class CaptchaRejectedException extends Exception {
+
+    public CaptchaRejectedException() {
+        super("Captcha rejected");
+    }
+
+    public CaptchaRejectedException(final String message) {
+        super(message);
+    }
+
+    public CaptchaRejectedException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/CaptchaRequiredException.java b/lib/src/main/java/org/asamk/signal/manager/api/CaptchaRequiredException.java
index 9504d240..86fcdc93 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/CaptchaRequiredException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/CaptchaRequiredException.java
@@ -2,6 +2,13 @@ package org.asamk.signal.manager.api;
 
 public class CaptchaRequiredException extends Exception {
 
+    private long nextAttemptTimestamp;
+
+    public CaptchaRequiredException(final long nextAttemptTimestamp) {
+        super("Captcha required");
+        this.nextAttemptTimestamp = nextAttemptTimestamp;
+    }
+
     public CaptchaRequiredException(final String message) {
         super(message);
     }
@@ -9,4 +16,8 @@ public class CaptchaRequiredException extends Exception {
     public CaptchaRequiredException(final String message, final Throwable cause) {
         super(message, cause);
     }
+
+    public long getNextAttemptTimestamp() {
+        return nextAttemptTimestamp;
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Color.java b/lib/src/main/java/org/asamk/signal/manager/api/Color.java
new file mode 100644
index 00000000..11f7deb0
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Color.java
@@ -0,0 +1,24 @@
+package org.asamk.signal.manager.api;
+
+public record Color(int color) {
+
+    public int alpha() {
+        return color >>> 24;
+    }
+
+    public int red() {
+        return (color >> 16) & 0xFF;
+    }
+
+    public int green() {
+        return (color >> 8) & 0xFF;
+    }
+
+    public int blue() {
+        return color & 0xFF;
+    }
+
+    public String toHexColor() {
+        return String.format("#%08x", color);
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Contact.java b/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
new file mode 100644
index 00000000..3eef0117
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
@@ -0,0 +1,193 @@
+package org.asamk.signal.manager.api;
+
+import org.whispersystems.signalservice.internal.util.Util;
+
+public record Contact(
+        String givenName,
+        String familyName,
+        String nickName,
+        String nickNameGivenName,
+        String nickNameFamilyName,
+        String note,
+        String color,
+        int messageExpirationTime,
+        int messageExpirationTimeVersion,
+        long muteUntil,
+        boolean hideStory,
+        boolean isBlocked,
+        boolean isArchived,
+        boolean isProfileSharingEnabled,
+        boolean isHidden,
+        Long unregisteredTimestamp
+) {
+
+    private Contact(final Builder builder) {
+        this(builder.givenName,
+                builder.familyName,
+                builder.nickName,
+                builder.nickNameGivenName,
+                builder.nickNameFamilyName,
+                builder.note,
+                builder.color,
+                builder.messageExpirationTime,
+                builder.messageExpirationTimeVersion,
+                builder.muteUntil,
+                builder.hideStory,
+                builder.isBlocked,
+                builder.isArchived,
+                builder.isProfileSharingEnabled,
+                builder.isHidden,
+                builder.unregisteredTimestamp);
+    }
+
+    public static Builder newBuilder() {
+        return new Builder();
+    }
+
+    public static Builder newBuilder(final Contact copy) {
+        Builder builder = new Builder();
+        builder.givenName = copy.givenName();
+        builder.familyName = copy.familyName();
+        builder.nickName = copy.nickName();
+        builder.nickNameGivenName = copy.nickNameGivenName();
+        builder.nickNameFamilyName = copy.nickNameFamilyName();
+        builder.note = copy.note();
+        builder.color = copy.color();
+        builder.messageExpirationTime = copy.messageExpirationTime();
+        builder.messageExpirationTimeVersion = copy.messageExpirationTimeVersion();
+        builder.muteUntil = copy.muteUntil();
+        builder.hideStory = copy.hideStory();
+        builder.isBlocked = copy.isBlocked();
+        builder.isArchived = copy.isArchived();
+        builder.isProfileSharingEnabled = copy.isProfileSharingEnabled();
+        builder.isHidden = copy.isHidden();
+        builder.unregisteredTimestamp = copy.unregisteredTimestamp();
+        return builder;
+    }
+
+    public String getName() {
+        final var noGivenName = Util.isEmpty(givenName);
+        final var noFamilyName = Util.isEmpty(familyName);
+
+        if (noGivenName && noFamilyName) {
+            return "";
+        } else if (noGivenName) {
+            return familyName;
+        } else if (noFamilyName) {
+            return givenName;
+        }
+
+        return givenName + " " + familyName;
+    }
+
+    public static final class Builder {
+
+        private String givenName;
+        private String familyName;
+        private String nickName;
+        private String nickNameGivenName;
+        private String nickNameFamilyName;
+        private String note;
+        private String color;
+        private int messageExpirationTime;
+        private int messageExpirationTimeVersion = 1;
+        private long muteUntil;
+        private boolean hideStory;
+        private boolean isBlocked;
+        private boolean isArchived;
+        private boolean isProfileSharingEnabled;
+        private boolean isHidden;
+        private Long unregisteredTimestamp;
+
+        private Builder() {
+        }
+
+        public static Builder newBuilder() {
+            return new Builder();
+        }
+
+        public Builder withGivenName(final String val) {
+            givenName = val;
+            return this;
+        }
+
+        public Builder withFamilyName(final String val) {
+            familyName = val;
+            return this;
+        }
+
+        public Builder withNickName(final String val) {
+            nickName = val;
+            return this;
+        }
+
+        public Builder withNickNameGivenName(final String val) {
+            nickNameGivenName = val;
+            return this;
+        }
+
+        public Builder withNickNameFamilyName(final String val) {
+            nickNameFamilyName = val;
+            return this;
+        }
+
+        public Builder withNote(final String val) {
+            note = val;
+            return this;
+        }
+
+        public Builder withColor(final String val) {
+            color = val;
+            return this;
+        }
+
+        public Builder withMessageExpirationTime(final int val) {
+            messageExpirationTime = val;
+            return this;
+        }
+
+        public Builder withMessageExpirationTimeVersion(final int val) {
+            messageExpirationTimeVersion = val;
+            return this;
+        }
+
+        public Builder withMuteUntil(final long val) {
+            muteUntil = val;
+            return this;
+        }
+
+        public Builder withHideStory(final boolean val) {
+            hideStory = val;
+            return this;
+        }
+
+        public Builder withIsBlocked(final boolean val) {
+            isBlocked = val;
+            return this;
+        }
+
+        public Builder withIsArchived(final boolean val) {
+            isArchived = val;
+            return this;
+        }
+
+        public Builder withIsProfileSharingEnabled(final boolean val) {
+            isProfileSharingEnabled = val;
+            return this;
+        }
+
+        public Builder withIsHidden(final boolean val) {
+            isHidden = val;
+            return this;
+        }
+
+        public Builder withUnregisteredTimestamp(final Long val) {
+            unregisteredTimestamp = val;
+            return this;
+        }
+
+        public Contact build() {
+            return new Contact(this);
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/DeviceLimitExceededException.java b/lib/src/main/java/org/asamk/signal/manager/api/DeviceLimitExceededException.java
new file mode 100644
index 00000000..e24cc2ac
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/DeviceLimitExceededException.java
@@ -0,0 +1,12 @@
+package org.asamk.signal.manager.api;
+
+public class DeviceLimitExceededException extends Exception {
+
+    public DeviceLimitExceededException(final String message) {
+        super(message);
+    }
+
+    public DeviceLimitExceededException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java b/lib/src/main/java/org/asamk/signal/manager/api/DeviceLinkUrl.java
similarity index 80%
rename from lib/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java
rename to lib/src/main/java/org/asamk/signal/manager/api/DeviceLinkUrl.java
index 356cb47d..2bb63507 100644
--- a/lib/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/DeviceLinkUrl.java
@@ -1,9 +1,7 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.api;
 
-import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.util.Utils;
 import org.signal.libsignal.protocol.InvalidKeyException;
-import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 
 import java.net.URI;
@@ -14,9 +12,9 @@ import java.util.Base64;
 
 import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
 
-public record DeviceLinkInfo(String deviceIdentifier, ECPublicKey deviceKey) {
+public record DeviceLinkUrl(String deviceIdentifier, ECPublicKey deviceKey) {
 
-    public static DeviceLinkInfo parseDeviceLinkUri(URI linkUri) throws InvalidDeviceLinkException {
+    public static DeviceLinkUrl parseDeviceLinkUri(URI linkUri) throws InvalidDeviceLinkException {
         final var rawQuery = linkUri.getRawQuery();
         if (isEmpty(rawQuery)) {
             throw new RuntimeException("Invalid device link uri");
@@ -38,12 +36,12 @@ public record DeviceLinkInfo(String deviceIdentifier, ECPublicKey deviceKey) {
         }
         ECPublicKey deviceKey;
         try {
-            deviceKey = Curve.decodePoint(publicKeyBytes, 0);
+            deviceKey = new ECPublicKey(publicKeyBytes);
         } catch (InvalidKeyException e) {
             throw new InvalidDeviceLinkException("Invalid device link", e);
         }
 
-        return new DeviceLinkInfo(deviceIdentifier, deviceKey);
+        return new DeviceLinkUrl(deviceIdentifier, deviceKey);
     }
 
     public URI createDeviceLinkUri() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Group.java b/lib/src/main/java/org/asamk/signal/manager/api/Group.java
index 9b2d988a..4d1fdaa1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Group.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Group.java
@@ -1,11 +1,7 @@
 package org.asamk.signal.manager.api;
 
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupPermission;
 import org.asamk.signal.manager.helper.RecipientAddressResolver;
 import org.asamk.signal.manager.storage.groups.GroupInfo;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 
 import java.util.Set;
@@ -31,7 +27,9 @@ public record Group(
 ) {
 
     public static Group from(
-            final GroupInfo groupInfo, final RecipientAddressResolver recipientStore, final RecipientId selfRecipientId
+            final GroupInfo groupInfo,
+            final RecipientAddressResolver recipientStore,
+            final RecipientId selfRecipientId
     ) {
         return new Group(groupInfo.getGroupId(),
                 groupInfo.getTitle(),
@@ -40,22 +38,27 @@ public record Group(
                 groupInfo.getMembers()
                         .stream()
                         .map(recipientStore::resolveRecipientAddress)
+                        .map(org.asamk.signal.manager.storage.recipients.RecipientAddress::toApiRecipientAddress)
                         .collect(Collectors.toSet()),
                 groupInfo.getPendingMembers()
                         .stream()
                         .map(recipientStore::resolveRecipientAddress)
+                        .map(org.asamk.signal.manager.storage.recipients.RecipientAddress::toApiRecipientAddress)
                         .collect(Collectors.toSet()),
                 groupInfo.getRequestingMembers()
                         .stream()
                         .map(recipientStore::resolveRecipientAddress)
+                        .map(org.asamk.signal.manager.storage.recipients.RecipientAddress::toApiRecipientAddress)
                         .collect(Collectors.toSet()),
                 groupInfo.getAdminMembers()
                         .stream()
                         .map(recipientStore::resolveRecipientAddress)
+                        .map(org.asamk.signal.manager.storage.recipients.RecipientAddress::toApiRecipientAddress)
                         .collect(Collectors.toSet()),
                 groupInfo.getBannedMembers()
                         .stream()
                         .map(recipientStore::resolveRecipientAddress)
+                        .map(org.asamk.signal.manager.storage.recipients.RecipientAddress::toApiRecipientAddress)
                         .collect(Collectors.toSet()),
                 groupInfo.isBlocked(),
                 groupInfo.getMessageExpirationTimer(),
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupId.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupId.java
similarity index 97%
rename from lib/src/main/java/org/asamk/signal/manager/groups/GroupId.java
rename to lib/src/main/java/org/asamk/signal/manager/api/GroupId.java
index 38ddd4b6..3095392f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupId.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupId.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 import java.util.Arrays;
 import java.util.Base64;
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupIdFormatException.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupIdFormatException.java
similarity index 85%
rename from lib/src/main/java/org/asamk/signal/manager/groups/GroupIdFormatException.java
rename to lib/src/main/java/org/asamk/signal/manager/api/GroupIdFormatException.java
index 8050da22..c76a7ef1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupIdFormatException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupIdFormatException.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 public class GroupIdFormatException extends Exception {
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupIdV1.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupIdV1.java
similarity index 91%
rename from lib/src/main/java/org/asamk/signal/manager/groups/GroupIdV1.java
rename to lib/src/main/java/org/asamk/signal/manager/api/GroupIdV1.java
index acec587b..90e5dde4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupIdV1.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupIdV1.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 import java.util.Base64;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupIdV2.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupIdV2.java
similarity index 86%
rename from lib/src/main/java/org/asamk/signal/manager/groups/GroupIdV2.java
rename to lib/src/main/java/org/asamk/signal/manager/api/GroupIdV2.java
index 35aac330..44cda276 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupIdV2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupIdV2.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 import java.util.Base64;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
similarity index 63%
rename from lib/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java
rename to lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
index 3425d95e..a5a23e56 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
@@ -1,17 +1,18 @@
-package org.asamk.signal.manager.groups;
-
-import com.google.protobuf.ByteString;
+package org.asamk.signal.manager.api;
 
+import org.asamk.signal.manager.groups.GroupLinkPassword;
+import org.signal.core.util.Base64;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
 import org.signal.storageservice.protos.groups.GroupInviteLink;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
-import org.whispersystems.util.Base64UrlSafe;
 
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import okio.ByteString;
+
 public final class GroupInviteLinkUrl {
 
     private static final String GROUP_URL_HOST = "signal.group";
@@ -23,7 +24,7 @@ public final class GroupInviteLinkUrl {
 
     public static GroupInviteLinkUrl forGroup(GroupMasterKey groupMasterKey, DecryptedGroup group) {
         return new GroupInviteLinkUrl(groupMasterKey,
-                GroupLinkPassword.fromBytes(group.getInviteLinkPassword().toByteArray()));
+                GroupLinkPassword.fromBytes(group.inviteLinkPassword.toByteArray()));
     }
 
     /**
@@ -38,30 +39,27 @@ public final class GroupInviteLinkUrl {
         }
 
         try {
-            if (!"/".equals(uri.getPath()) && uri.getPath().length() > 0) {
+            if (!"/".equals(uri.getPath()) && !uri.getPath().isEmpty()) {
                 throw new InvalidGroupLinkException("No path was expected in uri");
             }
 
             var encoding = uri.getFragment();
 
-            if (encoding == null || encoding.length() == 0) {
+            if (encoding == null || encoding.isEmpty()) {
                 throw new InvalidGroupLinkException("No reference was in the uri");
             }
 
-            var bytes = Base64UrlSafe.decodePaddingAgnostic(encoding);
-            var groupInviteLink = GroupInviteLink.parseFrom(bytes);
+            var bytes = Base64.decode(encoding);
+            GroupInviteLink groupInviteLink = GroupInviteLink.ADAPTER.decode(bytes);
 
-            switch (groupInviteLink.getContentsCase()) {
-                case V1CONTENTS -> {
-                    var groupInviteLinkContentsV1 = groupInviteLink.getV1Contents();
-                    var groupMasterKey = new GroupMasterKey(groupInviteLinkContentsV1.getGroupMasterKey()
-                            .toByteArray());
-                    var password = GroupLinkPassword.fromBytes(groupInviteLinkContentsV1.getInviteLinkPassword()
-                            .toByteArray());
+            if (groupInviteLink.v1Contents != null) {
+                var groupInviteLinkContentsV1 = groupInviteLink.v1Contents;
+                var groupMasterKey = new GroupMasterKey(groupInviteLinkContentsV1.groupMasterKey.toByteArray());
+                var password = GroupLinkPassword.fromBytes(groupInviteLinkContentsV1.inviteLinkPassword.toByteArray());
 
-                    return new GroupInviteLinkUrl(groupMasterKey, password);
-                }
-                default -> throw new UnknownGroupLinkVersionException("Url contains no known group link content");
+                return new GroupInviteLinkUrl(groupMasterKey, password);
+            } else {
+                throw new UnknownGroupLinkVersionException("Url contains no known group link content");
             }
         } catch (InvalidInputException | IOException e) {
             throw new InvalidGroupLinkException(e);
@@ -92,13 +90,12 @@ public final class GroupInviteLinkUrl {
     }
 
     private static String createUrl(GroupMasterKey groupMasterKey, GroupLinkPassword password) {
-        var groupInviteLink = GroupInviteLink.newBuilder()
-                .setV1Contents(GroupInviteLink.GroupInviteLinkContentsV1.newBuilder()
-                        .setGroupMasterKey(ByteString.copyFrom(groupMasterKey.serialize()))
-                        .setInviteLinkPassword(ByteString.copyFrom(password.serialize())))
-                .build();
+        var groupInviteLink = new GroupInviteLink.Builder().v1Contents(new GroupInviteLink.GroupInviteLinkContentsV1.Builder().groupMasterKey(
+                        ByteString.of(groupMasterKey.serialize()))
+                .inviteLinkPassword(ByteString.of(password.serialize()))
+                .build()).build();
 
-        var encoding = Base64UrlSafe.encodeBytesWithoutPadding(groupInviteLink.toByteArray());
+        var encoding = Base64.encodeUrlSafeWithoutPadding(groupInviteLink.encode());
 
         return GROUP_URL_PREFIX + encoding;
     }
@@ -115,7 +112,7 @@ public final class GroupInviteLinkUrl {
         return password;
     }
 
-    public final static class InvalidGroupLinkException extends Exception {
+    public static final class InvalidGroupLinkException extends Exception {
 
         public InvalidGroupLinkException(String message) {
             super(message);
@@ -126,7 +123,7 @@ public final class GroupInviteLinkUrl {
         }
     }
 
-    public final static class UnknownGroupLinkVersionException extends Exception {
+    public static final class UnknownGroupLinkVersionException extends Exception {
 
         public UnknownGroupLinkVersionException(String message) {
             super(message);
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupLinkState.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupLinkState.java
similarity index 67%
rename from lib/src/main/java/org/asamk/signal/manager/groups/GroupLinkState.java
rename to lib/src/main/java/org/asamk/signal/manager/api/GroupLinkState.java
index ad567fbf..899e8587 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupLinkState.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupLinkState.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 public enum GroupLinkState {
     ENABLED,
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupNotFoundException.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupNotFoundException.java
similarity index 81%
rename from lib/src/main/java/org/asamk/signal/manager/groups/GroupNotFoundException.java
rename to lib/src/main/java/org/asamk/signal/manager/api/GroupNotFoundException.java
index 0fc0c444..052354a3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupNotFoundException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupNotFoundException.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 public class GroupNotFoundException extends Exception {
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupPermission.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupPermission.java
similarity index 62%
rename from lib/src/main/java/org/asamk/signal/manager/groups/GroupPermission.java
rename to lib/src/main/java/org/asamk/signal/manager/api/GroupPermission.java
index 00366497..db6f2ecd 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupPermission.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupPermission.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 public enum GroupPermission {
     EVERY_MEMBER,
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupSendingNotAllowedException.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupSendingNotAllowedException.java
similarity index 86%
rename from lib/src/main/java/org/asamk/signal/manager/groups/GroupSendingNotAllowedException.java
rename to lib/src/main/java/org/asamk/signal/manager/api/GroupSendingNotAllowedException.java
index 1a2fa432..e328e341 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupSendingNotAllowedException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupSendingNotAllowedException.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 public class GroupSendingNotAllowedException extends Exception {
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Identity.java b/lib/src/main/java/org/asamk/signal/manager/api/Identity.java
index 8785df76..91f46750 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Identity.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Identity.java
@@ -1,20 +1,10 @@
 package org.asamk.signal.manager.api;
 
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
-import org.signal.libsignal.protocol.IdentityKey;
-
-import java.util.Date;
-
 public record Identity(
         RecipientAddress recipient,
-        IdentityKey identityKey,
+        byte[] fingerprint,
         String safetyNumber,
         byte[] scannableSafetyNumber,
         TrustLevel trustLevel,
-        Date dateAdded
-) {
-
-    public byte[] getFingerprint() {
-        return identityKey.getPublicKey().serialize();
-    }
-}
+        long dateAddedTimestamp
+) {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/IdentityVerificationCode.java b/lib/src/main/java/org/asamk/signal/manager/api/IdentityVerificationCode.java
new file mode 100644
index 00000000..0f05b480
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/IdentityVerificationCode.java
@@ -0,0 +1,28 @@
+package org.asamk.signal.manager.api;
+
+import org.signal.libsignal.protocol.util.Hex;
+
+import java.util.Base64;
+import java.util.Locale;
+
+public sealed interface IdentityVerificationCode {
+
+    record Fingerprint(byte[] fingerprint) implements IdentityVerificationCode {}
+
+    record SafetyNumber(String safetyNumber) implements IdentityVerificationCode {}
+
+    record ScannableSafetyNumber(byte[] safetyNumber) implements IdentityVerificationCode {}
+
+    static IdentityVerificationCode parse(String code) throws Exception {
+        code = code.replaceAll(" ", "");
+        if (code.length() == 66) {
+            final var fingerprintBytes = Hex.fromStringCondensed(code.toLowerCase(Locale.ROOT));
+            return new Fingerprint(fingerprintBytes);
+        } else if (code.length() == 60) {
+            return new SafetyNumber(code);
+        } else {
+            final var scannableSafetyNumber = Base64.getDecoder().decode(code);
+            return new ScannableSafetyNumber(scannableSafetyNumber);
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/InvalidNumberException.java b/lib/src/main/java/org/asamk/signal/manager/api/InvalidNumberException.java
index ba71ef2e..14f37966 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/InvalidNumberException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/InvalidNumberException.java
@@ -2,6 +2,10 @@ package org.asamk.signal.manager.api;
 
 public class InvalidNumberException extends Exception {
 
+    public InvalidNumberException(String message) {
+        super(message);
+    }
+
     InvalidNumberException(String message, Throwable e) {
         super(message, e);
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/InvalidUsernameException.java b/lib/src/main/java/org/asamk/signal/manager/api/InvalidUsernameException.java
new file mode 100644
index 00000000..2d3b58a7
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/InvalidUsernameException.java
@@ -0,0 +1,12 @@
+package org.asamk.signal.manager.api;
+
+public class InvalidUsernameException extends Exception {
+
+    public InvalidUsernameException(final String message) {
+        super(message);
+    }
+
+    public InvalidUsernameException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/LastGroupAdminException.java b/lib/src/main/java/org/asamk/signal/manager/api/LastGroupAdminException.java
similarity index 85%
rename from lib/src/main/java/org/asamk/signal/manager/groups/LastGroupAdminException.java
rename to lib/src/main/java/org/asamk/signal/manager/api/LastGroupAdminException.java
index 28c52fad..69d2ffb7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/LastGroupAdminException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/LastGroupAdminException.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 public class LastGroupAdminException extends Exception {
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Message.java b/lib/src/main/java/org/asamk/signal/manager/api/Message.java
index 1e76faea..9b372451 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Message.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Message.java
@@ -6,17 +6,32 @@ import java.util.Optional;
 public record Message(
         String messageText,
         List<String> attachments,
+        boolean viewOnce,
         List<Mention> mentions,
         Optional<Quote> quote,
         Optional<Sticker> sticker,
-        List<Preview> previews
+        List<Preview> previews,
+        Optional<StoryReply> storyReply,
+        List<TextStyle> textStyles
 ) {
 
     public record Mention(RecipientIdentifier.Single recipient, int start, int length) {}
 
-    public record Quote(long timestamp, RecipientIdentifier.Single author, String message, List<Mention> mentions) {}
+    public record Quote(
+            long timestamp,
+            RecipientIdentifier.Single author,
+            String message,
+            List<Mention> mentions,
+            List<TextStyle> textStyles,
+            List<Attachment> attachments
+    ) {
+
+        public record Attachment(String contentType, String filename, String preview) {}
+    }
 
     public record Sticker(byte[] packId, int stickerId) {}
 
     public record Preview(String url, String title, String description, Optional<String> image) {}
+
+    public record StoryReply(long timestamp, RecipientIdentifier.Single author) {}
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index 67a33613..d8438f5d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -1,20 +1,21 @@
 package org.asamk.signal.manager.api;
 
-import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupUtils;
 import org.asamk.signal.manager.helper.RecipientAddressResolver;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
 import org.signal.libsignal.metadata.ProtocolException;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId;
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
+import org.whispersystems.signalservice.api.messages.SignalServiceEditMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroupContext;
 import org.whispersystems.signalservice.api.messages.SignalServicePreview;
 import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
+import org.whispersystems.signalservice.api.messages.SignalServiceStoryMessage;
+import org.whispersystems.signalservice.api.messages.SignalServiceTextAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
 import org.whispersystems.signalservice.api.messages.calls.AnswerMessage;
 import org.whispersystems.signalservice.api.messages.calls.BusyMessage;
@@ -31,8 +32,10 @@ import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptM
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.ViewOnceOpenMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.ViewedMessage;
+import org.whispersystems.signalservice.api.push.ServiceId;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -48,8 +51,10 @@ public record MessageEnvelope(
         Optional<Receipt> receipt,
         Optional<Typing> typing,
         Optional<Data> data,
+        Optional<Edit> edit,
         Optional<Sync> sync,
-        Optional<Call> call
+        Optional<Call> call,
+        Optional<Story> story
 ) {
 
     public record Receipt(long when, Type type, List<Long> timestamps) {
@@ -94,12 +99,14 @@ public record MessageEnvelope(
     public record Data(
             long timestamp,
             Optional<GroupContext> groupContext,
+            Optional<StoryContext> storyContext,
             Optional<GroupCallUpdate> groupCallUpdate,
             Optional<String> body,
             int expiresInSeconds,
             boolean isExpirationUpdate,
             boolean isViewOnce,
             boolean isEndSession,
+            boolean isProfileKeyUpdate,
             boolean hasProfileKey,
             Optional<Reaction> reaction,
             Optional<Quote> quote,
@@ -109,7 +116,8 @@ public record MessageEnvelope(
             Optional<Sticker> sticker,
             List<SharedContact> sharedContacts,
             List<Mention> mentions,
-            List<Preview> previews
+            List<Preview> previews,
+            List<TextStyle> textStyles
     ) {
 
         static Data from(
@@ -120,15 +128,22 @@ public record MessageEnvelope(
         ) {
             return new Data(dataMessage.getTimestamp(),
                     dataMessage.getGroupContext().map(GroupContext::from),
+                    dataMessage.getStoryContext()
+                            .map((SignalServiceDataMessage.StoryContext storyContext) -> StoryContext.from(storyContext,
+                                    recipientResolver,
+                                    addressResolver)),
                     dataMessage.getGroupCallUpdate().map(GroupCallUpdate::from),
                     dataMessage.getBody(),
                     dataMessage.getExpiresInSeconds(),
                     dataMessage.isExpirationUpdate(),
                     dataMessage.isViewOnce(),
                     dataMessage.isEndSession(),
+                    dataMessage.isProfileKeyUpdate(),
                     dataMessage.getProfileKey().isPresent(),
                     dataMessage.getReaction().map(r -> Reaction.from(r, recipientResolver, addressResolver)),
-                    dataMessage.getQuote().map(q -> Quote.from(q, recipientResolver, addressResolver, fileProvider)),
+                    dataMessage.getQuote()
+                            .filter(q -> q.getAuthor() != null && q.getAuthor().isValid())
+                            .map(q -> Quote.from(q, recipientResolver, addressResolver, fileProvider)),
                     dataMessage.getPayment().map(p -> p.getPaymentNotification().isPresent() ? Payment.from(p) : null),
                     dataMessage.getAttachments()
                             .map(a -> a.stream().map(as -> Attachment.from(as, fileProvider)).toList())
@@ -145,6 +160,9 @@ public record MessageEnvelope(
                             .orElse(List.of()),
                     dataMessage.getPreviews()
                             .map(a -> a.stream().map(preview -> Preview.from(preview, fileProvider)).toList())
+                            .orElse(List.of()),
+                    dataMessage.getBodyRanges()
+                            .map(a -> a.stream().filter(r -> r.style != null).map(TextStyle::from).toList())
                             .orElse(List.of()));
         }
 
@@ -166,6 +184,18 @@ public record MessageEnvelope(
             }
         }
 
+        public record StoryContext(RecipientAddress author, long sentTimestamp) {
+
+            static StoryContext from(
+                    SignalServiceDataMessage.StoryContext storyContext,
+                    RecipientResolver recipientResolver,
+                    RecipientAddressResolver addressResolver
+            ) {
+                return new StoryContext(addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(
+                        storyContext.getAuthorServiceId())).toApiRecipientAddress(), storyContext.getSentTimestamp());
+            }
+        }
+
         public record GroupCallUpdate(String eraId) {
 
             static GroupCallUpdate from(SignalServiceDataMessage.GroupCallUpdate groupCallUpdate) {
@@ -183,7 +213,8 @@ public record MessageEnvelope(
                     RecipientAddressResolver addressResolver
             ) {
                 return new Reaction(reaction.getTargetSentTimestamp(),
-                        addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(reaction.getTargetAuthor())),
+                        addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(reaction.getTargetAuthor()))
+                                .toApiRecipientAddress(),
                         reaction.getEmoji(),
                         reaction.isRemove());
             }
@@ -194,7 +225,8 @@ public record MessageEnvelope(
                 RecipientAddress author,
                 Optional<String> text,
                 List<Mention> mentions,
-                List<Attachment> attachments
+                List<Attachment> attachments,
+                List<TextStyle> textStyles
         ) {
 
             static Quote from(
@@ -204,8 +236,9 @@ public record MessageEnvelope(
                     final AttachmentFileProvider fileProvider
             ) {
                 return new Quote(quote.getId(),
-                        addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(quote.getAuthor())),
-                        Optional.ofNullable(quote.getText()),
+                        addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(quote.getAuthor()))
+                                .toApiRecipientAddress(),
+                        Optional.of(quote.getText()),
                         quote.getMentions() == null
                                 ? List.of()
                                 : quote.getMentions()
@@ -214,7 +247,14 @@ public record MessageEnvelope(
                                         .toList(),
                         quote.getAttachments() == null
                                 ? List.of()
-                                : quote.getAttachments().stream().map(a -> Attachment.from(a, fileProvider)).toList());
+                                : quote.getAttachments().stream().map(a -> Attachment.from(a, fileProvider)).toList(),
+                        quote.getBodyRanges() == null
+                                ? List.of()
+                                : quote.getBodyRanges()
+                                        .stream()
+                                        .filter(r -> r.style != null)
+                                        .map(TextStyle::from)
+                                        .toList());
             }
         }
 
@@ -233,9 +273,8 @@ public record MessageEnvelope(
                     RecipientResolver recipientResolver,
                     RecipientAddressResolver addressResolver
             ) {
-                return new Mention(addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(mention.getServiceId())),
-                        mention.getStart(),
-                        mention.getLength());
+                return new Mention(addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(mention.getServiceId()))
+                        .toApiRecipientAddress(), mention.getStart(), mention.getLength());
             }
         }
 
@@ -256,44 +295,51 @@ public record MessageEnvelope(
                 boolean isBorderless
         ) {
 
-            static Attachment from(SignalServiceAttachment attachment, AttachmentFileProvider fileProvider) {
-                if (attachment.isPointer()) {
-                    final var a = attachment.asPointer();
-                    return new Attachment(Optional.of(a.getRemoteId().toString()),
-                            Optional.of(fileProvider.getFile(a.getRemoteId())),
+            static Attachment from(SignalServiceAttachment signalAttachment, AttachmentFileProvider fileProvider) {
+                if (signalAttachment.isPointer()) {
+                    final var a = signalAttachment.asPointer();
+                    final var attachmentFile = fileProvider.getFile(a);
+                    return new Attachment(Optional.of(attachmentFile.getName()),
+                            Optional.of(attachmentFile),
                             a.getFileName(),
                             a.getContentType(),
                             a.getUploadTimestamp() == 0 ? Optional.empty() : Optional.of(a.getUploadTimestamp()),
                             a.getSize().map(Integer::longValue),
                             a.getPreview(),
                             Optional.empty(),
-                            a.getCaption(),
+                            a.getCaption().map(c -> c.isEmpty() ? null : c),
                             a.getWidth() == 0 ? Optional.empty() : Optional.of(a.getWidth()),
                             a.getHeight() == 0 ? Optional.empty() : Optional.of(a.getHeight()),
                             a.getVoiceNote(),
                             a.isGif(),
                             a.isBorderless());
                 } else {
-                    final var a = attachment.asStream();
-                    return new Attachment(Optional.empty(),
-                            Optional.empty(),
-                            a.getFileName(),
-                            a.getContentType(),
-                            a.getUploadTimestamp() == 0 ? Optional.empty() : Optional.of(a.getUploadTimestamp()),
-                            Optional.of(a.getLength()),
-                            a.getPreview(),
-                            Optional.empty(),
-                            a.getCaption(),
-                            a.getWidth() == 0 ? Optional.empty() : Optional.of(a.getWidth()),
-                            a.getHeight() == 0 ? Optional.empty() : Optional.of(a.getHeight()),
-                            a.getVoiceNote(),
-                            a.isGif(),
-                            a.isBorderless());
+                    Attachment attachment = null;
+                    try (final var a = signalAttachment.asStream()) {
+                        attachment = new Attachment(Optional.empty(),
+                                Optional.empty(),
+                                a.getFileName(),
+                                a.getContentType(),
+                                a.getUploadTimestamp() == 0 ? Optional.empty() : Optional.of(a.getUploadTimestamp()),
+                                Optional.of(a.getLength()),
+                                a.getPreview(),
+                                Optional.empty(),
+                                a.getCaption(),
+                                a.getWidth() == 0 ? Optional.empty() : Optional.of(a.getWidth()),
+                                a.getHeight() == 0 ? Optional.empty() : Optional.of(a.getHeight()),
+                                a.getVoiceNote(),
+                                a.isGif(),
+                                a.isBorderless());
+                        return attachment;
+                    } catch (IOException e) {
+                        return attachment;
+                    }
                 }
             }
 
             static Attachment from(
-                    SignalServiceDataMessage.Quote.QuotedAttachment a, final AttachmentFileProvider fileProvider
+                    SignalServiceDataMessage.Quote.QuotedAttachment a,
+                    final AttachmentFileProvider fileProvider
             ) {
                 return new Attachment(Optional.empty(),
                         Optional.empty(),
@@ -345,7 +391,7 @@ public record MessageEnvelope(
             }
 
             public record Name(
-                    Optional<String> display,
+                    Optional<String> nickname,
                     Optional<String> given,
                     Optional<String> family,
                     Optional<String> prefix,
@@ -354,7 +400,7 @@ public record MessageEnvelope(
             ) {
 
                 static Name from(org.whispersystems.signalservice.api.messages.shared.SharedContact.Name name) {
-                    return new Name(name.getDisplay(),
+                    return new Name(name.getNickname(),
                             name.getGiven(),
                             name.getFamily(),
                             name.getPrefix(),
@@ -436,15 +482,15 @@ public record MessageEnvelope(
             ) {
 
                 static Address from(org.whispersystems.signalservice.api.messages.shared.SharedContact.PostalAddress address) {
-                    return new Address(Address.Type.from(address.getType()),
+                    return new Address(Type.from(address.getType()),
                             address.getLabel(),
-                            address.getLabel(),
-                            address.getLabel(),
-                            address.getLabel(),
-                            address.getLabel(),
-                            address.getLabel(),
-                            address.getLabel(),
-                            address.getLabel());
+                            address.getStreet(),
+                            address.getPobox(),
+                            address.getNeighborhood(),
+                            address.getCity(),
+                            address.getRegion(),
+                            address.getPostcode(),
+                            address.getCountry());
                 }
 
                 public enum Type {
@@ -465,9 +511,7 @@ public record MessageEnvelope(
 
         public record Preview(String title, String description, long date, String url, Optional<Attachment> image) {
 
-            static Preview from(
-                    SignalServicePreview preview, final AttachmentFileProvider fileProvider
-            ) {
+            static Preview from(SignalServicePreview preview, final AttachmentFileProvider fileProvider) {
                 return new Preview(preview.getTitle(),
                         preview.getDescription(),
                         preview.getDate(),
@@ -475,6 +519,20 @@ public record MessageEnvelope(
                         preview.getImage().map(as -> Attachment.from(as, fileProvider)));
             }
         }
+
+    }
+
+    public record Edit(long targetSentTimestamp, Data dataMessage) {
+
+        public static Edit from(
+                final SignalServiceEditMessage editMessage,
+                RecipientResolver recipientResolver,
+                RecipientAddressResolver addressResolver,
+                final AttachmentFileProvider fileProvider
+        ) {
+            return new Edit(editMessage.getTargetSentTimestamp(),
+                    Data.from(editMessage.getDataMessage(), recipientResolver, addressResolver, fileProvider));
+        }
     }
 
     public record Sync(
@@ -517,7 +575,9 @@ public record MessageEnvelope(
                 long expirationStartTimestamp,
                 Optional<RecipientAddress> destination,
                 Set<RecipientAddress> recipients,
-                Optional<Data> message
+                Optional<Data> message,
+                Optional<Edit> editMessage,
+                Optional<Story> story
         ) {
 
             static Sent from(
@@ -529,13 +589,18 @@ public record MessageEnvelope(
                 return new Sent(sentMessage.getTimestamp(),
                         sentMessage.getExpirationStartTimestamp(),
                         sentMessage.getDestination()
-                                .map(d -> addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(d))),
+                                .map(d -> addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(d))
+                                        .toApiRecipientAddress()),
                         sentMessage.getRecipients()
                                 .stream()
-                                .map(d -> addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(d)))
+                                .map(d -> addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(d))
+                                        .toApiRecipientAddress())
                                 .collect(Collectors.toSet()),
                         sentMessage.getDataMessage()
-                                .map(message -> Data.from(message, recipientResolver, addressResolver, fileProvider)));
+                                .map(message -> Data.from(message, recipientResolver, addressResolver, fileProvider)),
+                        sentMessage.getEditMessage()
+                                .map(message -> Edit.from(message, recipientResolver, addressResolver, fileProvider)),
+                        sentMessage.getStoryMessage().map(s -> Story.from(s, fileProvider)));
             }
         }
 
@@ -546,10 +611,12 @@ public record MessageEnvelope(
                     RecipientResolver recipientResolver,
                     RecipientAddressResolver addressResolver
             ) {
-                return new Blocked(blockedListMessage.getAddresses()
-                        .stream()
-                        .map(d -> addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(d)))
-                        .toList(), blockedListMessage.getGroupIds().stream().map(GroupId::unknownVersion).toList());
+                return new Blocked(blockedListMessage.individuals.stream()
+                        .map(d -> new RecipientAddress(d.getAci() == null ? null : d.getAci().toString(),
+                                null,
+                                d.getE164(),
+                                null))
+                        .toList(), blockedListMessage.groupIds.stream().map(GroupId::unknownVersion).toList());
             }
         }
 
@@ -560,8 +627,8 @@ public record MessageEnvelope(
                     RecipientResolver recipientResolver,
                     RecipientAddressResolver addressResolver
             ) {
-                return new Read(addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(readMessage.getSender())),
-                        readMessage.getTimestamp());
+                return new Read(addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(readMessage.getSender()))
+                        .toApiRecipientAddress(), readMessage.getTimestamp());
             }
         }
 
@@ -572,8 +639,8 @@ public record MessageEnvelope(
                     RecipientResolver recipientResolver,
                     RecipientAddressResolver addressResolver
             ) {
-                return new Viewed(addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(readMessage.getSender())),
-                        readMessage.getTimestamp());
+                return new Viewed(addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(readMessage.getSender()))
+                        .toApiRecipientAddress(), readMessage.getTimestamp());
             }
         }
 
@@ -585,7 +652,7 @@ public record MessageEnvelope(
                     RecipientAddressResolver addressResolver
             ) {
                 return new ViewOnceOpen(addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(
-                        readMessage.getSender())), readMessage.getTimestamp());
+                        readMessage.getSender())).toApiRecipientAddress(), readMessage.getTimestamp());
             }
         }
 
@@ -613,7 +680,8 @@ public record MessageEnvelope(
                 return new MessageRequestResponse(Type.from(messageRequestResponse.getType()),
                         messageRequestResponse.getGroupId().map(GroupId::unknownVersion),
                         messageRequestResponse.getPerson()
-                                .map(p -> addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(p))));
+                                .map(p -> addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(p))
+                                        .toApiRecipientAddress()));
             }
 
             public enum Type {
@@ -622,7 +690,9 @@ public record MessageEnvelope(
                 DELETE,
                 BLOCK,
                 BLOCK_AND_DELETE,
-                UNBLOCK_AND_ACCEPT;
+                UNBLOCK_AND_ACCEPT,
+                SPAM,
+                BLOCK_AND_SPAM;
 
                 static Type from(MessageRequestResponseMessage.Type type) {
                     return switch (type) {
@@ -632,6 +702,8 @@ public record MessageEnvelope(
                         case BLOCK -> BLOCK;
                         case BLOCK_AND_DELETE -> BLOCK_AND_DELETE;
                         case UNBLOCK_AND_ACCEPT -> UNBLOCK_AND_ACCEPT;
+                        case SPAM -> SPAM;
+                        case BLOCK_AND_SPAM -> BLOCK_AND_SPAM;
                     };
                 }
             }
@@ -647,7 +719,8 @@ public record MessageEnvelope(
             Optional<Hangup> hangup,
             Optional<Busy> busy,
             List<IceUpdate> iceUpdate,
-            Optional<Opaque> opaque
+            Optional<Opaque> opaque,
+            boolean isUrgent
     ) {
 
         public static Call from(final SignalServiceCallMessage callMessage) {
@@ -661,16 +734,14 @@ public record MessageEnvelope(
                     callMessage.getIceUpdateMessages()
                             .map(m -> m.stream().map(IceUpdate::from).toList())
                             .orElse(List.of()),
-                    callMessage.getOpaqueMessage().map(Opaque::from));
+                    callMessage.getOpaqueMessage().map(Opaque::from),
+                    callMessage.isUrgent());
         }
 
-        public record Offer(long id, String sdp, Type type, byte[] opaque) {
+        public record Offer(long id, Type type, byte[] opaque) {
 
             static Offer from(OfferMessage offerMessage) {
-                return new Offer(offerMessage.getId(),
-                        offerMessage.getSdp(),
-                        Type.from(offerMessage.getType()),
-                        offerMessage.getOpaque());
+                return new Offer(offerMessage.getId(), Type.from(offerMessage.getType()), offerMessage.getOpaque());
             }
 
             public enum Type {
@@ -686,10 +757,10 @@ public record MessageEnvelope(
             }
         }
 
-        public record Answer(long id, String sdp, byte[] opaque) {
+        public record Answer(long id, byte[] opaque) {
 
             static Answer from(AnswerMessage answerMessage) {
-                return new Answer(answerMessage.getId(), answerMessage.getSdp(), answerMessage.getOpaque());
+                return new Answer(answerMessage.getId(), answerMessage.getOpaque());
             }
         }
 
@@ -700,13 +771,12 @@ public record MessageEnvelope(
             }
         }
 
-        public record Hangup(long id, Type type, int deviceId, boolean isLegacy) {
+        public record Hangup(long id, Type type, int deviceId) {
 
             static Hangup from(HangupMessage hangupMessage) {
                 return new Hangup(hangupMessage.getId(),
                         Type.from(hangupMessage.getType()),
-                        hangupMessage.getDeviceId(),
-                        hangupMessage.isLegacy());
+                        hangupMessage.getDeviceId());
             }
 
             public enum Type {
@@ -728,10 +798,10 @@ public record MessageEnvelope(
             }
         }
 
-        public record IceUpdate(long id, String sdp, byte[] opaque) {
+        public record IceUpdate(long id, byte[] opaque) {
 
             static IceUpdate from(IceUpdateMessage iceUpdateMessage) {
-                return new IceUpdate(iceUpdateMessage.getId(), iceUpdateMessage.getSdp(), iceUpdateMessage.getOpaque());
+                return new IceUpdate(iceUpdateMessage.getId(), iceUpdateMessage.getOpaque());
             }
         }
 
@@ -755,6 +825,76 @@ public record MessageEnvelope(
         }
     }
 
+    public record Story(
+            boolean allowsReplies,
+            Optional<GroupId> groupId,
+            Optional<Data.Attachment> fileAttachment,
+            Optional<TextAttachment> textAttachment
+    ) {
+
+        public static Story from(SignalServiceStoryMessage storyMessage, final AttachmentFileProvider fileProvider) {
+            return new Story(storyMessage.getAllowsReplies().orElse(false),
+                    storyMessage.getGroupContext().map(c -> GroupUtils.getGroupIdV2(c.getMasterKey())),
+                    storyMessage.getFileAttachment().map(f -> Data.Attachment.from(f, fileProvider)),
+                    storyMessage.getTextAttachment().map(t -> TextAttachment.from(t, fileProvider)));
+        }
+
+        public record TextAttachment(
+                Optional<String> text,
+                Optional<Style> style,
+                Optional<Color> textForegroundColor,
+                Optional<Color> textBackgroundColor,
+                Optional<Data.Preview> preview,
+                Optional<Gradient> backgroundGradient,
+                Optional<Color> backgroundColor
+        ) {
+
+            static TextAttachment from(
+                    SignalServiceTextAttachment textAttachment,
+                    final AttachmentFileProvider fileProvider
+            ) {
+                return new TextAttachment(textAttachment.getText(),
+                        textAttachment.getStyle().map(Style::from),
+                        textAttachment.getTextForegroundColor().map(Color::new),
+                        textAttachment.getTextBackgroundColor().map(Color::new),
+                        textAttachment.getPreview().map(p -> Data.Preview.from(p, fileProvider)),
+                        textAttachment.getBackgroundGradient().map(Gradient::from),
+                        textAttachment.getBackgroundColor().map(Color::new));
+            }
+
+            public enum Style {
+                DEFAULT,
+                REGULAR,
+                BOLD,
+                SERIF,
+                SCRIPT,
+                CONDENSED;
+
+                static Style from(SignalServiceTextAttachment.Style style) {
+                    return switch (style) {
+                        case DEFAULT -> DEFAULT;
+                        case REGULAR -> REGULAR;
+                        case BOLD -> BOLD;
+                        case SERIF -> SERIF;
+                        case SCRIPT -> SCRIPT;
+                        case CONDENSED -> CONDENSED;
+                    };
+                }
+            }
+
+            public record Gradient(
+                    List<Color> colors, List<Float> positions, Optional<Integer> angle
+            ) {
+
+                static Gradient from(SignalServiceTextAttachment.Gradient gradient) {
+                    return new Gradient(gradient.getColors().stream().map(Color::new).toList(),
+                            gradient.getPositions(),
+                            gradient.getAngle());
+                }
+            }
+        }
+    }
+
     public static MessageEnvelope from(
             SignalServiceEnvelope envelope,
             SignalServiceContent content,
@@ -763,8 +903,9 @@ public record MessageEnvelope(
             final AttachmentFileProvider fileProvider,
             Exception exception
     ) {
-        final var source = !envelope.isUnidentifiedSender() && envelope.hasSourceUuid()
-                ? recipientResolver.resolveRecipient(envelope.getSourceAddress())
+        final var serviceId = envelope.getSourceServiceId().map(ServiceId::parseOrNull).orElse(null);
+        final var source = !envelope.isUnidentifiedSender() && serviceId != null
+                ? recipientResolver.resolveRecipient(serviceId)
                 : envelope.isUnidentifiedSender() && content != null
                         ? recipientResolver.resolveRecipient(content.getSender())
                         : exception instanceof ProtocolException e
@@ -779,28 +920,34 @@ public record MessageEnvelope(
         Optional<Receipt> receipt;
         Optional<Typing> typing;
         Optional<Data> data;
+        Optional<Edit> edit;
         Optional<Sync> sync;
         Optional<Call> call;
+        Optional<Story> story;
         if (content != null) {
             receipt = content.getReceiptMessage().map(Receipt::from);
             typing = content.getTypingMessage().map(Typing::from);
             data = content.getDataMessage()
                     .map(dataMessage -> Data.from(dataMessage, recipientResolver, addressResolver, fileProvider));
+            edit = content.getEditMessage().map(s -> Edit.from(s, recipientResolver, addressResolver, fileProvider));
             sync = content.getSyncMessage().map(s -> Sync.from(s, recipientResolver, addressResolver, fileProvider));
             call = content.getCallMessage().map(Call::from);
+            story = content.getStoryMessage().map(s -> Story.from(s, fileProvider));
         } else {
             receipt = envelope.isReceipt() ? Optional.of(new Receipt(envelope.getServerReceivedTimestamp(),
                     Receipt.Type.DELIVERY,
                     List.of(envelope.getTimestamp()))) : Optional.empty();
             typing = Optional.empty();
             data = Optional.empty();
+            edit = Optional.empty();
             sync = Optional.empty();
             call = Optional.empty();
+            story = Optional.empty();
         }
 
         return new MessageEnvelope(source == null
                 ? Optional.empty()
-                : Optional.of(addressResolver.resolveRecipientAddress(source)),
+                : Optional.of(addressResolver.resolveRecipientAddress(source).toApiRecipientAddress()),
                 sourceDevice,
                 envelope.getTimestamp(),
                 envelope.getServerReceivedTimestamp(),
@@ -809,12 +956,14 @@ public record MessageEnvelope(
                 receipt,
                 typing,
                 data,
+                edit,
                 sync,
-                call);
+                call,
+                story);
     }
 
     public interface AttachmentFileProvider {
 
-        File getFile(SignalServiceAttachmentRemoteId attachmentRemoteId);
+        File getFile(SignalServiceAttachmentPointer pointer);
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/NotAGroupMemberException.java b/lib/src/main/java/org/asamk/signal/manager/api/NotAGroupMemberException.java
similarity index 85%
rename from lib/src/main/java/org/asamk/signal/manager/groups/NotAGroupMemberException.java
rename to lib/src/main/java/org/asamk/signal/manager/api/NotAGroupMemberException.java
index 08cbcacd..6c188da3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/NotAGroupMemberException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/NotAGroupMemberException.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 public class NotAGroupMemberException extends Exception {
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/PendingAdminApprovalException.java b/lib/src/main/java/org/asamk/signal/manager/api/PendingAdminApprovalException.java
new file mode 100644
index 00000000..8da3ca51
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/PendingAdminApprovalException.java
@@ -0,0 +1,12 @@
+package org.asamk.signal.manager.api;
+
+public class PendingAdminApprovalException extends Exception {
+
+    public PendingAdminApprovalException(final String message) {
+        super(message);
+    }
+
+    public PendingAdminApprovalException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/PhoneNumberSharingMode.java b/lib/src/main/java/org/asamk/signal/manager/api/PhoneNumberSharingMode.java
index 9efa01be..fce56305 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/PhoneNumberSharingMode.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/PhoneNumberSharingMode.java
@@ -3,5 +3,16 @@ package org.asamk.signal.manager.api;
 public enum PhoneNumberSharingMode {
     EVERYBODY,
     CONTACTS,
-    NOBODY,
+    NOBODY;
+
+    public static PhoneNumberSharingMode valueOfOrNull(String value) {
+        if (value == null) {
+            return null;
+        }
+        try {
+            return valueOf(value);
+        } catch (IllegalArgumentException ignored) {
+            return null;
+        }
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/PinLockMissingException.java b/lib/src/main/java/org/asamk/signal/manager/api/PinLockMissingException.java
new file mode 100644
index 00000000..7887d45f
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/PinLockMissingException.java
@@ -0,0 +1,3 @@
+package org.asamk.signal.manager.api;
+
+public class PinLockMissingException extends Exception {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Profile.java b/lib/src/main/java/org/asamk/signal/manager/api/Profile.java
similarity index 89%
rename from lib/src/main/java/org/asamk/signal/manager/storage/recipients/Profile.java
rename to lib/src/main/java/org/asamk/signal/manager/api/Profile.java
index 909337b7..acbaac11 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Profile.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Profile.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.storage.recipients;
+package org.asamk.signal.manager.api;
 
 import org.whispersystems.signalservice.internal.util.Util;
 
@@ -26,6 +26,8 @@ public class Profile {
 
     private final Set<Capability> capabilities;
 
+    private final PhoneNumberSharingMode phoneNumberSharingMode;
+
     public Profile(
             final long lastUpdateTimestamp,
             final String givenName,
@@ -35,7 +37,8 @@ public class Profile {
             final String avatarUrlPath,
             final byte[] mobileCoinAddress,
             final UnidentifiedAccessMode unidentifiedAccessMode,
-            final Set<Capability> capabilities
+            final Set<Capability> capabilities,
+            final PhoneNumberSharingMode phoneNumberSharingMode
     ) {
         this.lastUpdateTimestamp = lastUpdateTimestamp;
         this.givenName = givenName;
@@ -46,6 +49,7 @@ public class Profile {
         this.mobileCoinAddress = mobileCoinAddress;
         this.unidentifiedAccessMode = unidentifiedAccessMode;
         this.capabilities = capabilities;
+        this.phoneNumberSharingMode = phoneNumberSharingMode;
     }
 
     private Profile(final Builder builder) {
@@ -58,6 +62,7 @@ public class Profile {
         mobileCoinAddress = builder.mobileCoinAddress;
         unidentifiedAccessMode = builder.unidentifiedAccessMode;
         capabilities = builder.capabilities;
+        phoneNumberSharingMode = builder.phoneNumberSharingMode;
     }
 
     public static Builder newBuilder() {
@@ -136,13 +141,17 @@ public class Profile {
         return capabilities;
     }
 
+    public PhoneNumberSharingMode getPhoneNumberSharingMode() {
+        return phoneNumberSharingMode;
+    }
+
     public enum UnidentifiedAccessMode {
         UNKNOWN,
         DISABLED,
         ENABLED,
         UNRESTRICTED;
 
-        static UnidentifiedAccessMode valueOfOrUnknown(String value) {
+        public static UnidentifiedAccessMode valueOfOrUnknown(String value) {
             try {
                 return valueOf(value);
             } catch (IllegalArgumentException ignored) {
@@ -153,11 +162,9 @@ public class Profile {
 
     public enum Capability {
         storage,
-        gv1Migration,
-        senderKey,
-        announcementGroup;
+        storageServiceEncryptionV2Capability;
 
-        static Capability valueOfOrNull(String value) {
+        public static Capability valueOfOrNull(String value) {
             try {
                 return valueOf(value);
             } catch (IllegalArgumentException ignored) {
@@ -203,6 +210,7 @@ public class Profile {
         private byte[] mobileCoinAddress;
         private UnidentifiedAccessMode unidentifiedAccessMode = UnidentifiedAccessMode.UNKNOWN;
         private Set<Capability> capabilities = Collections.emptySet();
+        private PhoneNumberSharingMode phoneNumberSharingMode;
         private long lastUpdateTimestamp = 0;
 
         private Builder() {
@@ -243,6 +251,11 @@ public class Profile {
             return this;
         }
 
+        public Builder withPhoneNumberSharingMode(final PhoneNumberSharingMode val) {
+            phoneNumberSharingMode = val;
+            return this;
+        }
+
         public Profile build() {
             return new Profile(this);
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/ProofRequiredException.java b/lib/src/main/java/org/asamk/signal/manager/api/ProofRequiredException.java
index 949dc4eb..21b4034d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/ProofRequiredException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/ProofRequiredException.java
@@ -31,12 +31,12 @@ public class ProofRequiredException extends Exception {
     }
 
     public enum Option {
-        RECAPTCHA,
+        CAPTCHA,
         PUSH_CHALLENGE;
 
         static Option from(org.whispersystems.signalservice.api.push.exceptions.ProofRequiredException.Option option) {
             return switch (option) {
-                case RECAPTCHA -> RECAPTCHA;
+                case CAPTCHA -> CAPTCHA;
                 case PUSH_CHALLENGE -> PUSH_CHALLENGE;
             };
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/RateLimitException.java b/lib/src/main/java/org/asamk/signal/manager/api/RateLimitException.java
new file mode 100644
index 00000000..54fcbbd1
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/RateLimitException.java
@@ -0,0 +1,15 @@
+package org.asamk.signal.manager.api;
+
+public class RateLimitException extends Exception {
+
+    private final long nextAttemptTimestamp;
+
+    public RateLimitException(final long nextAttemptTimestamp) {
+        super("Rate limit");
+        this.nextAttemptTimestamp = nextAttemptTimestamp;
+    }
+
+    public long getNextAttemptTimestamp() {
+        return nextAttemptTimestamp;
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/ReceiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/api/ReceiveConfig.java
index bf5f1d99..e9108d12 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/ReceiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/ReceiveConfig.java
@@ -1,3 +1,3 @@
 package org.asamk.signal.manager.api;
 
-public record ReceiveConfig(boolean ignoreAttachments, boolean sendReadReceipts) {}
+public record ReceiveConfig(boolean ignoreAttachments, boolean ignoreStories, boolean sendReadReceipts) {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Recipient.java b/lib/src/main/java/org/asamk/signal/manager/api/Recipient.java
new file mode 100644
index 00000000..9685bcab
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Recipient.java
@@ -0,0 +1,166 @@
+package org.asamk.signal.manager.api;
+
+import org.asamk.signal.manager.storage.recipients.RecipientId;
+import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
+
+import java.util.Objects;
+
+public class Recipient {
+
+    private final RecipientId recipientId;
+
+    private final RecipientAddress address;
+
+    private final Contact contact;
+
+    private final ProfileKey profileKey;
+
+    private final ExpiringProfileKeyCredential expiringProfileKeyCredential;
+
+    private final Profile profile;
+
+    private final Boolean discoverable;
+
+    public Recipient(
+            final RecipientId recipientId,
+            final RecipientAddress address,
+            final Contact contact,
+            final ProfileKey profileKey,
+            final ExpiringProfileKeyCredential expiringProfileKeyCredential,
+            final Profile profile,
+            final Boolean discoverable
+    ) {
+        this.recipientId = recipientId;
+        this.address = address;
+        this.contact = contact;
+        this.profileKey = profileKey;
+        this.expiringProfileKeyCredential = expiringProfileKeyCredential;
+        this.profile = profile;
+        this.discoverable = discoverable;
+    }
+
+    private Recipient(final Builder builder) {
+        recipientId = builder.recipientId;
+        address = builder.address;
+        contact = builder.contact;
+        profileKey = builder.profileKey;
+        expiringProfileKeyCredential = builder.expiringProfileKeyCredential;
+        profile = builder.profile;
+        discoverable = builder.discoverable;
+    }
+
+    public static Builder newBuilder() {
+        return new Builder();
+    }
+
+    public static Builder newBuilder(final Recipient copy) {
+        Builder builder = new Builder();
+        builder.recipientId = copy.getRecipientId();
+        builder.address = copy.getAddress();
+        builder.contact = copy.getContact();
+        builder.profileKey = copy.getProfileKey();
+        builder.expiringProfileKeyCredential = copy.getExpiringProfileKeyCredential();
+        builder.profile = copy.getProfile();
+        return builder;
+    }
+
+    public RecipientId getRecipientId() {
+        return recipientId;
+    }
+
+    public RecipientAddress getAddress() {
+        return address;
+    }
+
+    public Contact getContact() {
+        return contact;
+    }
+
+    public ProfileKey getProfileKey() {
+        return profileKey;
+    }
+
+    public ExpiringProfileKeyCredential getExpiringProfileKeyCredential() {
+        return expiringProfileKeyCredential;
+    }
+
+    public Profile getProfile() {
+        return profile;
+    }
+
+    public Boolean getDiscoverable() {
+        return discoverable;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        final Recipient recipient = (Recipient) o;
+        return Objects.equals(recipientId, recipient.recipientId)
+                && Objects.equals(address, recipient.address)
+                && Objects.equals(contact, recipient.contact)
+                && Objects.equals(profileKey, recipient.profileKey)
+                && Objects.equals(expiringProfileKeyCredential, recipient.expiringProfileKeyCredential)
+                && Objects.equals(profile, recipient.profile);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(recipientId, address, contact, profileKey, expiringProfileKeyCredential, profile);
+    }
+
+    public static final class Builder {
+
+        private RecipientId recipientId;
+        private RecipientAddress address;
+        private Contact contact;
+        private ProfileKey profileKey;
+        private ExpiringProfileKeyCredential expiringProfileKeyCredential;
+        private Profile profile;
+        private Boolean discoverable;
+
+        private Builder() {
+        }
+
+        public Builder withRecipientId(final RecipientId val) {
+            recipientId = val;
+            return this;
+        }
+
+        public Builder withAddress(final RecipientAddress val) {
+            address = val;
+            return this;
+        }
+
+        public Builder withContact(final Contact val) {
+            contact = val;
+            return this;
+        }
+
+        public Builder withProfileKey(final ProfileKey val) {
+            profileKey = val;
+            return this;
+        }
+
+        public Builder withExpiringProfileKeyCredential(final ExpiringProfileKeyCredential val) {
+            expiringProfileKeyCredential = val;
+            return this;
+        }
+
+        public Builder withProfile(final Profile val) {
+            profile = val;
+            return this;
+        }
+
+        public Builder withDiscoverable(final Boolean val) {
+            discoverable = val;
+            return this;
+        }
+
+        public Recipient build() {
+            return new Recipient(this);
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/RecipientAddress.java b/lib/src/main/java/org/asamk/signal/manager/api/RecipientAddress.java
new file mode 100644
index 00000000..dd8a6f3c
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/RecipientAddress.java
@@ -0,0 +1,76 @@
+package org.asamk.signal.manager.api;
+
+import org.whispersystems.signalservice.api.util.UuidUtil;
+
+import java.util.Optional;
+import java.util.UUID;
+
+public record RecipientAddress(
+        Optional<String> aci, Optional<String> pni, Optional<String> number, Optional<String> username
+) {
+
+    public static final UUID UNKNOWN_UUID = UuidUtil.UNKNOWN_UUID;
+
+    /**
+     * Construct a RecipientAddress.
+     *
+     * @param aci    The ACI of the user, if available.
+     * @param pni    The PNI of the user, if available.
+     * @param number The phone number of the user, if available.
+     */
+    public RecipientAddress {
+        if (aci.isEmpty() && pni.isEmpty() && number.isEmpty() && username.isEmpty()) {
+            throw new AssertionError("Must have either a ACI, PNI, username or E164 number!");
+        }
+    }
+
+    public RecipientAddress(String e164) {
+        this(null, null, e164, null);
+    }
+
+    public RecipientAddress(UUID uuid) {
+        this(uuid.toString(), null, null, null);
+    }
+
+    public RecipientAddress(String aci, String pni, String e164, String username) {
+        this(Optional.ofNullable(aci),
+                Optional.ofNullable(pni),
+                Optional.ofNullable(e164),
+                Optional.ofNullable(username));
+    }
+
+    public Optional<UUID> uuid() {
+        return aci.map(UUID::fromString);
+    }
+
+    public String getIdentifier() {
+        if (aci.isPresent()) {
+            return aci.get();
+        } else if (number.isPresent()) {
+            return number.get();
+        } else if (pni.isPresent()) {
+            return pni.get();
+        } else if (username.isPresent()) {
+            return username.get();
+        } else {
+            throw new AssertionError("Given the checks in the constructor, this should not be possible.");
+        }
+    }
+
+    public String getLegacyIdentifier() {
+        if (number.isPresent()) {
+            return number.get();
+        } else {
+            return getIdentifier();
+        }
+    }
+
+    public boolean matches(RecipientAddress other) {
+        return (aci.isPresent() && other.aci.isPresent() && aci.get().equals(other.aci.get()))
+                || (
+                pni.isPresent() && other.pni.isPresent() && pni.get().equals(other.pni.get())
+        )
+                || (number.isPresent() && other.number.isPresent() && number.get().equals(other.number.get()))
+                || (username.isPresent() && other.username.isPresent() && username.get().equals(other.username.get()));
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java b/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
index 242d0f47..b1a3ad61 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
@@ -1,10 +1,8 @@
 package org.asamk.signal.manager.api;
 
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.asamk.signal.manager.util.PhoneNumberFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.util.UUID;
@@ -26,27 +24,39 @@ public sealed interface RecipientIdentifier {
     sealed interface Single extends RecipientIdentifier {
 
         static Single fromString(String identifier, String localNumber) throws InvalidNumberException {
-            try {
-                if (UuidUtil.isUuid(identifier)) {
-                    return new Uuid(UUID.fromString(identifier));
-                }
-
-                final var normalizedNumber = PhoneNumberFormatter.formatNumber(identifier, localNumber);
-                if (!normalizedNumber.equals(identifier)) {
-                    final Logger logger = LoggerFactory.getLogger(RecipientIdentifier.class);
-                    logger.debug("Normalized number {} to {}.", identifier, normalizedNumber);
-                }
-                return new Number(normalizedNumber);
-            } catch (org.whispersystems.signalservice.api.util.InvalidNumberException e) {
-                throw new InvalidNumberException(e.getMessage(), e);
+            if (UuidUtil.isUuid(identifier)) {
+                return new Uuid(UUID.fromString(identifier));
             }
+
+            if (identifier.startsWith("PNI:")) {
+                final var pni = identifier.substring(4);
+                if (!UuidUtil.isUuid(pni)) {
+                    throw new InvalidNumberException("Invalid PNI");
+                }
+                return new Pni(UUID.fromString(pni));
+            }
+
+            if (identifier.startsWith("u:")) {
+                return new Username(identifier.substring(2));
+            }
+
+            final var normalizedNumber = PhoneNumberFormatter.formatNumber(identifier, localNumber);
+            if (!normalizedNumber.equals(identifier)) {
+                final Logger logger = LoggerFactory.getLogger(RecipientIdentifier.class);
+                logger.debug("Normalized number {} to {}.", identifier, normalizedNumber);
+            }
+            return new Number(normalizedNumber);
         }
 
         static Single fromAddress(RecipientAddress address) {
             if (address.number().isPresent()) {
                 return new Number(address.number().get());
-            } else if (address.uuid().isPresent()) {
-                return new Uuid(address.uuid().get());
+            } else if (address.aci().isPresent()) {
+                return new Uuid(UUID.fromString(address.aci().get()));
+            } else if (address.pni().isPresent()) {
+                return new Pni(UUID.fromString(address.pni().get().substring(4)));
+            } else if (address.username().isPresent()) {
+                return new Username(address.username().get());
             }
             throw new AssertionError("RecipientAddress without identifier");
         }
@@ -67,6 +77,19 @@ public sealed interface RecipientIdentifier {
         }
     }
 
+    record Pni(UUID pni) implements Single {
+
+        @Override
+        public String getIdentifier() {
+            return "PNI:" + pni.toString();
+        }
+
+        @Override
+        public RecipientAddress toPartialRecipientAddress() {
+            return new RecipientAddress(null, getIdentifier(), null, null);
+        }
+    }
+
     record Number(String number) implements Single {
 
         @Override
@@ -76,7 +99,20 @@ public sealed interface RecipientIdentifier {
 
         @Override
         public RecipientAddress toPartialRecipientAddress() {
-            return new RecipientAddress(null, number);
+            return new RecipientAddress(number);
+        }
+    }
+
+    record Username(String username) implements Single {
+
+        @Override
+        public String getIdentifier() {
+            return "u:" + username;
+        }
+
+        @Override
+        public RecipientAddress toPartialRecipientAddress() {
+            return new RecipientAddress(null, null, null, username);
         }
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResult.java b/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResult.java
index be5bf801..4158b60e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResult.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResult.java
@@ -1,9 +1,7 @@
 package org.asamk.signal.manager.api;
 
 import org.asamk.signal.manager.helper.RecipientAddressResolver;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
-import org.signal.libsignal.protocol.IdentityKey;
 
 public record SendMessageResult(
         RecipientAddress address,
@@ -12,29 +10,12 @@ public record SendMessageResult(
         boolean isUnregisteredFailure,
         boolean isIdentityFailure,
         boolean isRateLimitFailure,
-        ProofRequiredException proofRequiredFailure
+        ProofRequiredException proofRequiredFailure,
+        boolean isInvalidPreKeyFailure
 ) {
 
-    public static SendMessageResult success(RecipientAddress address) {
-        return new SendMessageResult(address, true, false, false, false, false, null);
-    }
-
-    public static SendMessageResult networkFailure(RecipientAddress address) {
-        return new SendMessageResult(address, false, true, false, false, false, null);
-    }
-
     public static SendMessageResult unregisteredFailure(RecipientAddress address) {
-        return new SendMessageResult(address, false, false, true, false, false, null);
-    }
-
-    public static SendMessageResult identityFailure(RecipientAddress address, IdentityKey identityKey) {
-        return new SendMessageResult(address, false, false, false, true, false, null);
-    }
-
-    public static SendMessageResult proofRequiredFailure(
-            RecipientAddress address, ProofRequiredException proofRequiredException
-    ) {
-        return new SendMessageResult(address, false, true, false, false, false, proofRequiredException);
+        return new SendMessageResult(address, false, false, true, false, false, null, false);
     }
 
     public static SendMessageResult from(
@@ -43,7 +24,7 @@ public record SendMessageResult(
             RecipientAddressResolver addressResolver
     ) {
         return new SendMessageResult(addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(
-                sendMessageResult.getAddress())),
+                sendMessageResult.getAddress())).toApiRecipientAddress(),
                 sendMessageResult.isSuccess(),
                 sendMessageResult.isNetworkFailure(),
                 sendMessageResult.isUnregisteredFailure(),
@@ -51,6 +32,7 @@ public record SendMessageResult(
                 sendMessageResult.getRateLimitFailure() != null || sendMessageResult.getProofRequiredFailure() != null,
                 sendMessageResult.getProofRequiredFailure() == null
                         ? null
-                        : new ProofRequiredException(sendMessageResult.getProofRequiredFailure()));
+                        : new ProofRequiredException(sendMessageResult.getProofRequiredFailure()),
+                sendMessageResult.isInvalidPreKeyFailure());
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResults.java b/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResults.java
index 5b8cfc03..de250163 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResults.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResults.java
@@ -19,4 +19,11 @@ public record SendMessageResults(long timestamp, Map<RecipientIdentifier, List<S
                 .allMatch(identityFailure -> identityFailure)
                 && results.values().stream().mapToInt(List::size).sum() > 0;
     }
+
+    public boolean hasOnlyRateLimitFailure() {
+        return results.values()
+                .stream()
+                .flatMap(res -> res.stream().map(SendMessageResult::isRateLimitFailure))
+                .allMatch(r -> r) && results.values().stream().mapToInt(List::size).sum() > 0;
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironment.java b/lib/src/main/java/org/asamk/signal/manager/api/ServiceEnvironment.java
similarity index 59%
rename from lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironment.java
rename to lib/src/main/java/org/asamk/signal/manager/api/ServiceEnvironment.java
index d83bf7d2..e3499827 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironment.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/ServiceEnvironment.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.config;
+package org.asamk.signal.manager.api;
 
 public enum ServiceEnvironment {
     LIVE,
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/StickerPackId.java b/lib/src/main/java/org/asamk/signal/manager/api/StickerPackId.java
index 38ea4950..e6b5a957 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/StickerPackId.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/StickerPackId.java
@@ -1,5 +1,7 @@
 package org.asamk.signal.manager.api;
 
+import org.whispersystems.signalservice.internal.util.Hex;
+
 import java.util.Arrays;
 
 public class StickerPackId {
@@ -32,4 +34,9 @@ public class StickerPackId {
     public int hashCode() {
         return Arrays.hashCode(id);
     }
+
+    @Override
+    public String toString() {
+        return "StickerPackId{" + Hex.toStringCondensed(id) + '}';
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java b/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java
index d018ac39..ea4e3f3e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java
@@ -11,10 +11,7 @@ import java.nio.charset.StandardCharsets;
 
 import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
 
-public final class StickerPackUrl {
-
-    private final StickerPackId packId;
-    private final byte[] packKey;
+public record StickerPackUrl(StickerPackId packId, byte[] packKey) {
 
     /**
      * @throws InvalidStickerPackLinkException If url cannot be parsed.
@@ -22,7 +19,7 @@ public final class StickerPackUrl {
     public static StickerPackUrl fromUri(URI uri) throws InvalidStickerPackLinkException {
         final var rawQuery = uri.getRawFragment();
         if (isEmpty(rawQuery)) {
-            throw new RuntimeException("Invalid sticker pack uri");
+            throw new InvalidStickerPackLinkException("Invalid sticker pack uri");
         }
 
         var query = Utils.getQueryMap(rawQuery);
@@ -48,11 +45,6 @@ public final class StickerPackUrl {
         return new StickerPackUrl(packId, packKey);
     }
 
-    public StickerPackUrl(final StickerPackId packId, final byte[] packKey) {
-        this.packId = packId;
-        this.packKey = packKey;
-    }
-
     public URI getUrl() {
         try {
             return new URI("https",
@@ -67,15 +59,7 @@ public final class StickerPackUrl {
         }
     }
 
-    public StickerPackId getPackId() {
-        return packId;
-    }
-
-    public byte[] getPackKey() {
-        return packKey;
-    }
-
-    public final static class InvalidStickerPackLinkException extends Exception {
+    public static final class InvalidStickerPackLinkException extends Exception {
 
         public InvalidStickerPackLinkException(String message) {
             super(message);
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/TextStyle.java b/lib/src/main/java/org/asamk/signal/manager/api/TextStyle.java
new file mode 100644
index 00000000..bec504f0
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/TextStyle.java
@@ -0,0 +1,63 @@
+package org.asamk.signal.manager.api;
+
+import org.whispersystems.signalservice.internal.push.BodyRange;
+
+public record TextStyle(Style style, Integer start, Integer length) {
+
+    public enum Style {
+        NONE,
+        BOLD,
+        ITALIC,
+        SPOILER,
+        STRIKETHROUGH,
+        MONOSPACE;
+
+        static Style fromInternal(BodyRange.Style style) {
+            if (style == null) {
+                return NONE;
+            }
+            return switch (style) {
+                case NONE -> NONE;
+                case BOLD -> BOLD;
+                case ITALIC -> ITALIC;
+                case SPOILER -> SPOILER;
+                case STRIKETHROUGH -> STRIKETHROUGH;
+                case MONOSPACE -> MONOSPACE;
+            };
+        }
+
+        public static Style from(String style) {
+            return switch (style) {
+                case "NONE" -> NONE;
+                case "BOLD" -> BOLD;
+                case "ITALIC" -> ITALIC;
+                case "SPOILER" -> SPOILER;
+                case "STRIKETHROUGH" -> STRIKETHROUGH;
+                case "MONOSPACE" -> MONOSPACE;
+                default -> null;
+            };
+        }
+
+        BodyRange.Style toBodyRangeStyle() {
+            return switch (this) {
+                case NONE -> BodyRange.Style.NONE;
+                case BOLD -> BodyRange.Style.BOLD;
+                case ITALIC -> BodyRange.Style.ITALIC;
+                case SPOILER -> BodyRange.Style.SPOILER;
+                case STRIKETHROUGH -> BodyRange.Style.STRIKETHROUGH;
+                case MONOSPACE -> BodyRange.Style.MONOSPACE;
+            };
+        }
+    }
+
+    static TextStyle from(BodyRange bodyRange) {
+        return new TextStyle(Style.fromInternal(bodyRange.style), bodyRange.start, bodyRange.length);
+    }
+
+    public BodyRange toBodyRange() {
+        return new BodyRange.Builder().start(this.start())
+                .length(this.length())
+                .style(this.style().toBodyRangeStyle())
+                .build();
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/TrustLevel.java b/lib/src/main/java/org/asamk/signal/manager/api/TrustLevel.java
index 4016f487..ac93e34a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/TrustLevel.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/TrustLevel.java
@@ -1,7 +1,6 @@
 package org.asamk.signal.manager.api;
 
 import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
-import org.whispersystems.signalservice.internal.storage.protos.ContactRecord;
 
 public enum TrustLevel {
     UNTRUSTED,
@@ -17,15 +16,6 @@ public enum TrustLevel {
         return TrustLevel.cachedValues[i];
     }
 
-    public static TrustLevel fromIdentityState(ContactRecord.IdentityState identityState) {
-        return switch (identityState) {
-            case DEFAULT -> TRUSTED_UNVERIFIED;
-            case UNVERIFIED -> UNTRUSTED;
-            case VERIFIED -> TRUSTED_VERIFIED;
-            case UNRECOGNIZED -> null;
-        };
-    }
-
     public static TrustLevel fromVerifiedState(VerifiedMessage.VerifiedState verifiedState) {
         return switch (verifiedState) {
             case DEFAULT -> TRUSTED_UNVERIFIED;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/TrustNewIdentity.java b/lib/src/main/java/org/asamk/signal/manager/api/TrustNewIdentity.java
similarity index 58%
rename from lib/src/main/java/org/asamk/signal/manager/storage/identities/TrustNewIdentity.java
rename to lib/src/main/java/org/asamk/signal/manager/api/TrustNewIdentity.java
index b2db73a3..e86c11d9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/TrustNewIdentity.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/TrustNewIdentity.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.storage.identities;
+package org.asamk.signal.manager.api;
 
 public enum TrustNewIdentity {
     ALWAYS,
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/UnregisteredRecipientException.java b/lib/src/main/java/org/asamk/signal/manager/api/UnregisteredRecipientException.java
index d37c7dc7..ef7d5b74 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/UnregisteredRecipientException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/UnregisteredRecipientException.java
@@ -1,7 +1,5 @@
 package org.asamk.signal.manager.api;
 
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
-
 public class UnregisteredRecipientException extends Exception {
 
     private final RecipientAddress sender;
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/UntrustedIdentityException.java b/lib/src/main/java/org/asamk/signal/manager/api/UntrustedIdentityException.java
index 7328cf64..e91903a5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/UntrustedIdentityException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/UntrustedIdentityException.java
@@ -1,7 +1,5 @@
 package org.asamk.signal.manager.api;
 
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
-
 public class UntrustedIdentityException extends Exception {
 
     private final RecipientAddress sender;
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java b/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java
index 71b18a67..c1ba4270 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java
@@ -1,9 +1,5 @@
 package org.asamk.signal.manager.api;
 
-import org.asamk.signal.manager.groups.GroupLinkState;
-import org.asamk.signal.manager.groups.GroupPermission;
-
-import java.io.File;
 import java.util.Set;
 
 public class UpdateGroup {
@@ -20,7 +16,7 @@ public class UpdateGroup {
     private final GroupLinkState groupLinkState;
     private final GroupPermission addMemberPermission;
     private final GroupPermission editDetailsPermission;
-    private final File avatarFile;
+    private final String avatarFile;
     private final Integer expirationTimer;
     private final Boolean isAnnouncementGroup;
 
@@ -77,7 +73,7 @@ public class UpdateGroup {
             final GroupLinkState groupLinkState,
             final GroupPermission addMemberPermission,
             final GroupPermission editDetailsPermission,
-            final File avatarFile,
+            final String avatarFile,
             final Integer expirationTimer,
             final Boolean isAnnouncementGroup
     ) {
@@ -146,7 +142,7 @@ public class UpdateGroup {
         return editDetailsPermission;
     }
 
-    public File getAvatarFile() {
+    public String getAvatarFile() {
         return avatarFile;
     }
 
@@ -172,7 +168,7 @@ public class UpdateGroup {
         private GroupLinkState groupLinkState;
         private GroupPermission addMemberPermission;
         private GroupPermission editDetailsPermission;
-        private File avatarFile;
+        private String avatarFile;
         private Integer expirationTimer;
         private Boolean isAnnouncementGroup;
 
@@ -192,7 +188,7 @@ public class UpdateGroup {
                 final GroupLinkState groupLinkState,
                 final GroupPermission addMemberPermission,
                 final GroupPermission editDetailsPermission,
-                final File avatarFile,
+                final String avatarFile,
                 final Integer expirationTimer,
                 final Boolean isAnnouncementGroup
         ) {
@@ -273,7 +269,7 @@ public class UpdateGroup {
             return this;
         }
 
-        public Builder withAvatarFile(final File val) {
+        public Builder withAvatarFile(final String val) {
             avatarFile = val;
             return this;
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/UpdateProfile.java b/lib/src/main/java/org/asamk/signal/manager/api/UpdateProfile.java
index d5de308e..3cfffe5f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/UpdateProfile.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/UpdateProfile.java
@@ -1,14 +1,12 @@
 package org.asamk.signal.manager.api;
 
-import java.io.File;
-
 public class UpdateProfile {
 
     private final String givenName;
     private final String familyName;
     private final String about;
     private final String aboutEmoji;
-    private final File avatar;
+    private final String avatar;
     private final boolean deleteAvatar;
     private final byte[] mobileCoinAddress;
 
@@ -54,7 +52,7 @@ public class UpdateProfile {
         return aboutEmoji;
     }
 
-    public File getAvatar() {
+    public String getAvatar() {
         return avatar;
     }
 
@@ -72,7 +70,7 @@ public class UpdateProfile {
         private String familyName;
         private String about;
         private String aboutEmoji;
-        private File avatar;
+        private String avatar;
         private boolean deleteAvatar;
         private byte[] mobileCoinAddress;
 
@@ -99,7 +97,7 @@ public class UpdateProfile {
             return this;
         }
 
-        public Builder withAvatar(final File val) {
+        public Builder withAvatar(final String val) {
             avatar = val;
             return this;
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/UsernameLinkUrl.java b/lib/src/main/java/org/asamk/signal/manager/api/UsernameLinkUrl.java
new file mode 100644
index 00000000..f8fff6eb
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/UsernameLinkUrl.java
@@ -0,0 +1,82 @@
+package org.asamk.signal.manager.api;
+
+import org.signal.core.util.Base64;
+import org.whispersystems.signalservice.api.push.UsernameLinkComponents;
+import org.whispersystems.signalservice.api.util.UuidUtil;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.regex.Pattern;
+
+public final class UsernameLinkUrl {
+
+    private static final Pattern URL_REGEX = Pattern.compile("(https://)?signal.me/?#eu/([a-zA-Z0-9+\\-_/]+)");
+
+    private static final String BASE_URL = "https://signal.me/#eu/";
+
+    private final String url;
+    private final UsernameLinkComponents usernameLinkComponents;
+
+    public static UsernameLinkUrl fromUri(String url) throws InvalidUsernameLinkException {
+        final var matcher = URL_REGEX.matcher(url);
+        if (!matcher.matches()) {
+            throw new InvalidUsernameLinkException("Invalid username link");
+        }
+        final var path = matcher.group(2);
+        final byte[] allBytes;
+        try {
+            allBytes = Base64.decode(path);
+        } catch (IOException e) {
+            throw new InvalidUsernameLinkException("Invalid base64 encoding");
+        }
+
+        if (allBytes.length != 48) {
+            throw new InvalidUsernameLinkException("Invalid username link");
+        }
+
+        final var entropy = Arrays.copyOfRange(allBytes, 0, 32);
+        final var serverId = Arrays.copyOfRange(allBytes, 32, allBytes.length);
+        final var serverIdUuid = UuidUtil.parseOrNull(serverId);
+        if (serverIdUuid == null) {
+            throw new InvalidUsernameLinkException("Invalid serverId");
+        }
+
+        return new UsernameLinkUrl(new UsernameLinkComponents(entropy, serverIdUuid));
+    }
+
+    public UsernameLinkUrl(UsernameLinkComponents usernameLinkComponents) {
+        this.usernameLinkComponents = usernameLinkComponents;
+        this.url = createUrl(usernameLinkComponents);
+    }
+
+    private static String createUrl(UsernameLinkComponents usernameLinkComponents) {
+        final var entropy = usernameLinkComponents.getEntropy();
+        final var serverId = UuidUtil.toByteArray(usernameLinkComponents.getServerId());
+
+        final var combined = new byte[entropy.length + serverId.length];
+        System.arraycopy(entropy, 0, combined, 0, entropy.length);
+        System.arraycopy(serverId, 0, combined, entropy.length, serverId.length);
+
+        final var base64 = Base64.encodeUrlSafeWithoutPadding(combined);
+        return BASE_URL + base64;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public UsernameLinkComponents getComponents() {
+        return usernameLinkComponents;
+    }
+
+    public static final class InvalidUsernameLinkException extends Exception {
+
+        public InvalidUsernameLinkException(String message) {
+            super(message);
+        }
+
+        public InvalidUsernameLinkException(Throwable cause) {
+            super(cause);
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/UsernameStatus.java b/lib/src/main/java/org/asamk/signal/manager/api/UsernameStatus.java
new file mode 100644
index 00000000..570d5511
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/UsernameStatus.java
@@ -0,0 +1,5 @@
+package org.asamk.signal.manager.api;
+
+import java.util.UUID;
+
+public record UsernameStatus(String username, UUID uuid, boolean unrestrictedUnidentifiedAccess) {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/VerificationMethodNotAvailableException.java b/lib/src/main/java/org/asamk/signal/manager/api/VerificationMethodNotAvailableException.java
new file mode 100644
index 00000000..9ffdb68f
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/VerificationMethodNotAvailableException.java
@@ -0,0 +1,8 @@
+package org.asamk.signal.manager.api;
+
+public class VerificationMethodNotAvailableException extends Exception {
+
+    public VerificationMethodNotAvailableException() {
+        super("Invalid verification method");
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/IasTrustStore.java b/lib/src/main/java/org/asamk/signal/manager/config/IasTrustStore.java
deleted file mode 100644
index 4d70809b..00000000
--- a/lib/src/main/java/org/asamk/signal/manager/config/IasTrustStore.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.asamk.signal.manager.config;
-
-import org.whispersystems.signalservice.api.push.TrustStore;
-
-import java.io.InputStream;
-
-class IasTrustStore implements TrustStore {
-
-    @Override
-    public InputStream getKeyStoreInputStream() {
-        return IasTrustStore.class.getResourceAsStream("ias.store");
-    }
-
-    @Override
-    public String getKeyStorePassword() {
-        return "whisper";
-    }
-}
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/KeyBackupConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/KeyBackupConfig.java
index 60173c1d..8872a2d8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/KeyBackupConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/KeyBackupConfig.java
@@ -1,26 +1,3 @@
 package org.asamk.signal.manager.config;
 
-public class KeyBackupConfig {
-
-    private final String enclaveName;
-    private final byte[] serviceId;
-    private final String mrenclave;
-
-    public KeyBackupConfig(final String enclaveName, final byte[] serviceId, final String mrenclave) {
-        this.enclaveName = enclaveName;
-        this.serviceId = serviceId;
-        this.mrenclave = mrenclave;
-    }
-
-    public String getEnclaveName() {
-        return enclaveName;
-    }
-
-    public byte[] getServiceId() {
-        return serviceId;
-    }
-
-    public String getMrenclave() {
-        return mrenclave;
-    }
-}
+public record KeyBackupConfig(String enclaveName, byte[] serviceId, String mrenclave) {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 98e1f026..c76da017 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -1,18 +1,17 @@
 package org.asamk.signal.manager.config;
 
-import org.bouncycastle.util.encoders.Hex;
+import org.signal.libsignal.net.Network.Environment;
 import org.signal.libsignal.protocol.InvalidKeyException;
-import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.api.push.TrustStore;
+import org.whispersystems.signalservice.internal.configuration.HttpProxy;
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl;
-import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl;
-import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalProxy;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalSvr2Url;
 
 import java.util.Base64;
 import java.util.List;
@@ -22,31 +21,39 @@ import java.util.Optional;
 import okhttp3.Dns;
 import okhttp3.Interceptor;
 
+import static org.asamk.signal.manager.api.ServiceEnvironment.LIVE;
+
 class LiveConfig {
 
-    private final static byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
+    private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF");
-    private final static String CDS_MRENCLAVE = "c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15";
+    private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
+    private static final String SVR2_MRENCLAVE_LEGACY_LEGACY = "9314436a9a144992bb3680770ea5fd7934a7ffd29257844a33763a238903d570";
+    private static final String SVR2_MRENCLAVE_LEGACY = "093be9ea32405e85ae28dbb48eb668aebeb7dbe29517b9b86ad4bec4dfe0e6a6";
+    private static final String SVR2_MRENCLAVE = "29cd63c87bea751e3bfd0fbd401279192e2e5c99948b4ee9437eafc4968355fb";
 
-    private final static String KEY_BACKUP_ENCLAVE_NAME = "fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe";
-    private final static byte[] KEY_BACKUP_SERVICE_ID = Hex.decode(
-            "fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe");
-    private final static String KEY_BACKUP_MRENCLAVE = "a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87";
+    private static final String URL = "https://chat.signal.org";
+    private static final String CDN_URL = "https://cdn.signal.org";
+    private static final String CDN2_URL = "https://cdn2.signal.org";
+    private static final String CDN3_URL = "https://cdn3.signal.org";
+    private static final String STORAGE_URL = "https://storage.signal.org";
+    private static final String SIGNAL_CDSI_URL = "https://cdsi.signal.org";
+    private static final String SIGNAL_SVR2_URL = "https://svr2.signal.org";
+    private static final TrustStore TRUST_STORE = new WhisperTrustStore();
 
-    private final static String URL = "https://chat.signal.org";
-    private final static String CDN_URL = "https://cdn.signal.org";
-    private final static String CDN2_URL = "https://cdn2.signal.org";
-    private final static String SIGNAL_CONTACT_DISCOVERY_URL = "https://api.directory.signal.org";
-    private final static String SIGNAL_KEY_BACKUP_URL = "https://api.backup.signal.org";
-    private final static String STORAGE_URL = "https://storage.signal.org";
-    private final static String SIGNAL_CDSI_URL = "";
-    private final static TrustStore TRUST_STORE = new WhisperTrustStore();
+    private static final Optional<Dns> dns = Optional.empty();
+    private static final Optional<SignalProxy> proxy = Optional.empty();
+    private static final Optional<HttpProxy> systemProxy = Optional.empty();
 
-    private final static Optional<Dns> dns = Optional.empty();
-    private final static Optional<SignalProxy> proxy = Optional.empty();
+    private static final byte[] zkGroupServerPublicParams = Base64.getDecoder()
+            .decode("AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P+NameAZYOD12qRkxosQQP5uux6B2nRyZ7sAV54DgFyLiRcq1FvwKw2EPQdk4HDoePrO/RNUbyNddnM/mMgj4FW65xCoT1LmjrIjsv/Ggdlx46ueczhMgtBunx1/w8k8V+l8LVZ8gAT6wkU5J+DPQalQguMg12Jzug3q4TbdHiGCmD9EunCwOmsLuLJkz6EcSYXtrlDEnAM+hicw7iergYLLlMXpfTdGxJCWJmP4zqUFeTTmsmhsjGBt7NiEB/9pFFEB3pSbf4iiUukw63Eo8Aqnf4iwob6X1QviCWuc8t0LUlT9vALgh/f2DPVOOmR0RW6bgRvc7DSF20V/omg+YBw==");
+    private static final byte[] genericServerPublicParams = Base64.getDecoder()
+            .decode("AByD873dTilmOSG0TjKrvpeaKEsUmIO8Vx9BeMmftwUs9v7ikPwM8P3OHyT0+X3EUMZrSe9VUp26Wai51Q9I8mdk0hX/yo7CeFGJyzoOqn8e/i4Ygbn5HoAyXJx5eXfIbqpc0bIxzju4H/HOQeOpt6h742qii5u/cbwOhFZCsMIbElZTaeU+BWMBQiZHIGHT5IE0qCordQKZ5iPZom0HeFa8Yq0ShuEyAl0WINBiY6xE3H/9WnvzXBbMuuk//eRxXgzO8ieCeK8FwQNxbfXqZm6Ro1cMhCOF3u7xoX83QhpN");
 
-    private final static byte[] zkGroupServerPublicParams = Base64.getDecoder()
-            .decode("AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXQ==");
+    private static final byte[] backupServerPublicParams = Base64.getDecoder()
+            .decode("AJwNSU55fsFCbgaxGRD11wO1juAs8Yr5GF8FPlGzzvdJJIKH5/4CC7ZJSOe3yL2vturVaRU2Cx0n751Vt8wkj1bozK3CBV1UokxV09GWf+hdVImLGjXGYLLhnI1J2TWEe7iWHyb553EEnRb5oxr9n3lUbNAJuRmFM7hrr0Al0F0wrDD4S8lo2mGaXe0MJCOM166F8oYRQqpFeEHfiLnxA1O8ZLh7vMdv4g9jI5phpRBTsJ5IjiJrWeP0zdIGHEssUeprDZ9OUJ14m0v61eYJMKsf59Bn+mAT2a7YfB+Don9O");
+
+    private static final Environment LIBSIGNAL_NET_ENV = Environment.PRODUCTION;
 
     static SignalServiceConfiguration createDefaultServiceConfiguration(
             final List<Interceptor> interceptors
@@ -55,32 +62,37 @@ class LiveConfig {
                 Map.of(0,
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)},
                         2,
-                        new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)}),
-                new SignalContactDiscoveryUrl[]{new SignalContactDiscoveryUrl(SIGNAL_CONTACT_DISCOVERY_URL,
-                        TRUST_STORE)},
-                new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
+                        new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)},
+                        3,
+                        new SignalCdnUrl[]{new SignalCdnUrl(CDN3_URL, TRUST_STORE)}),
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
                 new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)},
+                new SignalSvr2Url[]{new SignalSvr2Url(SIGNAL_SVR2_URL, TRUST_STORE, null, null)},
                 interceptors,
                 dns,
                 proxy,
-                zkGroupServerPublicParams);
+                systemProxy,
+                zkGroupServerPublicParams,
+                genericServerPublicParams,
+                backupServerPublicParams,
+                false);
     }
 
     static ECPublicKey getUnidentifiedSenderTrustRoot() {
         try {
-            return Curve.decodePoint(UNIDENTIFIED_SENDER_TRUST_ROOT, 0);
+            return new ECPublicKey(UNIDENTIFIED_SENDER_TRUST_ROOT);
         } catch (InvalidKeyException e) {
             throw new AssertionError(e);
         }
     }
 
-    static KeyBackupConfig createKeyBackupConfig() {
-        return new KeyBackupConfig(KEY_BACKUP_ENCLAVE_NAME, KEY_BACKUP_SERVICE_ID, KEY_BACKUP_MRENCLAVE);
-    }
-
-    static String getCdsMrenclave() {
-        return CDS_MRENCLAVE;
+    static ServiceEnvironmentConfig getServiceEnvironmentConfig(List<Interceptor> interceptors) {
+        return new ServiceEnvironmentConfig(LIVE,
+                LIBSIGNAL_NET_ENV,
+                createDefaultServiceConfiguration(interceptors),
+                getUnidentifiedSenderTrustRoot(),
+                CDSI_MRENCLAVE,
+                List.of(SVR2_MRENCLAVE, SVR2_MRENCLAVE_LEGACY, SVR2_MRENCLAVE_LEGACY_LEGACY));
     }
 
     private LiveConfig() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 91b07ce3..587fc89b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -1,71 +1,42 @@
 package org.asamk.signal.manager.config;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.asamk.signal.manager.api.ServiceEnvironment;
+import org.signal.libsignal.protocol.util.Medium;
 import org.whispersystems.signalservice.api.account.AccountAttributes;
-import org.whispersystems.signalservice.api.push.TrustStore;
 
-import java.io.IOException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import okhttp3.Interceptor;
 
 public class ServiceConfig {
 
-    private final static Logger logger = LoggerFactory.getLogger(ServiceConfig.class);
+    public static final int PREKEY_MINIMUM_COUNT = 10;
+    public static final int PREKEY_BATCH_SIZE = 100;
+    public static final int PREKEY_MAXIMUM_ID = Medium.MAX_VALUE;
+    public static final long PREKEY_ARCHIVE_AGE = TimeUnit.DAYS.toMillis(30);
+    public static final long PREKEY_STALE_AGE = TimeUnit.DAYS.toMillis(90);
+    public static final long SIGNED_PREKEY_ROTATE_AGE = TimeUnit.DAYS.toMillis(2);
 
-    public final static int PREKEY_MINIMUM_COUNT = 20;
-    public final static int PREKEY_BATCH_SIZE = 100;
-    public final static int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;
-    public final static long MAX_ENVELOPE_SIZE = 0;
-    public final static long AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE = 10 * 1024 * 1024;
-    public final static boolean AUTOMATIC_NETWORK_RETRY = true;
-    public final static int GROUP_MAX_SIZE = 1001;
+    public static final int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;
+    public static final long MAX_ENVELOPE_SIZE = 0;
+    public static final int MAX_MESSAGE_SIZE_BYTES = 2000;
+    public static final long AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE = 10 * 1024 * 1024;
+    public static final boolean AUTOMATIC_NETWORK_RETRY = true;
+    public static final int GROUP_MAX_SIZE = 1001;
+    public static final int MAXIMUM_ONE_OFF_REQUEST_SIZE = 3;
+    public static final long UNREGISTERED_LIFESPAN = TimeUnit.DAYS.toMillis(30);
 
-    private final static KeyStore iasKeyStore;
-
-    public static final AccountAttributes.Capabilities capabilities;
-
-    static {
-        capabilities = new AccountAttributes.Capabilities(false, true, false, true, true, true, true, false, false);
-
-        try {
-            TrustStore contactTrustStore = new IasTrustStore();
-
-            var keyStore = KeyStore.getInstance("BKS");
-            keyStore.load(contactTrustStore.getKeyStoreInputStream(),
-                    contactTrustStore.getKeyStorePassword().toCharArray());
-
-            iasKeyStore = keyStore;
-        } catch (KeyStoreException | CertificateException | IOException | NoSuchAlgorithmException e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    public static boolean isSignalClientAvailable() {
-        try {
-            try {
-                org.signal.libsignal.internal.Native.UuidCiphertext_CheckValidContents(new byte[0]);
-            } catch (Exception e) {
-                logger.trace("Expected exception when checking libsignal-client: {}", e.getMessage());
-            }
-            return true;
-        } catch (UnsatisfiedLinkError e) {
-            logger.warn("Failed to call libsignal-client: {}", e.getMessage());
-            return false;
-        }
-    }
-
-    public static KeyStore getIasKeyStore() {
-        return iasKeyStore;
+    public static AccountAttributes.Capabilities getCapabilities(boolean isPrimaryDevice) {
+        final var deleteSync = !isPrimaryDevice;
+        final var storageEncryptionV2 = !isPrimaryDevice;
+        final var attachmentBackfill = !isPrimaryDevice;
+        return new AccountAttributes.Capabilities(true, deleteSync, true, storageEncryptionV2, attachmentBackfill);
     }
 
     public static ServiceEnvironmentConfig getServiceEnvironmentConfig(
-            ServiceEnvironment serviceEnvironment, String userAgent
+            ServiceEnvironment serviceEnvironment,
+            String userAgent
     ) {
         final Interceptor userAgentInterceptor = chain -> chain.proceed(chain.request()
                 .newBuilder()
@@ -75,16 +46,8 @@ public class ServiceConfig {
         final var interceptors = List.of(userAgentInterceptor);
 
         return switch (serviceEnvironment) {
-            case LIVE -> new ServiceEnvironmentConfig(serviceEnvironment,
-                    LiveConfig.createDefaultServiceConfiguration(interceptors),
-                    LiveConfig.getUnidentifiedSenderTrustRoot(),
-                    LiveConfig.createKeyBackupConfig(),
-                    LiveConfig.getCdsMrenclave());
-            case STAGING -> new ServiceEnvironmentConfig(serviceEnvironment,
-                    StagingConfig.createDefaultServiceConfiguration(interceptors),
-                    StagingConfig.getUnidentifiedSenderTrustRoot(),
-                    StagingConfig.createKeyBackupConfig(),
-                    StagingConfig.getCdsMrenclave());
+            case LIVE -> LiveConfig.getServiceEnvironmentConfig(interceptors);
+            case STAGING -> StagingConfig.getServiceEnvironmentConfig(interceptors);
         };
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
index b6a6af1d..8f9f8ce3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
@@ -1,50 +1,17 @@
 package org.asamk.signal.manager.config;
 
+import org.asamk.signal.manager.api.ServiceEnvironment;
+import org.signal.libsignal.net.Network;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
 
-public class ServiceEnvironmentConfig {
+import java.util.List;
 
-    private final ServiceEnvironment type;
-    private final SignalServiceConfiguration signalServiceConfiguration;
-
-    private final ECPublicKey unidentifiedSenderTrustRoot;
-
-    private final KeyBackupConfig keyBackupConfig;
-
-    private final String cdsMrenclave;
-
-    public ServiceEnvironmentConfig(
-            final ServiceEnvironment type,
-            final SignalServiceConfiguration signalServiceConfiguration,
-            final ECPublicKey unidentifiedSenderTrustRoot,
-            final KeyBackupConfig keyBackupConfig,
-            final String cdsMrenclave
-    ) {
-        this.type = type;
-        this.signalServiceConfiguration = signalServiceConfiguration;
-        this.unidentifiedSenderTrustRoot = unidentifiedSenderTrustRoot;
-        this.keyBackupConfig = keyBackupConfig;
-        this.cdsMrenclave = cdsMrenclave;
-    }
-
-    public ServiceEnvironment getType() {
-        return type;
-    }
-
-    public SignalServiceConfiguration getSignalServiceConfiguration() {
-        return signalServiceConfiguration;
-    }
-
-    public ECPublicKey getUnidentifiedSenderTrustRoot() {
-        return unidentifiedSenderTrustRoot;
-    }
-
-    public KeyBackupConfig getKeyBackupConfig() {
-        return keyBackupConfig;
-    }
-
-    public String getCdsMrenclave() {
-        return cdsMrenclave;
-    }
-}
+public record ServiceEnvironmentConfig(
+        ServiceEnvironment type,
+        Network.Environment netEnvironment,
+        SignalServiceConfiguration signalServiceConfiguration,
+        ECPublicKey unidentifiedSenderTrustRoot,
+        String cdsiMrenclave,
+        List<String> svr2Mrenclaves
+) {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index 8faec0eb..e25fe21b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -1,18 +1,17 @@
 package org.asamk.signal.manager.config;
 
-import org.bouncycastle.util.encoders.Hex;
+import org.signal.libsignal.net.Network;
 import org.signal.libsignal.protocol.InvalidKeyException;
-import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.api.push.TrustStore;
+import org.whispersystems.signalservice.internal.configuration.HttpProxy;
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl;
-import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl;
-import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalProxy;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalSvr2Url;
 
 import java.util.Base64;
 import java.util.List;
@@ -22,31 +21,39 @@ import java.util.Optional;
 import okhttp3.Dns;
 import okhttp3.Interceptor;
 
+import static org.asamk.signal.manager.api.ServiceEnvironment.STAGING;
+
 class StagingConfig {
 
-    private final static byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
+    private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx");
-    private final static String CDS_MRENCLAVE = "c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15";
+    private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
+    private static final String SVR2_MRENCLAVE_LEGACY_LEGACY = "38e01eff4fe357dc0b0e8ef7a44b4abc5489fbccba3a78780f3872c277f62bf3";
+    private static final String SVR2_MRENCLAVE_LEGACY = "2e8cefe6e3f389d8426adb24e9b7fb7adf10902c96f06f7bbcee36277711ed91";
+    private static final String SVR2_MRENCLAVE = "a75542d82da9f6914a1e31f8a7407053b99cc99a0e7291d8fbd394253e19b036";
 
-    private final static String KEY_BACKUP_ENCLAVE_NAME = "823a3b2c037ff0cbe305cc48928cfcc97c9ed4a8ca6d49af6f7d6981fb60a4e9";
-    private final static byte[] KEY_BACKUP_SERVICE_ID = Hex.decode(
-            "16b94ac6d2b7f7b9d72928f36d798dbb35ed32e7bb14c42b4301ad0344b46f29");
-    private final static String KEY_BACKUP_MRENCLAVE = "a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87";
+    private static final String URL = "https://chat.staging.signal.org";
+    private static final String CDN_URL = "https://cdn-staging.signal.org";
+    private static final String CDN2_URL = "https://cdn2-staging.signal.org";
+    private static final String CDN3_URL = "https://cdn3-staging.signal.org";
+    private static final String STORAGE_URL = "https://storage-staging.signal.org";
+    private static final String SIGNAL_CDSI_URL = "https://cdsi.staging.signal.org";
+    private static final String SIGNAL_SVR2_URL = "https://svr2.staging.signal.org";
+    private static final TrustStore TRUST_STORE = new WhisperTrustStore();
 
-    private final static String URL = "https://chat.staging.signal.org";
-    private final static String CDN_URL = "https://cdn-staging.signal.org";
-    private final static String CDN2_URL = "https://cdn2-staging.signal.org";
-    private final static String SIGNAL_CONTACT_DISCOVERY_URL = "https://api-staging.directory.signal.org";
-    private final static String SIGNAL_KEY_BACKUP_URL = "https://api-staging.backup.signal.org";
-    private final static String STORAGE_URL = "https://storage-staging.signal.org";
-    private final static String SIGNAL_CDSI_URL = "https://cdsi.staging.signal.org";
-    private final static TrustStore TRUST_STORE = new WhisperTrustStore();
+    private static final Optional<Dns> dns = Optional.empty();
+    private static final Optional<SignalProxy> proxy = Optional.empty();
+    private static final Optional<HttpProxy> systemProxy = Optional.empty();
 
-    private final static Optional<Dns> dns = Optional.empty();
-    private final static Optional<SignalProxy> proxy = Optional.empty();
+    private static final byte[] zkGroupServerPublicParams = Base64.getDecoder()
+            .decode("ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUjlENAErBme1YHmOSpU6tr6doJ66dPzVAWIanmO/5mgjNEDeK7DDqQdB1xd03HT2Qs2TxY3kCK8aAb/0iM0HQiXjxZ9HIgYhbtvGEnDKW5ILSUydqH/KBhW4Pb0jZWnqN/YgbWDKeJxnDbYcUob5ZY5Lt5ZCMKuaGUvCJRrCtuugSMaqjowCGRempsDdJEt+cMaalhZ6gczklJB/IbdwENW9KeVFPoFNFzhxWUIS5ML9riVYhAtE6JE5jX0xiHNVIIPthb458cfA8daR0nYfYAUKogQArm0iBezOO+mPk5vCNWI+wwkyFCqNDXz/qxl1gAntuCJtSfq9OC3NkdhQlgYQ==");
+    private static final byte[] genericServerPublicParams = Base64.getDecoder()
+            .decode("AHILOIrFPXX9laLbalbA9+L1CXpSbM/bTJXZGZiuyK1JaI6dK5FHHWL6tWxmHKYAZTSYmElmJ5z2A5YcirjO/yfoemE03FItyaf8W1fE4p14hzb5qnrmfXUSiAIVrhaXVwIwSzH6RL/+EO8jFIjJ/YfExfJ8aBl48CKHgu1+A6kWynhttonvWWx6h7924mIzW0Czj2ROuh4LwQyZypex4GuOPW8sgIT21KNZaafgg+KbV7XM1x1tF3XA17B4uGUaDbDw2O+nR1+U5p6qHPzmJ7ggFjSN6Utu+35dS1sS0P9N");
 
-    private final static byte[] zkGroupServerPublicParams = Base64.getDecoder()
-            .decode("ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXQ==");
+    private static final byte[] backupServerPublicParams = Base64.getDecoder()
+            .decode("AHYrGb9IfugAAJiPKp+mdXUx+OL9zBolPYHYQz6GI1gWjpEu5me3zVNSvmYY4zWboZHif+HG1sDHSuvwFd0QszSwuSF4X4kRP3fJREdTZ5MCR0n55zUppTwfHRW2S4sdQ0JGz7YDQIJCufYSKh0pGNEHL6hv79Agrdnr4momr3oXdnkpVBIp3HWAQ6IbXQVSG18X36GaicI1vdT0UFmTwU2KTneluC2eyL9c5ff8PcmiS+YcLzh0OKYQXB5ZfQ06d6DiINvDQLy75zcfUOniLAj0lGJiHxGczin/RXisKSR8");
+
+    private static final Network.Environment LIBSIGNAL_NET_ENV = Network.Environment.STAGING;
 
     static SignalServiceConfiguration createDefaultServiceConfiguration(
             final List<Interceptor> interceptors
@@ -55,32 +62,37 @@ class StagingConfig {
                 Map.of(0,
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)},
                         2,
-                        new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)}),
-                new SignalContactDiscoveryUrl[]{new SignalContactDiscoveryUrl(SIGNAL_CONTACT_DISCOVERY_URL,
-                        TRUST_STORE)},
-                new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
+                        new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)},
+                        3,
+                        new SignalCdnUrl[]{new SignalCdnUrl(CDN3_URL, TRUST_STORE)}),
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
                 new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)},
+                new SignalSvr2Url[]{new SignalSvr2Url(SIGNAL_SVR2_URL, TRUST_STORE, null, null)},
                 interceptors,
                 dns,
                 proxy,
-                zkGroupServerPublicParams);
+                systemProxy,
+                zkGroupServerPublicParams,
+                genericServerPublicParams,
+                backupServerPublicParams,
+                false);
     }
 
     static ECPublicKey getUnidentifiedSenderTrustRoot() {
         try {
-            return Curve.decodePoint(UNIDENTIFIED_SENDER_TRUST_ROOT, 0);
+            return new ECPublicKey(UNIDENTIFIED_SENDER_TRUST_ROOT);
         } catch (InvalidKeyException e) {
             throw new AssertionError(e);
         }
     }
 
-    static KeyBackupConfig createKeyBackupConfig() {
-        return new KeyBackupConfig(KEY_BACKUP_ENCLAVE_NAME, KEY_BACKUP_SERVICE_ID, KEY_BACKUP_MRENCLAVE);
-    }
-
-    static String getCdsMrenclave() {
-        return CDS_MRENCLAVE;
+    static ServiceEnvironmentConfig getServiceEnvironmentConfig(List<Interceptor> interceptors) {
+        return new ServiceEnvironmentConfig(STAGING,
+                LIBSIGNAL_NET_ENV,
+                createDefaultServiceConfiguration(interceptors),
+                getUnidentifiedSenderTrustRoot(),
+                CDSI_MRENCLAVE,
+                List.of(SVR2_MRENCLAVE, SVR2_MRENCLAVE_LEGACY, SVR2_MRENCLAVE_LEGACY_LEGACY));
     }
 
     private StagingConfig() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java b/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
index 356fb984..ae686c36 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
@@ -1,5 +1,8 @@
 package org.asamk.signal.manager.groups;
 
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupIdV1;
+import org.asamk.signal.manager.api.GroupIdV2;
 import org.asamk.signal.manager.storage.groups.GroupInfo;
 import org.asamk.signal.manager.storage.groups.GroupInfoV1;
 import org.asamk.signal.manager.storage.groups.GroupInfoV2;
@@ -15,7 +18,8 @@ import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
 public class GroupUtils {
 
     public static void setGroupContext(
-            final SignalServiceDataMessage.Builder messageBuilder, final GroupInfo groupInfo
+            final SignalServiceDataMessage.Builder messageBuilder,
+            final GroupInfo groupInfo
     ) {
         if (groupInfo instanceof GroupInfoV1) {
             var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.DELIVER)
@@ -25,7 +29,7 @@ public class GroupUtils {
         } else {
             final var groupInfoV2 = (GroupInfoV2) groupInfo;
             var group = SignalServiceGroupV2.newBuilder(groupInfoV2.getMasterKey())
-                    .withRevision(groupInfoV2.getGroup() == null ? 0 : groupInfoV2.getGroup().getRevision())
+                    .withRevision(groupInfoV2.getGroup() == null ? 0 : groupInfoV2.getGroup().revision)
                     .build();
             messageBuilder.asGroupMessage(group);
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountFileUpdater.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountFileUpdater.java
index a983e4b5..8edd5a4e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountFileUpdater.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountFileUpdater.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.helper;
 
-import org.whispersystems.signalservice.api.push.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 
 public interface AccountFileUpdater {
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index bae049c5..de3e2402 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -1,31 +1,69 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.DeviceLinkInfo;
-import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
+import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.IncorrectPinException;
-import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.PinLockMissingException;
 import org.asamk.signal.manager.api.PinLockedException;
-import org.asamk.signal.manager.config.ServiceConfig;
+import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
+import org.asamk.signal.manager.internal.SignalDependencies;
+import org.asamk.signal.manager.jobs.SyncStorageJob;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.asamk.signal.manager.util.NumberVerificationUtils;
+import org.asamk.signal.manager.util.Utils;
+import org.signal.core.util.Base64;
+import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidKeyException;
+import org.signal.libsignal.protocol.SignalProtocolAddress;
+import org.signal.libsignal.protocol.state.KyberPreKeyRecord;
+import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
+import org.signal.libsignal.protocol.util.KeyHelper;
+import org.signal.libsignal.usernames.BaseUsernameException;
+import org.signal.libsignal.usernames.Username;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.push.ACI;
-import org.whispersystems.signalservice.api.push.PNI;
+import org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest;
+import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
+import org.whispersystems.signalservice.api.link.LinkedDeviceVerificationCodeResponse;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
+import org.whispersystems.signalservice.api.push.ServiceIdType;
+import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.push.SignedPreKeyEntity;
+import org.whispersystems.signalservice.api.push.UsernameLinkComponents;
+import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
+import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
+import org.whispersystems.signalservice.api.push.exceptions.UsernameIsNotReservedException;
+import org.whispersystems.signalservice.api.push.exceptions.UsernameMalformedException;
+import org.whispersystems.signalservice.api.push.exceptions.UsernameTakenException;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
+import org.whispersystems.signalservice.internal.push.DeviceLimitExceededException;
+import org.whispersystems.signalservice.internal.push.KyberPreKeyEntity;
+import org.whispersystems.signalservice.internal.push.OutgoingPushMessage;
+import org.whispersystems.signalservice.internal.push.SyncMessage;
+import org.whispersystems.signalservice.internal.push.exceptions.MismatchedDevicesException;
 
 import java.io.IOException;
-import java.util.Optional;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
+import okio.ByteString;
+
+import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_MAXIMUM_ID;
+import static org.asamk.signal.manager.util.Utils.handleResponseException;
+import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
+
 public class AccountHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(AccountHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(AccountHelper.class);
 
     private final Context context;
     private final SignalAccount account;
@@ -56,14 +94,33 @@ public class AccountHelper {
             }
         }
         try {
-            context.getPreKeyHelper().refreshPreKeysIfNecessary();
+            updateAccountAttributes();
+            if (account.getPreviousStorageVersion() < 9) {
+                context.getPreKeyHelper().forceRefreshPreKeys();
+            } else {
+                context.getPreKeyHelper().refreshPreKeysIfNecessary();
+            }
             if (account.getAci() == null || account.getPni() == null) {
                 checkWhoAmiI();
             }
             if (!account.isPrimaryDevice() && account.getPniIdentityKeyPair() == null) {
-                context.getSyncHelper().requestSyncPniIdentity();
+                throw new IOException("Missing PNI identity key, relinking required");
             }
-            updateAccountAttributes();
+            if (account.getPreviousStorageVersion() < 10
+                    && account.isPrimaryDevice()
+                    && account.getRegistrationLockPin() != null) {
+                migrateRegistrationPin();
+            }
+            if (account.getUsername() != null && account.getUsernameLink() == null) {
+                try {
+                    tryToSetUsernameLink(new Username(account.getUsername()));
+                } catch (BaseUsernameException e) {
+                    logger.debug("Invalid local username");
+                }
+            }
+        } catch (DeprecatedVersionException e) {
+            logger.debug("Signal-Server returned deprecated version exception", e);
+            throw e;
         } catch (AuthorizationFailedException e) {
             account.setRegistered(false);
             throw e;
@@ -73,8 +130,8 @@ public class AccountHelper {
     public void checkWhoAmiI() throws IOException {
         final var whoAmI = dependencies.getAccountManager().getWhoAmI();
         final var number = whoAmI.getNumber();
-        final var aci = ACI.parseOrNull(whoAmI.getAci());
-        final var pni = PNI.parseOrNull(whoAmI.getPni());
+        final var aci = ACI.parseOrThrow(whoAmI.getAci());
+        final var pni = PNI.parseOrThrow(whoAmI.getPni());
         if (number.equals(account.getNumber()) && aci.equals(account.getAci()) && pni.equals(account.getPni())) {
             return;
         }
@@ -86,31 +143,369 @@ public class AccountHelper {
         account.setNumber(number);
         account.setAci(aci);
         account.setPni(pni);
+        if (account.isPrimaryDevice() && account.getPniIdentityKeyPair() == null) {
+            account.setPniIdentityKeyPair(KeyUtils.generateIdentityKeyPair());
+        }
         account.getRecipientTrustedResolver().resolveSelfRecipientTrusted(account.getSelfRecipientAddress());
-        // TODO check and update remote storage
         context.getUnidentifiedAccessHelper().rotateSenderCertificates();
         dependencies.resetAfterAddressChange();
-        dependencies.getSignalWebSocket().forceNewWebSockets();
+        context.getGroupV2Helper().clearAuthCredentialCache();
         context.getAccountFileUpdater().updateAccountIdentifiers(account.getNumber(), account.getAci());
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
+    }
+
+    public void setPni(
+            final PNI updatedPni,
+            final IdentityKeyPair pniIdentityKeyPair,
+            final String number,
+            final int localPniRegistrationId,
+            final SignedPreKeyRecord pniSignedPreKey,
+            final KyberPreKeyRecord lastResortKyberPreKey
+    ) throws IOException {
+        updateSelfIdentifiers(number != null ? number : account.getNumber(), account.getAci(), updatedPni);
+        account.setNewPniIdentity(pniIdentityKeyPair, pniSignedPreKey, lastResortKyberPreKey, localPniRegistrationId);
+        context.getPreKeyHelper().refreshPreKeysIfNecessary(ServiceIdType.PNI);
     }
 
     public void startChangeNumber(
-            String newNumber, String captcha, boolean voiceVerification
-    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException {
+            String newNumber,
+            boolean voiceVerification,
+            String captcha
+    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethodNotAvailableException {
         final var accountManager = dependencies.createUnauthenticatedAccountManager(newNumber, account.getPassword());
-        NumberVerificationUtils.requestVerificationCode(accountManager, captcha, voiceVerification);
+        final var registrationApi = accountManager.getRegistrationApi();
+        String sessionId = NumberVerificationUtils.handleVerificationSession(registrationApi,
+                account.getSessionId(newNumber),
+                id -> account.setSessionId(newNumber, id),
+                voiceVerification,
+                captcha);
+        NumberVerificationUtils.requestVerificationCode(registrationApi, sessionId, voiceVerification);
     }
 
     public void finishChangeNumber(
-            String newNumber, String verificationCode, String pin
-    ) throws IncorrectPinException, PinLockedException, IOException {
-        final var result = NumberVerificationUtils.verifyNumber(verificationCode,
+            String newNumber,
+            String verificationCode,
+            String pin
+    ) throws IncorrectPinException, PinLockedException, IOException, PinLockMissingException {
+        for (var attempts = 0; attempts < 5; attempts++) {
+            try {
+                finishChangeNumberInternal(newNumber, verificationCode, pin);
+                break;
+            } catch (MismatchedDevicesException e) {
+                logger.debug("Change number failed with mismatched devices, retrying.");
+                try {
+                    dependencies.getMessageSender().handleChangeNumberMismatchDevices(e.getMismatchedDevices());
+                } catch (UntrustedIdentityException ex) {
+                    throw new AssertionError(ex);
+                }
+            }
+        }
+    }
+
+    private void finishChangeNumberInternal(
+            String newNumber,
+            String verificationCode,
+            String pin
+    ) throws IncorrectPinException, PinLockedException, IOException, PinLockMissingException {
+        final var pniIdentity = KeyUtils.generateIdentityKeyPair();
+        final var encryptedDeviceMessages = new ArrayList<OutgoingPushMessage>();
+        final var devicePniSignedPreKeys = new HashMap<Integer, SignedPreKeyEntity>();
+        final var devicePniLastResortKyberPreKeys = new HashMap<Integer, KyberPreKeyEntity>();
+        final var pniRegistrationIds = new HashMap<Integer, Integer>();
+
+        final var selfDeviceId = account.getDeviceId();
+        SyncMessage.PniChangeNumber selfChangeNumber = null;
+
+        final var deviceIds = new ArrayList<Integer>();
+        deviceIds.add(SignalServiceAddress.DEFAULT_DEVICE_ID);
+        final var aci = account.getAci();
+        final var accountDataStore = account.getSignalServiceDataStore().aci();
+        final var subDeviceSessions = accountDataStore.getSubDeviceSessions(aci.toString())
+                .stream()
+                .filter(deviceId -> accountDataStore.containsSession(new SignalProtocolAddress(aci.toString(),
+                        deviceId)))
+                .toList();
+        deviceIds.addAll(subDeviceSessions);
+
+        final var messageSender = dependencies.getMessageSender();
+        for (final var deviceId : deviceIds) {
+            // Signed Prekey
+            final SignedPreKeyRecord signedPreKeyRecord;
+            try {
+                signedPreKeyRecord = KeyUtils.generateSignedPreKeyRecord(KeyUtils.getRandomInt(PREKEY_MAXIMUM_ID),
+                        pniIdentity.getPrivateKey());
+                final var signedPreKeyEntity = new SignedPreKeyEntity(signedPreKeyRecord.getId(),
+                        signedPreKeyRecord.getKeyPair().getPublicKey(),
+                        signedPreKeyRecord.getSignature());
+                devicePniSignedPreKeys.put(deviceId, signedPreKeyEntity);
+            } catch (InvalidKeyException e) {
+                throw new AssertionError("unexpected invalid key", e);
+            }
+
+            // Last-resort kyber prekey
+            final KyberPreKeyRecord lastResortKyberPreKeyRecord;
+            try {
+                lastResortKyberPreKeyRecord = KeyUtils.generateKyberPreKeyRecord(KeyUtils.getRandomInt(PREKEY_MAXIMUM_ID),
+                        pniIdentity.getPrivateKey());
+                final var kyberPreKeyEntity = new KyberPreKeyEntity(lastResortKyberPreKeyRecord.getId(),
+                        lastResortKyberPreKeyRecord.getKeyPair().getPublicKey(),
+                        lastResortKyberPreKeyRecord.getSignature());
+                devicePniLastResortKyberPreKeys.put(deviceId, kyberPreKeyEntity);
+            } catch (InvalidKeyException e) {
+                throw new AssertionError("unexpected invalid key", e);
+            }
+
+            // Registration Id
+            var pniRegistrationId = -1;
+            while (pniRegistrationId < 0 || pniRegistrationIds.containsValue(pniRegistrationId)) {
+                pniRegistrationId = KeyHelper.generateRegistrationId(false);
+            }
+            pniRegistrationIds.put(deviceId, pniRegistrationId);
+
+            // Device Message
+            final var pniChangeNumber = new SyncMessage.PniChangeNumber.Builder().identityKeyPair(ByteString.of(
+                            pniIdentity.serialize()))
+                    .signedPreKey(ByteString.of(signedPreKeyRecord.serialize()))
+                    .lastResortKyberPreKey(ByteString.of(lastResortKyberPreKeyRecord.serialize()))
+                    .registrationId(pniRegistrationId)
+                    .newE164(newNumber)
+                    .build();
+
+            if (deviceId == selfDeviceId) {
+                selfChangeNumber = pniChangeNumber;
+            } else {
+                try {
+                    final var message = messageSender.getEncryptedSyncPniInitializeDeviceMessage(deviceId,
+                            pniChangeNumber);
+                    encryptedDeviceMessages.add(message);
+                } catch (UntrustedIdentityException | IOException | InvalidKeyException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+
+        final var sessionId = account.getSessionId(newNumber);
+        final var result = NumberVerificationUtils.verifyNumber(sessionId,
+                verificationCode,
                 pin,
                 context.getPinHelper(),
-                (verificationCode1, registrationLock) -> dependencies.getAccountManager()
-                        .changeNumber(verificationCode1, newNumber, registrationLock));
-        // TODO handle response
-        updateSelfIdentifiers(newNumber, account.getAci(), PNI.parseOrThrow(result.first().getPni()));
+                (sessionId1, verificationCode1, registrationLock) -> {
+                    final var registrationApi = dependencies.getRegistrationApi();
+                    final var accountApi = dependencies.getAccountApi();
+                    try {
+                        handleResponseException(registrationApi.verifyAccount(sessionId1, verificationCode1));
+                    } catch (AlreadyVerifiedException e) {
+                        // Already verified so can continue changing number
+                    }
+                    return handleResponseException(accountApi.changeNumber(new ChangePhoneNumberRequest(sessionId1,
+                            null,
+                            newNumber,
+                            registrationLock,
+                            pniIdentity.getPublicKey(),
+                            encryptedDeviceMessages,
+                            Utils.mapKeys(devicePniSignedPreKeys, Object::toString),
+                            Utils.mapKeys(devicePniLastResortKyberPreKeys, Object::toString),
+                            Utils.mapKeys(pniRegistrationIds, Object::toString))));
+                });
+
+        final var updatePni = PNI.parseOrThrow(result.first().getPni());
+        if (updatePni.equals(account.getPni())) {
+            logger.debug("PNI is unchanged after change number");
+            return;
+        }
+
+        handlePniChangeNumberMessage(selfChangeNumber, updatePni);
+    }
+
+    public void handlePniChangeNumberMessage(final SyncMessage.PniChangeNumber pniChangeNumber, final PNI updatedPni) {
+        if (pniChangeNumber.identityKeyPair != null
+                && pniChangeNumber.registrationId != null
+                && pniChangeNumber.signedPreKey != null) {
+            logger.debug("New PNI: {}", updatedPni);
+            try {
+                setPni(updatedPni,
+                        new IdentityKeyPair(pniChangeNumber.identityKeyPair.toByteArray()),
+                        pniChangeNumber.newE164,
+                        pniChangeNumber.registrationId,
+                        new SignedPreKeyRecord(pniChangeNumber.signedPreKey.toByteArray()),
+                        pniChangeNumber.lastResortKyberPreKey != null
+                                ? new KyberPreKeyRecord(pniChangeNumber.lastResortKyberPreKey.toByteArray())
+                                : null);
+            } catch (Exception e) {
+                logger.warn("Failed to handle change number message", e);
+            }
+        }
+    }
+
+    public static final int USERNAME_MIN_LENGTH = 3;
+    public static final int USERNAME_MAX_LENGTH = 32;
+
+    public void reserveUsernameFromNickname(String nickname) throws IOException, BaseUsernameException {
+        final var currentUsername = account.getUsername();
+        if (currentUsername != null) {
+            final var currentNickname = currentUsername.substring(0, currentUsername.indexOf('.'));
+            if (currentNickname.equals(nickname)) {
+                try {
+                    refreshCurrentUsername();
+                    return;
+                } catch (IOException | BaseUsernameException e) {
+                    logger.warn("[reserveUsername] Failed to refresh current username, trying to claim new username");
+                }
+            }
+        }
+
+        final var candidates = Username.candidatesFrom(nickname, USERNAME_MIN_LENGTH, USERNAME_MAX_LENGTH);
+        reserveUsername(candidates);
+    }
+
+    public void reserveExactUsername(String username) throws IOException, BaseUsernameException {
+        final var currentUsername = account.getUsername();
+        if (currentUsername != null) {
+            if (currentUsername.equals(username)) {
+                try {
+                    refreshCurrentUsername();
+                    return;
+                } catch (IOException | BaseUsernameException e) {
+                    logger.warn("[reserveUsername] Failed to refresh current username, trying to claim new username");
+                }
+            }
+        }
+
+        final var candidates = List.of(new Username(username));
+        reserveUsername(candidates);
+    }
+
+    private void reserveUsername(final List<Username> candidates) throws IOException {
+        final var candidateHashes = new ArrayList<String>();
+        for (final var candidate : candidates) {
+            candidateHashes.add(Base64.encodeUrlSafeWithoutPadding(candidate.getHash()));
+        }
+
+        final var response = handleResponseException(dependencies.getAccountApi().reserveUsername(candidateHashes));
+        final var hashIndex = candidateHashes.indexOf(response.getUsernameHash());
+        if (hashIndex == -1) {
+            logger.warn("[reserveUsername] The response hash could not be found in our set of candidateHashes.");
+            throw new IOException("Unexpected username response");
+        }
+
+        logger.debug("[reserveUsername] Successfully reserved username.");
+        final var username = candidates.get(hashIndex);
+
+        final var linkComponents = confirmUsernameAndCreateNewLink(username);
+        account.setUsername(username.getUsername());
+        account.setUsernameLink(linkComponents);
+        account.getRecipientStore().resolveSelfRecipientTrusted(account.getSelfRecipientAddress());
+        account.getRecipientStore().rotateSelfStorageId();
+        logger.debug("[confirmUsername] Successfully confirmed username.");
+    }
+
+    public UsernameLinkComponents createUsernameLink(Username username) throws IOException {
+        try {
+            Username.UsernameLink link = username.generateLink();
+            return handleResponseException(dependencies.getAccountApi().createUsernameLink(link));
+        } catch (BaseUsernameException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    private UsernameLinkComponents confirmUsernameAndCreateNewLink(Username username) throws IOException {
+        try {
+            Username.UsernameLink link = username.generateLink();
+            UUID serverId = handleResponseException(dependencies.getAccountApi().confirmUsername(username, link));
+
+            return new UsernameLinkComponents(link.getEntropy(), serverId);
+        } catch (BaseUsernameException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    private UsernameLinkComponents reclaimUsernameAndLink(
+            Username username,
+            UsernameLinkComponents linkComponents
+    ) throws IOException {
+        try {
+            Username.UsernameLink link = username.generateLink(linkComponents.getEntropy());
+            UUID serverId = handleResponseException(dependencies.getAccountApi().confirmUsername(username, link));
+
+            return new UsernameLinkComponents(link.getEntropy(), serverId);
+        } catch (BaseUsernameException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    public void refreshCurrentUsername() throws IOException, BaseUsernameException {
+        final var localUsername = account.getUsername();
+        if (localUsername == null) {
+            return;
+        }
+
+        final var whoAmIResponse = dependencies.getAccountManager().getWhoAmI();
+        final var serverUsernameHash = whoAmIResponse.getUsernameHash();
+        final var hasServerUsername = !isEmpty(serverUsernameHash);
+        final var username = new Username(localUsername);
+        final var localUsernameHash = Base64.encodeUrlSafeWithoutPadding(username.getHash());
+
+        if (!hasServerUsername) {
+            logger.debug("No remote username is set.");
+        }
+
+        if (!Objects.equals(localUsernameHash, serverUsernameHash)) {
+            logger.debug("Local username hash does not match server username hash.");
+        }
+
+        if (!hasServerUsername || !Objects.equals(localUsernameHash, serverUsernameHash)) {
+            logger.debug("Attempting to resynchronize username.");
+            try {
+                tryReserveConfirmUsername(username);
+            } catch (UsernameMalformedException | UsernameTakenException | UsernameIsNotReservedException e) {
+                logger.debug("[confirmUsername] Failed to reserve confirm username: {} ({})",
+                        e.getMessage(),
+                        e.getClass().getSimpleName());
+                account.setUsername(null);
+                account.setUsernameLink(null);
+                account.getRecipientStore().rotateSelfStorageId();
+                throw e;
+            }
+        } else {
+            logger.debug("Username already set, not refreshing.");
+        }
+    }
+
+    private void tryReserveConfirmUsername(final Username username) throws IOException {
+        final var usernameLink = account.getUsernameLink();
+
+        if (usernameLink == null) {
+            handleResponseException(dependencies.getAccountApi()
+                    .reserveUsername(List.of(Base64.encodeUrlSafeWithoutPadding(username.getHash()))));
+            logger.debug("[reserveUsername] Successfully reserved existing username.");
+            final var linkComponents = confirmUsernameAndCreateNewLink(username);
+            account.setUsernameLink(linkComponents);
+            logger.debug("[confirmUsername] Successfully confirmed existing username.");
+        } else {
+            final var linkComponents = reclaimUsernameAndLink(username, usernameLink);
+            account.setUsernameLink(linkComponents);
+            logger.debug("[confirmUsername] Successfully reclaimed existing username and link.");
+        }
+        account.getRecipientStore().rotateSelfStorageId();
+    }
+
+    private void tryToSetUsernameLink(Username username) {
+        for (var i = 1; i < 4; i++) {
+            try {
+                final var linkComponents = createUsernameLink(username);
+                account.setUsernameLink(linkComponents);
+                break;
+            } catch (IOException e) {
+                logger.debug("[tryToSetUsernameLink] Failed with IOException on attempt {}/3", i, e);
+            }
+        }
+    }
+
+    public void deleteUsername() throws IOException {
+        handleResponseException(dependencies.getAccountApi().deleteUsername());
+        account.setUsernameLink(null);
+        account.setUsername(null);
+        logger.debug("[deleteUsername] Successfully deleted the username.");
     }
 
     public void setDeviceName(String deviceName) {
@@ -120,64 +515,74 @@ public class AccountHelper {
     }
 
     public void updateAccountAttributes() throws IOException {
-        dependencies.getAccountManager()
-                .setAccountAttributes(null,
-                        account.getLocalRegistrationId(),
-                        true,
-                        null,
-                        account.getPinMasterKey() == null ? null : account.getPinMasterKey().deriveRegistrationLock(),
-                        account.getSelfUnidentifiedAccessKey(),
-                        account.isUnrestrictedUnidentifiedAccess(),
-                        ServiceConfig.capabilities,
-                        account.isDiscoverableByPhoneNumber(),
-                        account.getEncryptedDeviceName());
+        handleResponseException(dependencies.getAccountApi().setAccountAttributes(account.getAccountAttributes(null)));
     }
 
-    public void addDevice(DeviceLinkInfo deviceLinkInfo) throws IOException, InvalidDeviceLinkException {
-        var verificationCode = dependencies.getAccountManager().getNewDeviceVerificationCode();
-
+    public void addDevice(DeviceLinkUrl deviceLinkInfo) throws IOException, org.asamk.signal.manager.api.DeviceLimitExceededException {
+        final var linkDeviceApi = dependencies.getLinkDeviceApi();
+        final LinkedDeviceVerificationCodeResponse verificationCode;
         try {
-            dependencies.getAccountManager()
-                    .addDevice(deviceLinkInfo.deviceIdentifier(),
-                            deviceLinkInfo.deviceKey(),
-                            account.getAciIdentityKeyPair(),
-                            account.getPniIdentityKeyPair(),
-                            account.getProfileKey(),
-                            verificationCode);
-        } catch (InvalidKeyException e) {
-            throw new InvalidDeviceLinkException("Invalid device link", e);
+            verificationCode = handleResponseException(linkDeviceApi.getDeviceVerificationCode());
+        } catch (DeviceLimitExceededException e) {
+            throw new org.asamk.signal.manager.api.DeviceLimitExceededException("Too many linked devices", e);
         }
+
+        handleResponseException(dependencies.getLinkDeviceApi()
+                .linkDevice(account.getNumber(),
+                        account.getAci(),
+                        account.getPni(),
+                        deviceLinkInfo.deviceIdentifier(),
+                        deviceLinkInfo.deviceKey(),
+                        account.getAciIdentityKeyPair(),
+                        account.getPniIdentityKeyPair(),
+                        account.getProfileKey(),
+                        account.getOrCreateAccountEntropyPool(),
+                        account.getOrCreatePinMasterKey(),
+                        account.getOrCreateMediaRootBackupKey(),
+                        verificationCode.getVerificationCode(),
+                        null));
         account.setMultiDevice(true);
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
     }
 
     public void removeLinkedDevices(int deviceId) throws IOException {
-        dependencies.getAccountManager().removeDevice(deviceId);
-        var devices = dependencies.getAccountManager().getDevices();
+        handleResponseException(dependencies.getLinkDeviceApi().removeDevice(deviceId));
+        var devices = handleResponseException(dependencies.getLinkDeviceApi().getDevices());
         account.setMultiDevice(devices.size() > 1);
     }
 
+    public void migrateRegistrationPin() throws IOException {
+        var masterKey = account.getOrCreatePinMasterKey();
+
+        context.getPinHelper().migrateRegistrationLockPin(account.getRegistrationLockPin(), masterKey);
+        handleResponseException(dependencies.getAccountApi()
+                .enableRegistrationLock(masterKey.deriveRegistrationLock()));
+    }
+
     public void setRegistrationPin(String pin) throws IOException {
-        final var masterKey = account.getPinMasterKey() != null
-                ? account.getPinMasterKey()
-                : KeyUtils.createMasterKey();
+        var masterKey = account.getOrCreatePinMasterKey();
 
         context.getPinHelper().setRegistrationLockPin(pin, masterKey);
+        handleResponseException(dependencies.getAccountApi()
+                .enableRegistrationLock(masterKey.deriveRegistrationLock()));
 
-        account.setRegistrationLockPin(pin, masterKey);
+        account.setRegistrationLockPin(pin);
+        updateAccountAttributes();
     }
 
     public void removeRegistrationPin() throws IOException {
         // Remove KBS Pin
         context.getPinHelper().removeRegistrationLockPin();
+        handleResponseException(dependencies.getAccountApi().disableRegistrationLock());
 
-        account.setRegistrationLockPin(null, null);
+        account.setRegistrationLockPin(null);
     }
 
     public void unregister() throws IOException {
         // When setting an empty GCM id, the Signal-Server also sets the fetchesMessages property to false.
         // If this is the primary device, other users can't send messages to this number anymore.
         // If this is a linked device, other users can still send messages, but this device doesn't receive them anymore.
-        dependencies.getAccountManager().setGcmId(Optional.empty());
+        handleResponseException(dependencies.getAccountApi().clearFcmToken());
 
         account.setRegistered(false);
         unregisteredListener.call();
@@ -189,9 +594,9 @@ public class AccountHelper {
         } catch (IOException e) {
             logger.warn("Failed to remove registration lock pin");
         }
-        account.setRegistrationLockPin(null, null);
+        account.setRegistrationLockPin(null);
 
-        dependencies.getAccountManager().deleteAccount();
+        handleResponseException(dependencies.getAccountApi().deleteAccount());
 
         account.setRegistered(false);
         unregisteredListener.call();
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
index 8793ce93..08526c72 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
@@ -1,19 +1,20 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.AttachmentStore;
-import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
 import org.asamk.signal.manager.config.ServiceConfig;
+import org.asamk.signal.manager.internal.SignalDependencies;
+import org.asamk.signal.manager.storage.AttachmentStore;
 import org.asamk.signal.manager.util.AttachmentUtils;
 import org.asamk.signal.manager.util.IOUtils;
 import org.signal.libsignal.protocol.InvalidMessageException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.crypto.AttachmentCipherInputStream;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
 import org.whispersystems.signalservice.api.push.exceptions.MissingConfigurationException;
+import org.whispersystems.signalservice.api.util.StreamDetails;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,7 +26,7 @@ import java.util.List;
 
 public class AttachmentHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(AttachmentHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(AttachmentHelper.class);
 
     private final SignalDependencies dependencies;
     private final AttachmentStore attachmentStore;
@@ -35,23 +36,46 @@ public class AttachmentHelper {
         this.attachmentStore = context.getAttachmentStore();
     }
 
-    public File getAttachmentFile(SignalServiceAttachmentRemoteId attachmentId) {
-        return attachmentStore.getAttachmentFile(attachmentId);
+    public File getAttachmentFile(SignalServiceAttachmentPointer pointer) {
+        return attachmentStore.getAttachmentFile(pointer);
+    }
+
+    public StreamDetails retrieveAttachment(final String id) throws IOException {
+        return attachmentStore.retrieveAttachment(id);
     }
 
     public List<SignalServiceAttachment> uploadAttachments(final List<String> attachments) throws AttachmentInvalidException, IOException {
-        var attachmentStreams = AttachmentUtils.createAttachmentStreams(attachments);
+        final var attachmentStreams = createAttachmentStreams(attachments);
 
-        // Upload attachments here, so we only upload once even for multiple recipients
-        var attachmentPointers = new ArrayList<SignalServiceAttachment>(attachmentStreams.size());
-        for (var attachmentStream : attachmentStreams) {
-            attachmentPointers.add(uploadAttachment(attachmentStream));
+        try {
+            // Upload attachments here, so we only upload once even for multiple recipients
+            final var attachmentPointers = new ArrayList<SignalServiceAttachment>(attachmentStreams.size());
+            for (final var attachmentStream : attachmentStreams) {
+                attachmentPointers.add(uploadAttachment(attachmentStream));
+            }
+            return attachmentPointers;
+        } finally {
+            for (final var attachmentStream : attachmentStreams) {
+                attachmentStream.close();
+            }
         }
-        return attachmentPointers;
+    }
+
+    private List<SignalServiceAttachmentStream> createAttachmentStreams(List<String> attachments) throws AttachmentInvalidException, IOException {
+        if (attachments == null) {
+            return null;
+        }
+        final var signalServiceAttachments = new ArrayList<SignalServiceAttachmentStream>(attachments.size());
+        for (var attachment : attachments) {
+            final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec();
+            signalServiceAttachments.add(AttachmentUtils.createAttachmentStream(attachment, uploadSpec));
+        }
+        return signalServiceAttachments;
     }
 
     public SignalServiceAttachmentPointer uploadAttachment(String attachment) throws IOException, AttachmentInvalidException {
-        var attachmentStream = AttachmentUtils.createAttachmentStream(new File(attachment));
+        final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec();
+        var attachmentStream = AttachmentUtils.createAttachmentStream(attachment, uploadSpec);
         return uploadAttachment(attachmentStream);
     }
 
@@ -69,7 +93,7 @@ public class AttachmentHelper {
         if (pointer.getPreview().isPresent()) {
             final var preview = pointer.getPreview().get();
             try {
-                attachmentStore.storeAttachmentPreview(pointer.getRemoteId(),
+                attachmentStore.storeAttachmentPreview(pointer,
                         outputStream -> outputStream.write(preview, 0, preview.length));
             } catch (IOException e) {
                 logger.warn("Failed to download attachment preview, ignoring: {}", e.getMessage());
@@ -77,8 +101,7 @@ public class AttachmentHelper {
         }
 
         try {
-            attachmentStore.storeAttachment(pointer.getRemoteId(),
-                    outputStream -> this.retrieveAttachment(pointer, outputStream));
+            attachmentStore.storeAttachment(pointer, outputStream -> this.retrieveAttachment(pointer, outputStream));
         } catch (IOException e) {
             logger.warn("Failed to download attachment ({}), ignoring: {}", pointer.getRemoteId(), e.getMessage());
         }
@@ -88,9 +111,7 @@ public class AttachmentHelper {
         retrieveAttachment(attachment, input -> IOUtils.copyStream(input, outputStream));
     }
 
-    public void retrieveAttachment(
-            SignalServiceAttachment attachment, AttachmentHandler consumer
-    ) throws IOException {
+    public void retrieveAttachment(SignalServiceAttachment attachment, AttachmentHandler consumer) throws IOException {
         if (attachment.isStream()) {
             var input = attachment.asStream().getInputStream();
             // don't close input stream here, it might be reused later (e.g. with contact sync messages ...)
@@ -115,11 +136,18 @@ public class AttachmentHelper {
     }
 
     private InputStream retrieveAttachmentAsStream(
-            SignalServiceAttachmentPointer pointer, File tmpFile
+            SignalServiceAttachmentPointer pointer,
+            File tmpFile
     ) throws IOException {
+        if (pointer.getDigest().isEmpty()) {
+            throw new IOException("Attachment pointer has no digest.");
+        }
         try {
             return dependencies.getMessageReceiver()
-                    .retrieveAttachment(pointer, tmpFile, ServiceConfig.MAX_ATTACHMENT_SIZE);
+                    .retrieveAttachment(pointer,
+                            tmpFile,
+                            ServiceConfig.MAX_ATTACHMENT_SIZE,
+                            AttachmentCipherInputStream.IntegrityCheck.forEncryptedDigest(pointer.getDigest().get()));
         } catch (MissingConfigurationException | InvalidMessageException e) {
             throw new IOException(e);
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
index f43d083c..8461fbe0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
@@ -1,7 +1,7 @@
 package org.asamk.signal.manager.helper;
 
+import org.asamk.signal.manager.api.Contact;
 import org.asamk.signal.manager.storage.SignalAccount;
-import org.asamk.signal.manager.storage.recipients.Contact;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 
 public class ContactHelper {
@@ -17,34 +17,92 @@ public class ContactHelper {
         return sourceContact != null && sourceContact.isBlocked();
     }
 
-    public void setContactName(final RecipientId recipientId, final String givenName, final String familyName) {
+    public void setContactName(
+            final RecipientId recipientId,
+            final String givenName,
+            final String familyName,
+            final String nickGivenName,
+            final String nickFamilyName,
+            final String note
+    ) {
         var contact = account.getContactStore().getContact(recipientId);
         final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
+        builder.withIsHidden(false);
         if (givenName != null) {
             builder.withGivenName(givenName);
         }
         if (familyName != null) {
             builder.withFamilyName(familyName);
         }
+        if (nickGivenName != null) {
+            builder.withNickNameGivenName(nickGivenName);
+        }
+        if (nickFamilyName != null) {
+            builder.withNickNameFamilyName(nickFamilyName);
+        }
+        if (note != null) {
+            builder.withNote(note);
+        }
         account.getContactStore().storeContact(recipientId, builder.build());
     }
 
     public void setExpirationTimer(RecipientId recipientId, int messageExpirationTimer) {
         var contact = account.getContactStore().getContact(recipientId);
-        if (contact != null && contact.getMessageExpirationTime() == messageExpirationTimer) {
+        if (contact != null && contact.messageExpirationTime() == messageExpirationTimer) {
+            return;
+        }
+        final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
+        final var version = contact == null
+                ? 1
+                : contact.messageExpirationTimeVersion() == Integer.MAX_VALUE
+                        ? Integer.MAX_VALUE
+                        : contact.messageExpirationTimeVersion() + 1;
+        account.getContactStore()
+                .storeContact(recipientId,
+                        builder.withMessageExpirationTime(messageExpirationTimer)
+                                .withMessageExpirationTimeVersion(version)
+                                .build());
+    }
+
+    public void setExpirationTimer(
+            RecipientId recipientId,
+            int messageExpirationTimer,
+            int messageExpirationTimerVersion
+    ) {
+        var contact = account.getContactStore().getContact(recipientId);
+        if (contact != null && (
+                contact.messageExpirationTime() == messageExpirationTimer
+                        || contact.messageExpirationTimeVersion() >= messageExpirationTimerVersion
+        )) {
             return;
         }
         final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
         account.getContactStore()
-                .storeContact(recipientId, builder.withMessageExpirationTime(messageExpirationTimer).build());
+                .storeContact(recipientId,
+                        builder.withMessageExpirationTime(messageExpirationTimer)
+                                .withMessageExpirationTimeVersion(messageExpirationTimerVersion)
+                                .build());
     }
 
     public void setContactBlocked(RecipientId recipientId, boolean blocked) {
         var contact = account.getContactStore().getContact(recipientId);
         final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
         if (blocked) {
-            builder.withProfileSharingEnabled(false);
+            builder.withIsProfileSharingEnabled(false);
         }
-        account.getContactStore().storeContact(recipientId, builder.withBlocked(blocked).build());
+        account.getContactStore().storeContact(recipientId, builder.withIsBlocked(blocked).build());
+    }
+
+    public void setContactProfileSharing(RecipientId recipientId, boolean profileSharing) {
+        var contact = account.getContactStore().getContact(recipientId);
+        final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
+        builder.withIsProfileSharingEnabled(profileSharing);
+        account.getContactStore().storeContact(recipientId, builder.build());
+    }
+
+    public void setContactHidden(RecipientId recipientId, boolean hidden) {
+        var contact = account.getContactStore().getContact(recipientId);
+        final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
+        account.getContactStore().storeContact(recipientId, builder.withIsHidden(hidden).build());
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/Context.java b/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
index 522143ee..2ff9c7e4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
@@ -1,15 +1,15 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.AttachmentStore;
-import org.asamk.signal.manager.AvatarStore;
-import org.asamk.signal.manager.JobExecutor;
-import org.asamk.signal.manager.SignalDependencies;
+import org.asamk.signal.manager.internal.JobExecutor;
+import org.asamk.signal.manager.internal.SignalDependencies;
+import org.asamk.signal.manager.storage.AttachmentStore;
+import org.asamk.signal.manager.storage.AvatarStore;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.stickerPacks.StickerPackStore;
 
 import java.util.function.Supplier;
 
-public class Context {
+public class Context implements AutoCloseable {
 
     private final Object LOCK = new Object();
 
@@ -80,7 +80,7 @@ public class Context {
         return attachmentStore;
     }
 
-    JobExecutor getJobExecutor() {
+    public JobExecutor getJobExecutor() {
         return jobExecutor;
     }
 
@@ -114,7 +114,7 @@ public class Context {
     }
 
     PinHelper getPinHelper() {
-        return getOrCreate(() -> pinHelper, () -> pinHelper = new PinHelper(dependencies.getKeyBackupService()));
+        return getOrCreate(() -> pinHelper, () -> pinHelper = new PinHelper(dependencies.getSecureValueRecovery()));
     }
 
     public PreKeyHelper getPreKeyHelper() {
@@ -170,6 +170,11 @@ public class Context {
         }
     }
 
+    @Override
+    public void close() {
+        jobExecutor.close();
+    }
+
     private interface Callable {
 
         void call();
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index 3ed642ed..682bd996 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -1,23 +1,25 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupIdV1;
+import org.asamk.signal.manager.api.GroupIdV2;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupLinkState;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupPermission;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
+import org.asamk.signal.manager.api.LastGroupAdminException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.PendingAdminApprovalException;
 import org.asamk.signal.manager.api.SendGroupMessageResults;
 import org.asamk.signal.manager.api.SendMessageResult;
 import org.asamk.signal.manager.config.ServiceConfig;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupIdV1;
-import org.asamk.signal.manager.groups.GroupIdV2;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupLinkState;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupPermission;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.groups.GroupUtils;
-import org.asamk.signal.manager.groups.LastGroupAdminException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.manager.internal.SignalDependencies;
+import org.asamk.signal.manager.jobs.SyncStorageJob;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfo;
 import org.asamk.signal.manager.storage.groups.GroupInfoV1;
@@ -25,18 +27,22 @@ import org.asamk.signal.manager.storage.groups.GroupInfoV2;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.util.AttachmentUtils;
 import org.asamk.signal.manager.util.IOUtils;
+import org.asamk.signal.manager.util.Utils;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
 import org.signal.libsignal.zkgroup.groups.GroupSecretParams;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.signal.storageservice.protos.groups.GroupChange;
+import org.signal.storageservice.protos.groups.GroupChangeResponse;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
 import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
 import org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupHistoryEntry;
+import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupChangeLog;
+import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupResponse;
 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
+import org.whispersystems.signalservice.api.groupsv2.ReceivedGroupSendEndorsements;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
@@ -46,7 +52,6 @@ import org.whispersystems.signalservice.api.push.DistributionId;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.exceptions.ConflictException;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -61,7 +66,7 @@ import java.util.Set;
 
 public class GroupHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(GroupHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(GroupHelper.class);
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
@@ -77,6 +82,16 @@ public class GroupHelper {
         return getGroup(groupId, false);
     }
 
+    public void updateGroupSendEndorsements(GroupId groupId) {
+        getGroup(groupId, true);
+    }
+
+    public List<GroupInfo> getGroups() {
+        final var groups = account.getGroupStore().getGroups();
+        groups.forEach(group -> fillOrUpdateGroup(group, false));
+        return groups;
+    }
+
     public boolean isGroupBlocked(final GroupId groupId) {
         var group = getGroup(groupId);
         return group != null && group.isBlocked();
@@ -98,35 +113,25 @@ public class GroupHelper {
             return Optional.empty();
         }
 
-        return Optional.of(AttachmentUtils.createAttachmentStream(streamDetails, Optional.empty()));
+        final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec();
+        return Optional.of(AttachmentUtils.createAttachmentStream(streamDetails, Optional.empty(), uploadSpec));
     }
 
     public GroupInfoV2 getOrMigrateGroup(
-            final GroupMasterKey groupMasterKey, final int revision, final byte[] signedGroupChange
+            final GroupMasterKey groupMasterKey,
+            final int revision,
+            final byte[] signedGroupChange
     ) {
         final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
 
-        var groupId = GroupUtils.getGroupIdV2(groupSecretParams);
-        var groupInfo = getGroup(groupId);
-        final GroupInfoV2 groupInfoV2;
-        if (groupInfo instanceof GroupInfoV1) {
-            // Received a v2 group message for a v1 group, we need to locally migrate the group
-            account.getGroupStore().deleteGroupV1(((GroupInfoV1) groupInfo).getGroupId());
-            groupInfoV2 = new GroupInfoV2(groupId, groupMasterKey);
-            logger.info("Locally migrated group {} to group v2, id: {}",
-                    groupInfo.getGroupId().toBase64(),
-                    groupInfoV2.getGroupId().toBase64());
-        } else if (groupInfo instanceof GroupInfoV2) {
-            groupInfoV2 = (GroupInfoV2) groupInfo;
-        } else {
-            groupInfoV2 = new GroupInfoV2(groupId, groupMasterKey);
-        }
+        final var groupId = GroupUtils.getGroupIdV2(groupSecretParams);
+        final var groupInfoV2 = account.getGroupStore().getGroupOrPartialMigrate(groupMasterKey, groupId);
 
-        if (groupInfoV2.getGroup() == null || groupInfoV2.getGroup().getRevision() < revision) {
+        if (groupInfoV2.getGroup() == null || groupInfoV2.getGroup().revision < revision) {
             DecryptedGroup group = null;
             if (signedGroupChange != null
                     && groupInfoV2.getGroup() != null
-                    && groupInfoV2.getGroup().getRevision() + 1 == revision) {
+                    && groupInfoV2.getGroup().revision + 1 == revision) {
                 final var decryptedGroupChange = context.getGroupV2Helper()
                         .getDecryptedGroupChange(signedGroupChange, groupMasterKey);
 
@@ -138,9 +143,10 @@ public class GroupHelper {
             }
             if (group == null) {
                 try {
-                    group = context.getGroupV2Helper().getDecryptedGroup(groupSecretParams);
+                    final var response = context.getGroupV2Helper().getDecryptedGroup(groupSecretParams);
 
-                    if (group != null) {
+                    if (response != null) {
+                        group = handleDecryptedGroupResponse(groupInfoV2, response);
                         storeProfileKeysFromHistory(groupSecretParams, groupInfoV2, group);
                     }
                 } catch (NotAGroupMemberException ignored) {
@@ -148,20 +154,54 @@ public class GroupHelper {
             }
             if (group != null) {
                 storeProfileKeysFromMembers(group);
-                final var avatar = group.getAvatar();
-                if (avatar != null && !avatar.isEmpty()) {
+                final var avatar = group.avatar;
+                if (!avatar.isEmpty()) {
                     downloadGroupAvatar(groupId, groupSecretParams, avatar);
                 }
             }
-            groupInfoV2.setGroup(group, account.getRecipientResolver());
+            groupInfoV2.setGroup(group);
             account.getGroupStore().updateGroup(groupInfoV2);
+            context.getJobExecutor().enqueueJob(new SyncStorageJob());
         }
 
         return groupInfoV2;
     }
 
+    private DecryptedGroup handleDecryptedGroupResponse(
+            GroupInfoV2 groupInfoV2,
+            final DecryptedGroupResponse decryptedGroupResponse
+    ) {
+        final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
+        ReceivedGroupSendEndorsements groupSendEndorsements = dependencies.getGroupsV2Operations()
+                .forGroup(groupSecretParams)
+                .receiveGroupSendEndorsements(account.getAci(),
+                        decryptedGroupResponse.getGroup(),
+                        decryptedGroupResponse.getGroupSendEndorsementsResponse());
+
+        // TODO save group endorsements
+
+        return decryptedGroupResponse.getGroup();
+    }
+
+    private GroupChange handleGroupChangeResponse(
+            final GroupInfoV2 groupInfoV2,
+            final GroupChangeResponse groupChangeResponse
+    ) {
+        ReceivedGroupSendEndorsements groupSendEndorsements = dependencies.getGroupsV2Operations()
+                .forGroup(GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey()))
+                .receiveGroupSendEndorsements(account.getAci(),
+                        groupInfoV2.getGroup(),
+                        groupChangeResponse.groupSendEndorsementsResponse);
+
+        // TODO save group endorsements
+
+        return groupChangeResponse.groupChange;
+    }
+
     public Pair<GroupId, SendGroupMessageResults> createGroup(
-            String name, Set<RecipientId> members, File avatarFile
+            String name,
+            Set<RecipientId> members,
+            String avatarFile
     ) throws IOException, AttachmentInvalidException {
         final var selfRecipientId = account.getSelfRecipientId();
         if (members != null && members.contains(selfRecipientId)) {
@@ -169,25 +209,27 @@ public class GroupHelper {
             members.remove(selfRecipientId);
         }
 
+        final var avatarBytes = readAvatarBytes(avatarFile);
         var gv2Pair = context.getGroupV2Helper()
-                .createGroup(name == null ? "" : name, members == null ? Set.of() : members, avatarFile);
+                .createGroup(name == null ? "" : name, members == null ? Set.of() : members, avatarBytes);
 
         if (gv2Pair == null) {
             // Failed to create v2 group, creating v1 group instead
             var gv1 = new GroupInfoV1(GroupIdV1.createRandom());
+            gv1.setProfileSharingEnabled(true);
             gv1.addMembers(List.of(selfRecipientId));
-            final var result = updateGroupV1(gv1, name, members, avatarFile);
+            final var result = updateGroupV1(gv1, name, members, avatarBytes);
             return new Pair<>(gv1.getGroupId(), result);
         }
 
         final var gv2 = gv2Pair.first();
         final var decryptedGroup = gv2Pair.second();
 
-        gv2.setGroup(decryptedGroup, account.getRecipientResolver());
-        if (avatarFile != null) {
+        gv2.setGroup(handleDecryptedGroupResponse(gv2, decryptedGroup));
+        gv2.setProfileSharingEnabled(true);
+        if (avatarBytes != null) {
             context.getAvatarStore()
-                    .storeGroupAvatar(gv2.getGroupId(),
-                            outputStream -> IOUtils.copyFileToStream(avatarFile, outputStream));
+                    .storeGroupAvatar(gv2.getGroupId(), outputStream -> outputStream.write(avatarBytes));
         }
 
         account.getGroupStore().updateGroup(gv2);
@@ -197,6 +239,7 @@ public class GroupHelper {
         final var result = sendGroupMessage(messageBuilder,
                 gv2.getMembersIncludingPendingWithout(selfRecipientId),
                 gv2.getDistributionId());
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
         return new Pair<>(gv2.getGroupId(), result);
     }
 
@@ -214,65 +257,71 @@ public class GroupHelper {
             final GroupLinkState groupLinkState,
             final GroupPermission addMemberPermission,
             final GroupPermission editDetailsPermission,
-            final File avatarFile,
+            final String avatarFile,
             final Integer expirationTimer,
             final Boolean isAnnouncementGroup
     ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException, GroupSendingNotAllowedException {
         var group = getGroupForUpdating(groupId);
+        final var avatarBytes = readAvatarBytes(avatarFile);
 
-        if (group instanceof GroupInfoV2) {
-            try {
-                return updateGroupV2((GroupInfoV2) group,
-                        name,
-                        description,
-                        members,
-                        removeMembers,
-                        admins,
-                        removeAdmins,
-                        banMembers,
-                        unbanMembers,
-                        resetGroupLink,
-                        groupLinkState,
-                        addMemberPermission,
-                        editDetailsPermission,
-                        avatarFile,
-                        expirationTimer,
-                        isAnnouncementGroup);
-            } catch (ConflictException e) {
-                // Detected conflicting update, refreshing group and trying again
-                group = getGroup(groupId, true);
-                return updateGroupV2((GroupInfoV2) group,
-                        name,
-                        description,
-                        members,
-                        removeMembers,
-                        admins,
-                        removeAdmins,
-                        banMembers,
-                        unbanMembers,
-                        resetGroupLink,
-                        groupLinkState,
-                        addMemberPermission,
-                        editDetailsPermission,
-                        avatarFile,
-                        expirationTimer,
-                        isAnnouncementGroup);
+        SendGroupMessageResults results;
+        switch (group) {
+            case GroupInfoV2 gv2 -> {
+                try {
+                    results = updateGroupV2(gv2,
+                            name,
+                            description,
+                            members,
+                            removeMembers,
+                            admins,
+                            removeAdmins,
+                            banMembers,
+                            unbanMembers,
+                            resetGroupLink,
+                            groupLinkState,
+                            addMemberPermission,
+                            editDetailsPermission,
+                            avatarBytes,
+                            expirationTimer,
+                            isAnnouncementGroup);
+                } catch (ConflictException e) {
+                    // Detected conflicting update, refreshing group and trying again
+                    group = getGroup(groupId, true);
+                    results = updateGroupV2((GroupInfoV2) group,
+                            name,
+                            description,
+                            members,
+                            removeMembers,
+                            admins,
+                            removeAdmins,
+                            banMembers,
+                            unbanMembers,
+                            resetGroupLink,
+                            groupLinkState,
+                            addMemberPermission,
+                            editDetailsPermission,
+                            avatarBytes,
+                            expirationTimer,
+                            isAnnouncementGroup);
+                }
+            }
+
+            case GroupInfoV1 gv1 -> {
+                results = updateGroupV1(gv1, name, members, avatarBytes);
+                if (expirationTimer != null) {
+                    setExpirationTimer(gv1, expirationTimer);
+                }
             }
         }
-
-        final var gv1 = (GroupInfoV1) group;
-        final var result = updateGroupV1(gv1, name, members, avatarFile);
-        if (expirationTimer != null) {
-            setExpirationTimer(gv1, expirationTimer);
-        }
-        return result;
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
+        return results;
     }
 
     public void updateGroupProfileKey(GroupIdV2 groupId) throws GroupNotFoundException, NotAGroupMemberException, IOException {
         var group = getGroupForUpdating(groupId);
 
         if (group instanceof GroupInfoV2 groupInfoV2) {
-            Pair<DecryptedGroup, GroupChange> groupChangePair;
+            Pair<DecryptedGroup, GroupChangeResponse> groupChangePair;
             try {
                 groupChangePair = context.getGroupV2Helper().updateSelfProfileKey(groupInfoV2);
             } catch (ConflictException e) {
@@ -281,14 +330,16 @@ public class GroupHelper {
                 groupChangePair = context.getGroupV2Helper().updateSelfProfileKey(groupInfoV2);
             }
             if (groupChangePair != null) {
-                sendUpdateGroupV2Message(groupInfoV2, groupChangePair.first(), groupChangePair.second());
+                sendUpdateGroupV2Message(groupInfoV2,
+                        groupChangePair.first(),
+                        handleGroupChangeResponse(groupInfoV2, groupChangePair.second()));
             }
         }
     }
 
     public Pair<GroupId, SendGroupMessageResults> joinGroup(
             GroupInviteLinkUrl inviteLinkUrl
-    ) throws IOException, InactiveGroupLinkException {
+    ) throws IOException, InactiveGroupLinkException, PendingAdminApprovalException {
         final DecryptedGroupJoinInfo groupJoinInfo;
         try {
             groupJoinInfo = context.getGroupV2Helper()
@@ -296,11 +347,15 @@ public class GroupHelper {
         } catch (GroupLinkNotActiveException e) {
             throw new InactiveGroupLinkException("Group link inactive (reason: " + e.getReason() + ")", e);
         }
-        final var groupChange = context.getGroupV2Helper()
+        if (groupJoinInfo.pendingAdminApproval) {
+            throw new PendingAdminApprovalException("You have already requested to join the group.");
+        }
+        final var changeResponse = context.getGroupV2Helper()
                 .joinGroup(inviteLinkUrl.getGroupMasterKey(), inviteLinkUrl.getPassword(), groupJoinInfo);
         final var group = getOrMigrateGroup(inviteLinkUrl.getGroupMasterKey(),
-                groupJoinInfo.getRevision() + 1,
-                groupChange.toByteArray());
+                groupJoinInfo.revision + 1,
+                changeResponse.groupChange == null ? null : changeResponse.groupChange.encode());
+        final var groupChange = handleGroupChangeResponse(group, changeResponse);
 
         if (group.getGroup() == null) {
             // Only requested member, can't send update to group members
@@ -309,11 +364,13 @@ public class GroupHelper {
 
         final var result = sendUpdateGroupV2Message(group, group.getGroup(), groupChange);
 
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
         return new Pair<>(group.getGroupId(), result);
     }
 
     public SendGroupMessageResults quitGroup(
-            final GroupId groupId, final Set<RecipientId> newAdmins
+            final GroupId groupId,
+            final Set<RecipientId> newAdmins
     ) throws IOException, LastGroupAdminException, NotAGroupMemberException, GroupNotFoundException {
         var group = getGroupForUpdating(groupId);
         if (group instanceof GroupInfoV1) {
@@ -332,6 +389,7 @@ public class GroupHelper {
     public void deleteGroup(GroupId groupId) throws IOException {
         account.getGroupStore().deleteGroup(groupId);
         context.getAvatarStore().deleteGroupAvatar(groupId);
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
     }
 
     public void setGroupBlocked(final GroupId groupId, final boolean blocked) throws GroupNotFoundException {
@@ -342,11 +400,10 @@ public class GroupHelper {
 
         group.setBlocked(blocked);
         account.getGroupStore().updateGroup(group);
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
     }
 
-    public SendGroupMessageResults sendGroupInfoRequest(
-            GroupIdV1 groupId, RecipientId recipientId
-    ) throws IOException {
+    public SendGroupMessageResults sendGroupInfoRequest(GroupIdV1 groupId, RecipientId recipientId) throws IOException {
         var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.REQUEST_INFO).withId(groupId.serialize());
 
         var messageBuilder = SignalServiceDataMessage.newBuilder().asGroupMessage(group.build());
@@ -356,7 +413,8 @@ public class GroupHelper {
     }
 
     public SendGroupMessageResults sendGroupInfoMessage(
-            GroupIdV1 groupId, RecipientId recipientId
+            GroupIdV1 groupId,
+            RecipientId recipientId
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, AttachmentInvalidException {
         GroupInfoV1 g;
         var group = getGroupForUpdating(groupId);
@@ -377,34 +435,46 @@ public class GroupHelper {
 
     private GroupInfo getGroup(GroupId groupId, boolean forceUpdate) {
         final var group = account.getGroupStore().getGroup(groupId);
-        if (group instanceof GroupInfoV2 groupInfoV2) {
-            if (forceUpdate || (!groupInfoV2.isPermissionDenied() && groupInfoV2.getGroup() == null)) {
-                final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
-                DecryptedGroup decryptedGroup;
-                try {
-                    decryptedGroup = context.getGroupV2Helper().getDecryptedGroup(groupSecretParams);
-                } catch (NotAGroupMemberException e) {
-                    groupInfoV2.setPermissionDenied(true);
-                    decryptedGroup = null;
-                }
-                if (decryptedGroup != null) {
-                    try {
-                        storeProfileKeysFromHistory(groupSecretParams, groupInfoV2, decryptedGroup);
-                    } catch (NotAGroupMemberException ignored) {
-                    }
-                    storeProfileKeysFromMembers(decryptedGroup);
-                    final var avatar = decryptedGroup.getAvatar();
-                    if (avatar != null && !avatar.isEmpty()) {
-                        downloadGroupAvatar(groupInfoV2.getGroupId(), groupSecretParams, avatar);
-                    }
-                }
-                groupInfoV2.setGroup(decryptedGroup, account.getRecipientResolver());
-                account.getGroupStore().updateGroup(group);
-            }
-        }
+        fillOrUpdateGroup(group, forceUpdate);
         return group;
     }
 
+    private void fillOrUpdateGroup(final GroupInfo group, final boolean forceUpdate) {
+        if (!(group instanceof GroupInfoV2 groupInfoV2)) {
+            return;
+        }
+
+        if (!forceUpdate && (groupInfoV2.isPermissionDenied() || groupInfoV2.getGroup() != null)) {
+            return;
+        }
+
+        final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
+        DecryptedGroup decryptedGroup;
+        try {
+            final var response = context.getGroupV2Helper().getDecryptedGroup(groupSecretParams);
+            if (response == null) {
+                return;
+            }
+            decryptedGroup = handleDecryptedGroupResponse(groupInfoV2, response);
+        } catch (NotAGroupMemberException e) {
+            groupInfoV2.setPermissionDenied(true);
+            account.getGroupStore().updateGroup(group);
+            return;
+        }
+
+        try {
+            storeProfileKeysFromHistory(groupSecretParams, groupInfoV2, decryptedGroup);
+        } catch (NotAGroupMemberException ignored) {
+        }
+        storeProfileKeysFromMembers(decryptedGroup);
+        final var avatar = decryptedGroup.avatar;
+        if (!avatar.isEmpty()) {
+            downloadGroupAvatar(groupInfoV2.getGroupId(), groupSecretParams, avatar);
+        }
+        groupInfoV2.setGroup(decryptedGroup);
+        account.getGroupStore().updateGroup(group);
+    }
+
     private void downloadGroupAvatar(GroupIdV2 groupId, GroupSecretParams groupSecretParams, String cdnKey) {
         try {
             context.getAvatarStore()
@@ -416,7 +486,9 @@ public class GroupHelper {
     }
 
     private void retrieveGroupV2Avatar(
-            GroupSecretParams groupSecretParams, String cdnKey, OutputStream outputStream
+            GroupSecretParams groupSecretParams,
+            String cdnKey,
+            OutputStream outputStream
     ) throws IOException {
         var groupOperations = dependencies.getGroupsV2Operations().forGroup(groupSecretParams);
 
@@ -439,8 +511,8 @@ public class GroupHelper {
     }
 
     private void storeProfileKeysFromMembers(final DecryptedGroup group) {
-        for (var member : group.getMembersList()) {
-            final var serviceId = ServiceId.fromByteString(member.getUuid());
+        for (var member : group.members) {
+            final var serviceId = ServiceId.parseOrThrow(member.aciBytes);
             final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
             final var profileStore = account.getProfileStore();
             if (profileStore.getProfileKey(recipientId) != null) {
@@ -448,7 +520,7 @@ public class GroupHelper {
                 continue;
             }
             try {
-                profileStore.storeProfileKey(recipientId, new ProfileKey(member.getProfileKey().toByteArray()));
+                profileStore.storeProfileKey(recipientId, new ProfileKey(member.profileKey.toByteArray()));
             } catch (InvalidInputException ignored) {
             }
         }
@@ -472,16 +544,20 @@ public class GroupHelper {
             final DecryptedGroup newDecryptedGroup
     ) throws NotAGroupMemberException {
         final var revisionWeWereAdded = context.getGroupV2Helper().findRevisionWeWereAdded(newDecryptedGroup);
-        final var localRevision = localGroup.getGroup() == null ? 0 : localGroup.getGroup().getRevision();
+        final var localRevision = localGroup.getGroup() == null ? 0 : localGroup.getGroup().revision;
+        final var sendEndorsementsExpirationMs = 0L;// TODO store expiration localGroup.getGroup() == null ? 0 : localGroup.getGroup().revision;
         var fromRevision = Math.max(revisionWeWereAdded, localRevision);
         final var newProfileKeys = new HashMap<RecipientId, ProfileKey>();
         while (true) {
-            final var page = context.getGroupV2Helper().getDecryptedGroupHistoryPage(groupSecretParams, fromRevision);
-            page.getResults()
+            final var page = context.getGroupV2Helper()
+                    .getDecryptedGroupHistoryPage(groupSecretParams, fromRevision, sendEndorsementsExpirationMs);
+            if (page == null) {
+                break;
+            }
+            page.getChangeLogs()
                     .stream()
-                    .map(DecryptedGroupHistoryEntry::getChange)
-                    .filter(Optional::isPresent)
-                    .map(Optional::get)
+                    .map(DecryptedGroupChangeLog::getChange)
+                    .filter(Objects::nonNull)
                     .map(context.getGroupV2Helper()::getAuthoritativeProfileKeyFromChange)
                     .filter(Objects::nonNull)
                     .forEach(p -> {
@@ -490,13 +566,16 @@ public class GroupHelper {
                         final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
                         newProfileKeys.put(recipientId, profileKey);
                     });
-            if (!page.getPagingData().hasMorePages()) {
+            if (!page.getPagingData().getHasMorePages()) {
                 break;
             }
             fromRevision = page.getPagingData().getNextPageRevision();
         }
 
-        newProfileKeys.forEach(account.getProfileStore()::storeProfileKey);
+        newProfileKeys.entrySet()
+                .stream()
+                .filter(entry -> account.getProfileStore().getProfileKey(entry.getKey()) == null)
+                .forEach(entry -> account.getProfileStore().storeProfileKey(entry.getKey(), entry.getValue()));
     }
 
     private GroupInfo getGroupForUpdating(GroupId groupId) throws GroupNotFoundException, NotAGroupMemberException {
@@ -507,11 +586,18 @@ public class GroupHelper {
         if (!g.isMember(account.getSelfRecipientId()) && !g.isPendingMember(account.getSelfRecipientId())) {
             throw new NotAGroupMemberException(groupId, g.getTitle());
         }
+        if (groupId instanceof GroupIdV2) {
+            // Refresh group before updating
+            return getGroup(groupId, true);
+        }
         return g;
     }
 
     private SendGroupMessageResults updateGroupV1(
-            final GroupInfoV1 gv1, final String name, final Set<RecipientId> members, final File avatarFile
+            final GroupInfoV1 gv1,
+            final String name,
+            final Set<RecipientId> members,
+            final byte[] avatarFile
     ) throws IOException, AttachmentInvalidException {
         updateGroupV1Details(gv1, name, members, avatarFile);
 
@@ -524,7 +610,10 @@ public class GroupHelper {
     }
 
     private void updateGroupV1Details(
-            final GroupInfoV1 g, final String name, final Collection<RecipientId> members, final File avatarFile
+            final GroupInfoV1 g,
+            final String name,
+            final Collection<RecipientId> members,
+            final byte[] avatarFile
     ) throws IOException {
         if (name != null) {
             g.name = name;
@@ -535,9 +624,7 @@ public class GroupHelper {
         }
 
         if (avatarFile != null) {
-            context.getAvatarStore()
-                    .storeGroupAvatar(g.getGroupId(),
-                            outputStream -> IOUtils.copyFileToStream(avatarFile, outputStream));
+            context.getAvatarStore().storeGroupAvatar(g.getGroupId(), outputStream -> outputStream.write(avatarFile));
         }
     }
 
@@ -545,7 +632,8 @@ public class GroupHelper {
      * Change the expiration timer for a group
      */
     private void setExpirationTimer(
-            GroupInfoV1 groupInfoV1, int messageExpirationTimer
+            GroupInfoV1 groupInfoV1,
+            int messageExpirationTimer
     ) throws NotAGroupMemberException, GroupNotFoundException, IOException, GroupSendingNotAllowedException {
         groupInfoV1.messageExpirationTime = messageExpirationTimer;
         account.getGroupStore().updateGroup(groupInfoV1);
@@ -554,7 +642,7 @@ public class GroupHelper {
 
     private void sendExpirationTimerUpdate(GroupIdV1 groupId) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         final var messageBuilder = SignalServiceDataMessage.newBuilder().asExpirationUpdate();
-        context.getSendHelper().sendAsGroupMessage(messageBuilder, groupId);
+        context.getSendHelper().sendAsGroupMessage(messageBuilder, groupId, false, Optional.empty());
     }
 
     private SendGroupMessageResults updateGroupV2(
@@ -571,7 +659,7 @@ public class GroupHelper {
             final GroupLinkState groupLinkState,
             final GroupPermission addMemberPermission,
             final GroupPermission editDetailsPermission,
-            final File avatarFile,
+            final byte[] avatarFile,
             final Integer expirationTimer,
             final Boolean isAnnouncementGroup
     ) throws IOException {
@@ -579,15 +667,28 @@ public class GroupHelper {
         final var groupV2Helper = context.getGroupV2Helper();
         if (group.isPendingMember(account.getSelfRecipientId())) {
             var groupGroupChangePair = groupV2Helper.acceptInvite(group);
-            result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+            result = sendUpdateGroupV2Message(group,
+                    groupGroupChangePair.first(),
+                    handleGroupChangeResponse(group, groupGroupChangePair.second()));
         }
 
         if (members != null) {
+            final var requestingMembers = new HashSet<>(members);
+            requestingMembers.retainAll(group.getRequestingMembers());
+            if (!requestingMembers.isEmpty()) {
+                var groupGroupChangePair = groupV2Helper.approveJoinRequestMembers(group, requestingMembers);
+                result = sendUpdateGroupV2Message(group,
+                        groupGroupChangePair.first(),
+                        handleGroupChangeResponse(group, groupGroupChangePair.second()));
+            }
             final var newMembers = new HashSet<>(members);
             newMembers.removeAll(group.getMembers());
-            if (newMembers.size() > 0) {
+            newMembers.removeAll(group.getRequestingMembers());
+            if (!newMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.addMembers(group, newMembers);
-                result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+                result = sendUpdateGroupV2Message(group,
+                        groupGroupChangePair.first(),
+                        handleGroupChangeResponse(group, groupGroupChangePair.second()));
             }
         }
 
@@ -601,16 +702,28 @@ public class GroupHelper {
                 existingRemoveMembers.removeAll(members);
             }
             existingRemoveMembers.remove(account.getSelfRecipientId());// self can be removed with sendQuitGroupMessage
-            if (existingRemoveMembers.size() > 0) {
+            if (!existingRemoveMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.removeMembers(group, existingRemoveMembers);
-                result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+                result = sendUpdateGroupV2Message(group,
+                        groupGroupChangePair.first(),
+                        handleGroupChangeResponse(group, groupGroupChangePair.second()));
             }
 
             var pendingRemoveMembers = new HashSet<>(removeMembers);
             pendingRemoveMembers.retainAll(group.getPendingMembers());
-            if (pendingRemoveMembers.size() > 0) {
+            if (!pendingRemoveMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.revokeInvitedMembers(group, pendingRemoveMembers);
-                result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+                result = sendUpdateGroupV2Message(group,
+                        groupGroupChangePair.first(),
+                        handleGroupChangeResponse(group, groupGroupChangePair.second()));
+            }
+            var requestingRemoveMembers = new HashSet<>(removeMembers);
+            requestingRemoveMembers.retainAll(group.getRequestingMembers());
+            if (!requestingRemoveMembers.isEmpty()) {
+                var groupGroupChangePair = groupV2Helper.refuseJoinRequestMembers(group, requestingRemoveMembers);
+                result = sendUpdateGroupV2Message(group,
+                        groupGroupChangePair.first(),
+                        handleGroupChangeResponse(group, groupGroupChangePair.second()));
             }
         }
 
@@ -618,12 +731,12 @@ public class GroupHelper {
             final var newAdmins = new HashSet<>(admins);
             newAdmins.retainAll(group.getMembers());
             newAdmins.removeAll(group.getAdminMembers());
-            if (newAdmins.size() > 0) {
+            if (!newAdmins.isEmpty()) {
                 for (var admin : newAdmins) {
                     var groupGroupChangePair = groupV2Helper.setMemberAdmin(group, admin, true);
                     result = sendUpdateGroupV2Message(group,
                             groupGroupChangePair.first(),
-                            groupGroupChangePair.second());
+                            handleGroupChangeResponse(group, groupGroupChangePair.second()));
                 }
             }
         }
@@ -631,12 +744,12 @@ public class GroupHelper {
         if (removeAdmins != null) {
             final var existingRemoveAdmins = new HashSet<>(removeAdmins);
             existingRemoveAdmins.retainAll(group.getAdminMembers());
-            if (existingRemoveAdmins.size() > 0) {
+            if (!existingRemoveAdmins.isEmpty()) {
                 for (var admin : existingRemoveAdmins) {
                     var groupGroupChangePair = groupV2Helper.setMemberAdmin(group, admin, false);
                     result = sendUpdateGroupV2Message(group,
                             groupGroupChangePair.first(),
-                            groupGroupChangePair.second());
+                            handleGroupChangeResponse(group, groupGroupChangePair.second()));
                 }
             }
         }
@@ -644,59 +757,76 @@ public class GroupHelper {
         if (banMembers != null) {
             final var newlyBannedMembers = new HashSet<>(banMembers);
             newlyBannedMembers.removeAll(group.getBannedMembers());
-            if (newlyBannedMembers.size() > 0) {
+            if (!newlyBannedMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.banMembers(group, newlyBannedMembers);
-                result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+                result = sendUpdateGroupV2Message(group,
+                        groupGroupChangePair.first(),
+                        handleGroupChangeResponse(group, groupGroupChangePair.second()));
             }
         }
 
         if (unbanMembers != null) {
             var existingUnbanMembers = new HashSet<>(unbanMembers);
             existingUnbanMembers.retainAll(group.getBannedMembers());
-            if (existingUnbanMembers.size() > 0) {
+            if (!existingUnbanMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.unbanMembers(group, existingUnbanMembers);
-                result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+                result = sendUpdateGroupV2Message(group,
+                        groupGroupChangePair.first(),
+                        handleGroupChangeResponse(group, groupGroupChangePair.second()));
             }
         }
 
         if (resetGroupLink) {
             var groupGroupChangePair = groupV2Helper.resetGroupLinkPassword(group);
-            result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+            result = sendUpdateGroupV2Message(group,
+                    groupGroupChangePair.first(),
+                    handleGroupChangeResponse(group, groupGroupChangePair.second()));
         }
 
         if (groupLinkState != null) {
             var groupGroupChangePair = groupV2Helper.setGroupLinkState(group, groupLinkState);
-            result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+            result = sendUpdateGroupV2Message(group,
+                    groupGroupChangePair.first(),
+                    handleGroupChangeResponse(group, groupGroupChangePair.second()));
         }
 
         if (addMemberPermission != null) {
             var groupGroupChangePair = groupV2Helper.setAddMemberPermission(group, addMemberPermission);
-            result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+            result = sendUpdateGroupV2Message(group,
+                    groupGroupChangePair.first(),
+                    handleGroupChangeResponse(group, groupGroupChangePair.second()));
         }
 
         if (editDetailsPermission != null) {
             var groupGroupChangePair = groupV2Helper.setEditDetailsPermission(group, editDetailsPermission);
-            result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+            result = sendUpdateGroupV2Message(group,
+                    groupGroupChangePair.first(),
+                    handleGroupChangeResponse(group, groupGroupChangePair.second()));
         }
 
         if (expirationTimer != null) {
             var groupGroupChangePair = groupV2Helper.setMessageExpirationTimer(group, expirationTimer);
-            result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+            result = sendUpdateGroupV2Message(group,
+                    groupGroupChangePair.first(),
+                    handleGroupChangeResponse(group, groupGroupChangePair.second()));
         }
 
         if (isAnnouncementGroup != null) {
             var groupGroupChangePair = groupV2Helper.setIsAnnouncementGroup(group, isAnnouncementGroup);
-            result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+            result = sendUpdateGroupV2Message(group,
+                    groupGroupChangePair.first(),
+                    handleGroupChangeResponse(group, groupGroupChangePair.second()));
         }
 
         if (name != null || description != null || avatarFile != null) {
             var groupGroupChangePair = groupV2Helper.updateGroup(group, name, description, avatarFile);
             if (avatarFile != null) {
                 context.getAvatarStore()
-                        .storeGroupAvatar(group.getGroupId(),
-                                outputStream -> IOUtils.copyFileToStream(avatarFile, outputStream));
+                        .storeGroupAvatar(group.getGroupId(), outputStream -> outputStream.write(avatarFile));
             }
-            result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+            result = sendUpdateGroupV2Message(group,
+                    groupGroupChangePair.first(),
+                    handleGroupChangeResponse(group, groupGroupChangePair.second()));
         }
 
         return result;
@@ -716,7 +846,8 @@ public class GroupHelper {
     }
 
     private SendGroupMessageResults quitGroupV2(
-            final GroupInfoV2 groupInfoV2, final Set<RecipientId> newAdmins
+            final GroupInfoV2 groupInfoV2,
+            final Set<RecipientId> newAdmins
     ) throws LastGroupAdminException, IOException {
         final var currentAdmins = groupInfoV2.getAdminMembers();
         newAdmins.removeAll(currentAdmins);
@@ -724,15 +855,16 @@ public class GroupHelper {
         if (currentAdmins.contains(account.getSelfRecipientId())
                 && currentAdmins.size() == 1
                 && groupInfoV2.getMembers().size() > 1
-                && newAdmins.size() == 0) {
+                && newAdmins.isEmpty()) {
             // Last admin can't leave the group, unless she's also the last member
             throw new LastGroupAdminException(groupInfoV2.getGroupId(), groupInfoV2.getTitle());
         }
         final var groupGroupChangePair = context.getGroupV2Helper().leaveGroup(groupInfoV2, newAdmins);
-        groupInfoV2.setGroup(groupGroupChangePair.first(), account.getRecipientResolver());
+        groupInfoV2.setGroup(groupGroupChangePair.first());
         account.getGroupStore().updateGroup(groupInfoV2);
 
-        var messageBuilder = getGroupUpdateMessageBuilder(groupInfoV2, groupGroupChangePair.second().toByteArray());
+        var messageBuilder = getGroupUpdateMessageBuilder(groupInfoV2,
+                handleGroupChangeResponse(groupInfoV2, groupGroupChangePair.second()).encode());
         return sendGroupMessage(messageBuilder,
                 groupInfoV2.getMembersIncludingPendingWithout(account.getSelfRecipientId()),
                 groupInfoV2.getDistributionId());
@@ -761,7 +893,7 @@ public class GroupHelper {
 
     private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfoV2 g, byte[] signedGroupChange) {
         var group = SignalServiceGroupV2.newBuilder(g.getMasterKey())
-                .withRevision(g.getGroup().getRevision())
+                .withRevision(g.getGroup().revision)
                 .withSignedGroupChange(signedGroupChange);
         return SignalServiceDataMessage.newBuilder()
                 .asGroupMessage(group.build())
@@ -769,15 +901,17 @@ public class GroupHelper {
     }
 
     private SendGroupMessageResults sendUpdateGroupV2Message(
-            GroupInfoV2 group, DecryptedGroup newDecryptedGroup, GroupChange groupChange
+            GroupInfoV2 group,
+            DecryptedGroup newDecryptedGroup,
+            GroupChange groupChange
     ) throws IOException {
         final var selfRecipientId = account.getSelfRecipientId();
         final var members = group.getMembersIncludingPendingWithout(selfRecipientId);
-        group.setGroup(newDecryptedGroup, account.getRecipientResolver());
+        group.setGroup(newDecryptedGroup);
         members.addAll(group.getMembersIncludingPendingWithout(selfRecipientId));
         account.getGroupStore().updateGroup(group);
 
-        final var messageBuilder = getGroupUpdateMessageBuilder(group, groupChange.toByteArray());
+        final var messageBuilder = getGroupUpdateMessageBuilder(group, groupChange.encode());
         return sendGroupMessage(messageBuilder, members, group.getDistributionId());
     }
 
@@ -796,4 +930,13 @@ public class GroupHelper {
                                 account.getRecipientAddressResolver()))
                         .toList());
     }
+
+    private byte[] readAvatarBytes(final String avatarFile) throws IOException {
+        if (avatarFile == null) {
+            return null;
+        }
+        try (final var avatar = Utils.createStreamDetails(avatarFile).first()) {
+            return IOUtils.readFully(avatar.getStream());
+        }
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
index 9b934580..8eb66843 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
@@ -1,37 +1,35 @@
 package org.asamk.signal.manager.helper;
 
-import com.google.protobuf.ByteString;
-import com.google.protobuf.InvalidProtocolBufferException;
-
-import org.asamk.signal.manager.SignalDependencies;
+import org.asamk.signal.manager.api.GroupLinkState;
+import org.asamk.signal.manager.api.GroupPermission;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.groups.GroupLinkPassword;
-import org.asamk.signal.manager.groups.GroupLinkState;
-import org.asamk.signal.manager.groups.GroupPermission;
 import org.asamk.signal.manager.groups.GroupUtils;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.groups.GroupInfoV2;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
-import org.asamk.signal.manager.util.IOUtils;
 import org.asamk.signal.manager.util.Utils;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.VerificationFailedException;
-import org.signal.libsignal.zkgroup.auth.AuthCredentialResponse;
+import org.signal.libsignal.zkgroup.auth.AuthCredentialWithPniResponse;
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
 import org.signal.libsignal.zkgroup.groups.GroupSecretParams;
 import org.signal.libsignal.zkgroup.groups.UuidCiphertext;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.signal.storageservice.protos.groups.AccessControl;
 import org.signal.storageservice.protos.groups.GroupChange;
+import org.signal.storageservice.protos.groups.GroupChangeResponse;
 import org.signal.storageservice.protos.groups.Member;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
 import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
 import org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo;
 import org.signal.storageservice.protos.groups.local.DecryptedMember;
 import org.signal.storageservice.protos.groups.local.DecryptedPendingMember;
-import org.signal.storageservice.protos.groups.local.DecryptedRequestingMember;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.groupsv2.DecryptChangeVerificationMode;
+import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupResponse;
 import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil;
 import org.whispersystems.signalservice.api.groupsv2.GroupCandidate;
 import org.whispersystems.signalservice.api.groupsv2.GroupHistoryPage;
@@ -40,20 +38,19 @@ import org.whispersystems.signalservice.api.groupsv2.GroupsV2AuthorizationString
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
 import org.whispersystems.signalservice.api.groupsv2.InvalidGroupStateException;
 import org.whispersystems.signalservice.api.groupsv2.NotAbleToApplyGroupV2ChangeException;
-import org.whispersystems.signalservice.api.push.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
 import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.signalservice.internal.push.exceptions.NotInGroupException;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
@@ -62,38 +59,45 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import okio.ByteString;
+
 class GroupV2Helper {
 
-    private final static Logger logger = LoggerFactory.getLogger(GroupV2Helper.class);
+    private static final Logger logger = LoggerFactory.getLogger(GroupV2Helper.class);
 
     private final SignalDependencies dependencies;
     private final Context context;
 
-    private HashMap<Integer, AuthCredentialResponse> groupApiCredentials;
+    private Map<Long, AuthCredentialWithPniResponse> groupApiCredentials;
 
     GroupV2Helper(final Context context) {
         this.dependencies = context.getDependencies();
         this.context = context;
     }
 
-    DecryptedGroup getDecryptedGroup(final GroupSecretParams groupSecretParams) throws NotAGroupMemberException {
+    void clearAuthCredentialCache() {
+        groupApiCredentials = null;
+    }
+
+    DecryptedGroupResponse getDecryptedGroup(final GroupSecretParams groupSecretParams) throws NotAGroupMemberException {
         try {
             final var groupsV2AuthorizationString = getGroupAuthForToday(groupSecretParams);
             return dependencies.getGroupsV2Api().getGroup(groupSecretParams, groupsV2AuthorizationString);
         } catch (NonSuccessfulResponseCodeException e) {
-            if (e.getCode() == 403) {
+            if (e.code == 403) {
                 throw new NotAGroupMemberException(GroupUtils.getGroupIdV2(groupSecretParams), null);
             }
             logger.warn("Failed to retrieve Group V2 info, ignoring: {}", e.getMessage());
             return null;
-        } catch (IOException | VerificationFailedException | InvalidGroupStateException e) {
+        } catch (IOException | VerificationFailedException | InvalidGroupStateException | InvalidInputException e) {
             logger.warn("Failed to retrieve Group V2 info, ignoring: {}", e.getMessage());
             return null;
         }
     }
 
     DecryptedGroupJoinInfo getDecryptedGroupJoinInfo(
-            GroupMasterKey groupMasterKey, GroupLinkPassword password
+            GroupMasterKey groupMasterKey,
+            GroupLinkPassword password
     ) throws IOException, GroupLinkNotActiveException {
         var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
 
@@ -104,39 +108,45 @@ class GroupV2Helper {
     }
 
     GroupHistoryPage getDecryptedGroupHistoryPage(
-            final GroupSecretParams groupSecretParams, int fromRevision
+            final GroupSecretParams groupSecretParams,
+            int fromRevision,
+            long sendEndorsementsExpirationMs
     ) throws NotAGroupMemberException {
         try {
             final var groupsV2AuthorizationString = getGroupAuthForToday(groupSecretParams);
             return dependencies.getGroupsV2Api()
-                    .getGroupHistoryPage(groupSecretParams, fromRevision, groupsV2AuthorizationString, false);
+                    .getGroupHistoryPage(groupSecretParams,
+                            fromRevision,
+                            groupsV2AuthorizationString,
+                            false,
+                            sendEndorsementsExpirationMs);
+        } catch (NotInGroupException e) {
+            throw new NotAGroupMemberException(GroupUtils.getGroupIdV2(groupSecretParams), null);
         } catch (NonSuccessfulResponseCodeException e) {
-            if (e.getCode() == 403) {
+            if (e.code == 403) {
                 throw new NotAGroupMemberException(GroupUtils.getGroupIdV2(groupSecretParams), null);
             }
             logger.warn("Failed to retrieve Group V2 history, ignoring: {}", e.getMessage());
             return null;
-        } catch (IOException | VerificationFailedException | InvalidGroupStateException e) {
+        } catch (IOException | VerificationFailedException | InvalidGroupStateException | InvalidInputException e) {
             logger.warn("Failed to retrieve Group V2 history, ignoring: {}", e.getMessage());
             return null;
         }
     }
 
     int findRevisionWeWereAdded(DecryptedGroup partialDecryptedGroup) {
-        ByteString bytes = UuidUtil.toByteString(getSelfAci().uuid());
-        for (DecryptedMember decryptedMember : partialDecryptedGroup.getMembersList()) {
-            if (decryptedMember.getUuid().equals(bytes)) {
-                return decryptedMember.getJoinedAtRevision();
+        ByteString aciBytes = getSelfAci().toByteString();
+        ByteString pniBytes = getSelfPni().toByteString();
+        for (DecryptedMember decryptedMember : partialDecryptedGroup.members) {
+            if (decryptedMember.aciBytes.equals(aciBytes) || decryptedMember.pniBytes.equals(pniBytes)) {
+                return decryptedMember.joinedAtRevision;
             }
         }
-        return partialDecryptedGroup.getRevision();
+        return partialDecryptedGroup.revision;
     }
 
-    Pair<GroupInfoV2, DecryptedGroup> createGroup(
-            String name, Set<RecipientId> members, File avatarFile
-    ) throws IOException {
-        final var avatarBytes = readAvatarBytes(avatarFile);
-        final var newGroup = buildNewGroup(name, members, avatarBytes);
+    Pair<GroupInfoV2, DecryptedGroupResponse> createGroup(String name, Set<RecipientId> members, byte[] avatarFile) {
+        final var newGroup = buildNewGroup(name, members, avatarFile);
         if (newGroup == null) {
             return null;
         }
@@ -144,50 +154,40 @@ class GroupV2Helper {
         final var groupSecretParams = newGroup.getGroupSecretParams();
 
         final GroupsV2AuthorizationString groupAuthForToday;
-        final DecryptedGroup decryptedGroup;
+        final DecryptedGroupResponse response;
         try {
             groupAuthForToday = getGroupAuthForToday(groupSecretParams);
             dependencies.getGroupsV2Api().putNewGroup(newGroup, groupAuthForToday);
-            decryptedGroup = dependencies.getGroupsV2Api().getGroup(groupSecretParams, groupAuthForToday);
-        } catch (IOException | VerificationFailedException | InvalidGroupStateException e) {
+            response = dependencies.getGroupsV2Api().getGroup(groupSecretParams, groupAuthForToday);
+        } catch (IOException | VerificationFailedException | InvalidGroupStateException | InvalidInputException e) {
             logger.warn("Failed to create V2 group: {}", e.getMessage());
             return null;
         }
-        if (decryptedGroup == null) {
+        if (response == null) {
             logger.warn("Failed to create V2 group, unknown error!");
             return null;
         }
 
         final var groupId = GroupUtils.getGroupIdV2(groupSecretParams);
         final var masterKey = groupSecretParams.getMasterKey();
-        var g = new GroupInfoV2(groupId, masterKey);
+        var g = new GroupInfoV2(groupId, masterKey, context.getAccount().getRecipientResolver());
 
-        return new Pair<>(g, decryptedGroup);
+        return new Pair<>(g, response);
     }
 
-    private byte[] readAvatarBytes(final File avatarFile) throws IOException {
-        final byte[] avatarBytes;
-        try (InputStream avatar = avatarFile == null ? null : new FileInputStream(avatarFile)) {
-            avatarBytes = avatar == null ? null : IOUtils.readFully(avatar);
-        }
-        return avatarBytes;
-    }
-
-    private GroupsV2Operations.NewGroup buildNewGroup(
-            String name, Set<RecipientId> members, byte[] avatar
-    ) {
+    private GroupsV2Operations.NewGroup buildNewGroup(String name, Set<RecipientId> members, byte[] avatar) {
         final var profileKeyCredential = context.getProfileHelper()
-                .getRecipientProfileKeyCredential(context.getAccount().getSelfRecipientId());
+                .getExpiringProfileKeyCredential(context.getAccount().getSelfRecipientId());
         if (profileKeyCredential == null) {
             logger.warn("Cannot create a V2 group as self does not have a versioned profile");
             return null;
         }
 
-        final var self = new GroupCandidate(getSelfAci().uuid(), Optional.of(profileKeyCredential));
+        final var self = new GroupCandidate(getSelfAci(), Optional.of(profileKeyCredential));
         final var memberList = new ArrayList<>(members);
-        final var credentials = context.getProfileHelper().getRecipientProfileKeyCredential(memberList).stream();
+        final var credentials = context.getProfileHelper().getExpiringProfileKeyCredential(memberList).stream();
         final var uuids = memberList.stream()
-                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId().uuid());
+                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId());
         var candidates = Utils.zip(uuids,
                         credentials,
                         (uuid, credential) -> new GroupCandidate(uuid, Optional.ofNullable(credential)))
@@ -204,62 +204,66 @@ class GroupV2Helper {
                         0);
     }
 
-    Pair<DecryptedGroup, GroupChange> updateGroup(
-            GroupInfoV2 groupInfoV2, String name, String description, File avatarFile
+    Pair<DecryptedGroup, GroupChangeResponse> updateGroup(
+            GroupInfoV2 groupInfoV2,
+            String name,
+            String description,
+            byte[] avatarFile
     ) throws IOException {
         final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
         var groupOperations = dependencies.getGroupsV2Operations().forGroup(groupSecretParams);
 
-        var change = name != null ? groupOperations.createModifyGroupTitle(name) : GroupChange.Actions.newBuilder();
+        var change = name != null ? groupOperations.createModifyGroupTitle(name) : new GroupChange.Actions.Builder();
 
         if (description != null) {
-            change.setModifyDescription(groupOperations.createModifyGroupDescriptionAction(description));
+            change.modifyDescription(groupOperations.createModifyGroupDescriptionAction(description).build());
         }
 
         if (avatarFile != null) {
-            final var avatarBytes = readAvatarBytes(avatarFile);
             var avatarCdnKey = dependencies.getGroupsV2Api()
-                    .uploadAvatar(avatarBytes, groupSecretParams, getGroupAuthForToday(groupSecretParams));
-            change.setModifyAvatar(GroupChange.Actions.ModifyAvatarAction.newBuilder().setAvatar(avatarCdnKey));
+                    .uploadAvatar(avatarFile, groupSecretParams, getGroupAuthForToday(groupSecretParams));
+            change.modifyAvatar(new GroupChange.Actions.ModifyAvatarAction.Builder().avatar(avatarCdnKey).build());
         }
 
-        change.setSourceUuid(getSelfAci().toByteString());
+        change.sourceServiceId(getSelfAci().toByteString());
 
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> addMembers(
-            GroupInfoV2 groupInfoV2, Set<RecipientId> newMembers
+    Pair<DecryptedGroup, GroupChangeResponse> addMembers(
+            GroupInfoV2 groupInfoV2,
+            Set<RecipientId> newMembers
     ) throws IOException {
         GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
 
         final var memberList = new ArrayList<>(newMembers);
-        final var credentials = context.getProfileHelper().getRecipientProfileKeyCredential(memberList).stream();
+        final var credentials = context.getProfileHelper().getExpiringProfileKeyCredential(memberList).stream();
         final var uuids = memberList.stream()
-                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId().uuid());
+                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId());
         var candidates = Utils.zip(uuids,
                         credentials,
                         (uuid, credential) -> new GroupCandidate(uuid, Optional.ofNullable(credential)))
                 .collect(Collectors.toSet());
         final var bannedUuids = groupInfoV2.getBannedMembers()
                 .stream()
-                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId().uuid())
+                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId())
                 .collect(Collectors.toSet());
 
         final var aci = getSelfAci();
-        final var change = groupOperations.createModifyGroupMembershipChange(candidates, bannedUuids, aci.uuid());
+        final var change = groupOperations.createModifyGroupMembershipChange(candidates, bannedUuids, aci);
 
-        change.setSourceUuid(getSelfAci().toByteString());
+        change.sourceServiceId(getSelfAci().toByteString());
 
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> leaveGroup(
-            GroupInfoV2 groupInfoV2, Set<RecipientId> membersToMakeAdmin
+    Pair<DecryptedGroup, GroupChangeResponse> leaveGroup(
+            GroupInfoV2 groupInfoV2,
+            Set<RecipientId> membersToMakeAdmin
     ) throws IOException {
-        var pendingMembersList = groupInfoV2.getGroup().getPendingMembersList();
+        var pendingMembersList = groupInfoV2.getGroup().pendingMembers;
         final var selfAci = getSelfAci();
-        var selfPendingMember = DecryptedGroupUtil.findPendingByUuid(pendingMembersList, selfAci.uuid());
+        var selfPendingMember = DecryptedGroupUtil.findPendingByServiceId(pendingMembersList, selfAci);
 
         if (selfPendingMember.isPresent()) {
             return revokeInvites(groupInfoV2, Set.of(selfPendingMember.get()));
@@ -268,89 +272,115 @@ class GroupV2Helper {
         final var adminUuids = membersToMakeAdmin.stream()
                 .map(context.getRecipientHelper()::resolveSignalServiceAddress)
                 .map(SignalServiceAddress::getServiceId)
-                .map(ServiceId::uuid)
+                .map(ServiceId::getRawUuid)
                 .toList();
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
-        return commitChange(groupInfoV2,
-                groupOperations.createLeaveAndPromoteMembersToAdmin(selfAci.uuid(), adminUuids));
+        return commitChange(groupInfoV2, groupOperations.createLeaveAndPromoteMembersToAdmin(selfAci, adminUuids));
     }
 
-    Pair<DecryptedGroup, GroupChange> removeMembers(
-            GroupInfoV2 groupInfoV2, Set<RecipientId> members
+    Pair<DecryptedGroup, GroupChangeResponse> removeMembers(
+            GroupInfoV2 groupInfoV2,
+            Set<RecipientId> members
     ) throws IOException {
         final var memberUuids = members.stream()
                 .map(context.getRecipientHelper()::resolveSignalServiceAddress)
                 .map(SignalServiceAddress::getServiceId)
-                .map(ServiceId::uuid)
+                .filter(m -> m instanceof ACI)
+                .map(m -> (ACI) m)
                 .collect(Collectors.toSet());
         return ejectMembers(groupInfoV2, memberUuids);
     }
 
-    Pair<DecryptedGroup, GroupChange> revokeInvitedMembers(
-            GroupInfoV2 groupInfoV2, Set<RecipientId> members
+    Pair<DecryptedGroup, GroupChangeResponse> approveJoinRequestMembers(
+            GroupInfoV2 groupInfoV2,
+            Set<RecipientId> members
     ) throws IOException {
-        var pendingMembersList = groupInfoV2.getGroup().getPendingMembersList();
         final var memberUuids = members.stream()
                 .map(context.getRecipientHelper()::resolveSignalServiceAddress)
                 .map(SignalServiceAddress::getServiceId)
-                .map(ServiceId::uuid)
-                .map(uuid -> DecryptedGroupUtil.findPendingByUuid(pendingMembersList, uuid))
+                .map(ServiceId::getRawUuid)
+                .collect(Collectors.toSet());
+        return approveJoinRequest(groupInfoV2, memberUuids);
+    }
+
+    Pair<DecryptedGroup, GroupChangeResponse> refuseJoinRequestMembers(
+            GroupInfoV2 groupInfoV2,
+            Set<RecipientId> members
+    ) throws IOException {
+        final var memberUuids = members.stream()
+                .map(context.getRecipientHelper()::resolveSignalServiceAddress)
+                .map(SignalServiceAddress::getServiceId)
+                .collect(Collectors.toSet());
+        return refuseJoinRequest(groupInfoV2, memberUuids);
+    }
+
+    Pair<DecryptedGroup, GroupChangeResponse> revokeInvitedMembers(
+            GroupInfoV2 groupInfoV2,
+            Set<RecipientId> members
+    ) throws IOException {
+        var pendingMembersList = groupInfoV2.getGroup().pendingMembers;
+        final var memberUuids = members.stream()
+                .map(context.getRecipientHelper()::resolveSignalServiceAddress)
+                .map(SignalServiceAddress::getServiceId)
+                .map(uuid -> DecryptedGroupUtil.findPendingByServiceId(pendingMembersList, uuid))
                 .filter(Optional::isPresent)
                 .map(Optional::get)
                 .collect(Collectors.toSet());
         return revokeInvites(groupInfoV2, memberUuids);
     }
 
-    Pair<DecryptedGroup, GroupChange> banMembers(
-            GroupInfoV2 groupInfoV2, Set<RecipientId> block
+    Pair<DecryptedGroup, GroupChangeResponse> banMembers(
+            GroupInfoV2 groupInfoV2,
+            Set<RecipientId> block
     ) throws IOException {
         GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
 
-        final var uuids = block.stream()
-                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId().uuid())
+        final var serviceIds = block.stream()
+                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId())
                 .collect(Collectors.toSet());
 
-        final var change = groupOperations.createBanUuidsChange(uuids,
+        final var change = groupOperations.createBanServiceIdsChange(serviceIds,
                 false,
-                groupInfoV2.getGroup().getBannedMembersList());
+                groupInfoV2.getGroup().bannedMembers);
 
-        change.setSourceUuid(getSelfAci().toByteString());
+        change.sourceServiceId(getSelfAci().toByteString());
 
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> unbanMembers(
-            GroupInfoV2 groupInfoV2, Set<RecipientId> block
+    Pair<DecryptedGroup, GroupChangeResponse> unbanMembers(
+            GroupInfoV2 groupInfoV2,
+            Set<RecipientId> block
     ) throws IOException {
         GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
 
-        final var uuids = block.stream()
-                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId().uuid())
+        final var serviceIds = block.stream()
+                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId())
                 .collect(Collectors.toSet());
 
-        final var change = groupOperations.createUnbanUuidsChange(uuids);
+        final var change = groupOperations.createUnbanServiceIdsChange(serviceIds);
 
-        change.setSourceUuid(getSelfAci().toByteString());
+        change.sourceServiceId(getSelfAci().toByteString());
 
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> resetGroupLinkPassword(GroupInfoV2 groupInfoV2) throws IOException {
+    Pair<DecryptedGroup, GroupChangeResponse> resetGroupLinkPassword(GroupInfoV2 groupInfoV2) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         final var newGroupLinkPassword = GroupLinkPassword.createNew().serialize();
         final var change = groupOperations.createModifyGroupLinkPasswordChange(newGroupLinkPassword);
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> setGroupLinkState(
-            GroupInfoV2 groupInfoV2, GroupLinkState state
+    Pair<DecryptedGroup, GroupChangeResponse> setGroupLinkState(
+            GroupInfoV2 groupInfoV2,
+            GroupLinkState state
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
 
         final var accessRequired = toAccessControl(state);
-        final var requiresNewPassword = state != GroupLinkState.DISABLED && groupInfoV2.getGroup()
-                .getInviteLinkPassword()
-                .isEmpty();
+        final var requiresNewPassword = state != GroupLinkState.DISABLED
+                && groupInfoV2.getGroup().inviteLinkPassword.toByteArray().length == 0;
 
         final var change = requiresNewPassword ? groupOperations.createModifyGroupLinkPasswordAndRightsChange(
                 GroupLinkPassword.createNew().serialize(),
@@ -358,8 +388,9 @@ class GroupV2Helper {
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> setEditDetailsPermission(
-            GroupInfoV2 groupInfoV2, GroupPermission permission
+    Pair<DecryptedGroup, GroupChangeResponse> setEditDetailsPermission(
+            GroupInfoV2 groupInfoV2,
+            GroupPermission permission
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
 
@@ -368,8 +399,9 @@ class GroupV2Helper {
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> setAddMemberPermission(
-            GroupInfoV2 groupInfoV2, GroupPermission permission
+    Pair<DecryptedGroup, GroupChangeResponse> setAddMemberPermission(
+            GroupInfoV2 groupInfoV2,
+            GroupPermission permission
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
 
@@ -378,17 +410,17 @@ class GroupV2Helper {
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> updateSelfProfileKey(GroupInfoV2 groupInfoV2) throws IOException {
+    Pair<DecryptedGroup, GroupChangeResponse> updateSelfProfileKey(GroupInfoV2 groupInfoV2) throws IOException {
         Optional<DecryptedMember> selfInGroup = groupInfoV2.getGroup() == null
                 ? Optional.empty()
-                : DecryptedGroupUtil.findMemberByUuid(groupInfoV2.getGroup().getMembersList(), getSelfAci().uuid());
+                : DecryptedGroupUtil.findMemberByAci(groupInfoV2.getGroup().members, getSelfAci());
         if (selfInGroup.isEmpty()) {
             logger.trace("Not updating group, self not in group " + groupInfoV2.getGroupId().toBase64());
             return null;
         }
 
         final var profileKey = context.getAccount().getProfileKey();
-        if (Arrays.equals(profileKey.serialize(), selfInGroup.get().getProfileKey().toByteArray())) {
+        if (Arrays.equals(profileKey.serialize(), selfInGroup.get().profileKey.toByteArray())) {
             logger.trace("Not updating group, own Profile Key is already up to date in group "
                     + groupInfoV2.getGroupId().toBase64());
             return null;
@@ -396,7 +428,7 @@ class GroupV2Helper {
         logger.debug("Updating own profile key in group " + groupInfoV2.getGroupId().toBase64());
 
         final var selfRecipientId = context.getAccount().getSelfRecipientId();
-        final var profileKeyCredential = context.getProfileHelper().getRecipientProfileKeyCredential(selfRecipientId);
+        final var profileKeyCredential = context.getProfileHelper().getExpiringProfileKeyCredential(selfRecipientId);
         if (profileKeyCredential == null) {
             logger.trace("Cannot update profile key as self does not have a versioned profile");
             return null;
@@ -404,11 +436,11 @@ class GroupV2Helper {
 
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         final var change = groupOperations.createUpdateProfileKeyCredentialChange(profileKeyCredential);
-        change.setSourceUuid(getSelfAci().toByteString());
+        change.sourceServiceId(getSelfAci().toByteString());
         return commitChange(groupInfoV2, change);
     }
 
-    GroupChange joinGroup(
+    GroupChangeResponse joinGroup(
             GroupMasterKey groupMasterKey,
             GroupLinkPassword groupLinkPassword,
             DecryptedGroupJoinInfo decryptedGroupJoinInfo
@@ -417,29 +449,29 @@ class GroupV2Helper {
         final var groupOperations = dependencies.getGroupsV2Operations().forGroup(groupSecretParams);
 
         final var selfRecipientId = context.getAccount().getSelfRecipientId();
-        final var profileKeyCredential = context.getProfileHelper().getRecipientProfileKeyCredential(selfRecipientId);
+        final var profileKeyCredential = context.getProfileHelper().getExpiringProfileKeyCredential(selfRecipientId);
         if (profileKeyCredential == null) {
             throw new IOException("Cannot join a V2 group as self does not have a versioned profile");
         }
 
-        var requestToJoin = decryptedGroupJoinInfo.getAddFromInviteLink() == AccessControl.AccessRequired.ADMINISTRATOR;
+        var requestToJoin = decryptedGroupJoinInfo.addFromInviteLink == AccessControl.AccessRequired.ADMINISTRATOR;
         var change = requestToJoin
                 ? groupOperations.createGroupJoinRequest(profileKeyCredential)
                 : groupOperations.createGroupJoinDirect(profileKeyCredential);
 
-        change.setSourceUuid(context.getRecipientHelper()
+        change.sourceServiceId(context.getRecipientHelper()
                 .resolveSignalServiceAddress(selfRecipientId)
                 .getServiceId()
                 .toByteString());
 
-        return commitChange(groupSecretParams, decryptedGroupJoinInfo.getRevision(), change, groupLinkPassword);
+        return commitChange(groupSecretParams, decryptedGroupJoinInfo.revision, change, groupLinkPassword);
     }
 
-    Pair<DecryptedGroup, GroupChange> acceptInvite(GroupInfoV2 groupInfoV2) throws IOException {
+    Pair<DecryptedGroup, GroupChangeResponse> acceptInvite(GroupInfoV2 groupInfoV2) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
 
         final var selfRecipientId = context.getAccount().getSelfRecipientId();
-        final var profileKeyCredential = context.getProfileHelper().getRecipientProfileKeyCredential(selfRecipientId);
+        final var profileKeyCredential = context.getProfileHelper().getExpiringProfileKeyCredential(selfRecipientId);
         if (profileKeyCredential == null) {
             throw new IOException("Cannot join a V2 group as self does not have a versioned profile");
         }
@@ -447,31 +479,39 @@ class GroupV2Helper {
         final var change = groupOperations.createAcceptInviteChange(profileKeyCredential);
 
         final var aci = context.getRecipientHelper().resolveSignalServiceAddress(selfRecipientId).getServiceId();
-        change.setSourceUuid(aci.toByteString());
+        change.sourceServiceId(aci.toByteString());
 
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> setMemberAdmin(
-            GroupInfoV2 groupInfoV2, RecipientId recipientId, boolean admin
+    Pair<DecryptedGroup, GroupChangeResponse> setMemberAdmin(
+            GroupInfoV2 groupInfoV2,
+            RecipientId recipientId,
+            boolean admin
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         final var address = context.getRecipientHelper().resolveSignalServiceAddress(recipientId);
         final var newRole = admin ? Member.Role.ADMINISTRATOR : Member.Role.DEFAULT;
-        final var change = groupOperations.createChangeMemberRole(address.getServiceId().uuid(), newRole);
-        return commitChange(groupInfoV2, change);
+        if (address.getServiceId() instanceof ACI aci) {
+            final var change = groupOperations.createChangeMemberRole(aci, newRole);
+            return commitChange(groupInfoV2, change);
+        } else {
+            throw new IllegalArgumentException("Can't make a PNI a group admin.");
+        }
     }
 
-    Pair<DecryptedGroup, GroupChange> setMessageExpirationTimer(
-            GroupInfoV2 groupInfoV2, int messageExpirationTimer
+    Pair<DecryptedGroup, GroupChangeResponse> setMessageExpirationTimer(
+            GroupInfoV2 groupInfoV2,
+            int messageExpirationTimer
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         final var change = groupOperations.createModifyGroupTimerChange(messageExpirationTimer);
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> setIsAnnouncementGroup(
-            GroupInfoV2 groupInfoV2, boolean isAnnouncementGroup
+    Pair<DecryptedGroup, GroupChangeResponse> setIsAnnouncementGroup(
+            GroupInfoV2 groupInfoV2,
+            boolean isAnnouncementGroup
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         final var change = groupOperations.createAnnouncementGroupChange(isAnnouncementGroup);
@@ -498,13 +538,14 @@ class GroupV2Helper {
         return dependencies.getGroupsV2Operations().forGroup(groupSecretParams);
     }
 
-    private Pair<DecryptedGroup, GroupChange> revokeInvites(
-            GroupInfoV2 groupInfoV2, Set<DecryptedPendingMember> pendingMembers
+    private Pair<DecryptedGroup, GroupChangeResponse> revokeInvites(
+            GroupInfoV2 groupInfoV2,
+            Set<DecryptedPendingMember> pendingMembers
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         final var uuidCipherTexts = pendingMembers.stream().map(member -> {
             try {
-                return new UuidCiphertext(member.getUuidCipherText().toByteArray());
+                return new UuidCiphertext(member.serviceIdCipherText.toByteArray());
             } catch (InvalidInputException e) {
                 throw new AssertionError(e);
             }
@@ -512,26 +553,44 @@ class GroupV2Helper {
         return commitChange(groupInfoV2, groupOperations.createRemoveInvitationChange(uuidCipherTexts));
     }
 
-    private Pair<DecryptedGroup, GroupChange> ejectMembers(
-            GroupInfoV2 groupInfoV2, Set<UUID> uuids
+    private Pair<DecryptedGroup, GroupChangeResponse> approveJoinRequest(
+            GroupInfoV2 groupInfoV2,
+            Set<UUID> uuids
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
-        return commitChange(groupInfoV2, groupOperations.createRemoveMembersChange(uuids, false, List.of()));
+        return commitChange(groupInfoV2, groupOperations.createApproveGroupJoinRequest(uuids));
     }
 
-    private Pair<DecryptedGroup, GroupChange> commitChange(
-            GroupInfoV2 groupInfoV2, GroupChange.Actions.Builder change
+    private Pair<DecryptedGroup, GroupChangeResponse> refuseJoinRequest(
+            GroupInfoV2 groupInfoV2,
+            Set<ServiceId> serviceIds
+    ) throws IOException {
+        final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
+        return commitChange(groupInfoV2, groupOperations.createRefuseGroupJoinRequest(serviceIds, false, List.of()));
+    }
+
+    private Pair<DecryptedGroup, GroupChangeResponse> ejectMembers(
+            GroupInfoV2 groupInfoV2,
+            Set<ACI> members
+    ) throws IOException {
+        final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
+        return commitChange(groupInfoV2, groupOperations.createRemoveMembersChange(members, false, List.of()));
+    }
+
+    private Pair<DecryptedGroup, GroupChangeResponse> commitChange(
+            GroupInfoV2 groupInfoV2,
+            GroupChange.Actions.Builder change
     ) throws IOException {
         final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
         final var groupOperations = dependencies.getGroupsV2Operations().forGroup(groupSecretParams);
         final var previousGroupState = groupInfoV2.getGroup();
-        final var nextRevision = previousGroupState.getRevision() + 1;
-        final var changeActions = change.setRevision(nextRevision).build();
+        final var nextRevision = previousGroupState.revision + 1;
+        final var changeActions = change.revision(nextRevision).build();
         final DecryptedGroupChange decryptedChange;
         final DecryptedGroup decryptedGroupState;
 
         try {
-            decryptedChange = groupOperations.decryptChange(changeActions, getSelfAci().uuid());
+            decryptedChange = groupOperations.decryptChange(changeActions, getSelfAci());
             decryptedGroupState = DecryptedGroupUtil.apply(previousGroupState, decryptedChange);
         } catch (VerificationFailedException | InvalidGroupStateException | NotAbleToApplyGroupV2ChangeException e) {
             throw new IOException(e);
@@ -540,17 +599,19 @@ class GroupV2Helper {
         var signedGroupChange = dependencies.getGroupsV2Api()
                 .patchGroup(changeActions, getGroupAuthForToday(groupSecretParams), Optional.empty());
 
+        groupInfoV2.setGroup(decryptedGroupState);
+
         return new Pair<>(decryptedGroupState, signedGroupChange);
     }
 
-    private GroupChange commitChange(
+    private GroupChangeResponse commitChange(
             GroupSecretParams groupSecretParams,
             int currentRevision,
             GroupChange.Actions.Builder change,
             GroupLinkPassword password
     ) throws IOException {
         final var nextRevision = currentRevision + 1;
-        final var changeActions = change.setRevision(nextRevision).build();
+        final var changeActions = change.revision(nextRevision).build();
 
         return dependencies.getGroupsV2Api()
                 .patchGroup(changeActions,
@@ -559,17 +620,16 @@ class GroupV2Helper {
     }
 
     Pair<ServiceId, ProfileKey> getAuthoritativeProfileKeyFromChange(final DecryptedGroupChange change) {
-        UUID editor = UuidUtil.fromByteStringOrNull(change.getEditor());
-        final var editorProfileKeyBytes = Stream.concat(Stream.of(change.getNewMembersList().stream(),
-                                change.getPromotePendingMembersList().stream(),
-                                change.getModifiedProfileKeysList().stream())
+        UUID editor = UuidUtil.fromByteStringOrNull(change.editorServiceIdBytes);
+        final var editorProfileKeyBytes = Stream.concat(Stream.of(change.newMembers.stream(),
+                                change.promotePendingMembers.stream(),
+                                change.modifiedProfileKeys.stream())
                         .flatMap(Function.identity())
-                        .filter(m -> UuidUtil.fromByteString(m.getUuid()).equals(editor))
-                        .map(DecryptedMember::getProfileKey),
-                change.getNewRequestingMembersList()
-                        .stream()
-                        .filter(m -> UuidUtil.fromByteString(m.getUuid()).equals(editor))
-                        .map(DecryptedRequestingMember::getProfileKey)).findFirst();
+                        .filter(m -> UuidUtil.fromByteString(m.aciBytes).equals(editor))
+                        .map(m -> m.profileKey),
+                change.newRequestingMembers.stream()
+                        .filter(m -> UuidUtil.fromByteString(m.aciBytes).equals(editor))
+                        .map(m -> m.profileKey)).findFirst();
 
         if (editorProfileKeyBytes.isEmpty()) {
             return null;
@@ -583,7 +643,7 @@ class GroupV2Helper {
             return null;
         }
 
-        return new Pair<>(ServiceId.from(editor), profileKey);
+        return new Pair<>(ACI.from(editor), profileKey);
     }
 
     DecryptedGroup getUpdatedDecryptedGroup(DecryptedGroup group, DecryptedGroupChange decryptedGroupChange) {
@@ -596,12 +656,14 @@ class GroupV2Helper {
 
     DecryptedGroupChange getDecryptedGroupChange(byte[] signedGroupChange, GroupMasterKey groupMasterKey) {
         if (signedGroupChange != null) {
-            var groupOperations = dependencies.getGroupsV2Operations()
-                    .forGroup(GroupSecretParams.deriveFromMasterKey(groupMasterKey));
+            final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
+            final var groupOperations = dependencies.getGroupsV2Operations().forGroup(groupSecretParams);
+            final var groupId = groupSecretParams.getPublicParams().getGroupIdentifier();
 
             try {
-                return groupOperations.decryptChange(GroupChange.parseFrom(signedGroupChange), true).orElse(null);
-            } catch (VerificationFailedException | InvalidGroupStateException | InvalidProtocolBufferException e) {
+                return groupOperations.decryptChange(GroupChange.ADAPTER.decode(signedGroupChange),
+                        DecryptChangeVerificationMode.verify(groupId)).orElse(null);
+            } catch (VerificationFailedException | InvalidGroupStateException | IOException e) {
                 return null;
             }
         }
@@ -609,31 +671,54 @@ class GroupV2Helper {
         return null;
     }
 
-    private static int currentTimeDays() {
-        return (int) TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis());
+    private static long currentDaySeconds() {
+        return TimeUnit.DAYS.toSeconds(TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis()));
     }
 
     private GroupsV2AuthorizationString getGroupAuthForToday(
             final GroupSecretParams groupSecretParams
     ) throws IOException {
-        final var today = currentTimeDays();
-        if (groupApiCredentials == null || !groupApiCredentials.containsKey(today)) {
+        final var todaySeconds = currentDaySeconds();
+        if (groupApiCredentials == null || !groupApiCredentials.containsKey(todaySeconds)) {
             // Returns credentials for the next 7 days
-            final var isAci = true; // TODO enable group handling with PNI
-            groupApiCredentials = dependencies.getGroupsV2Api().getCredentials(today, isAci);
+            groupApiCredentials = dependencies.getGroupsV2Api()
+                    .getCredentials(todaySeconds)
+                    .getAuthCredentialWithPniResponseHashMap();
             // TODO cache credentials on disk until they expire
         }
-        var authCredentialResponse = groupApiCredentials.get(today);
-        final var aci = getSelfAci();
         try {
-            return dependencies.getGroupsV2Api()
-                    .getGroupsV2AuthorizationString(aci, today, groupSecretParams, authCredentialResponse);
+            return getAuthorizationString(groupSecretParams, todaySeconds);
+        } catch (VerificationFailedException e) {
+            logger.debug("Group api credentials invalid, renewing and trying again.");
+            groupApiCredentials.clear();
+        }
+
+        groupApiCredentials = dependencies.getGroupsV2Api()
+                .getCredentials(todaySeconds)
+                .getAuthCredentialWithPniResponseHashMap();
+        try {
+            return getAuthorizationString(groupSecretParams, todaySeconds);
         } catch (VerificationFailedException e) {
             throw new IOException(e);
         }
     }
 
+    private GroupsV2AuthorizationString getAuthorizationString(
+            final GroupSecretParams groupSecretParams,
+            final long todaySeconds
+    ) throws VerificationFailedException {
+        var authCredentialResponse = groupApiCredentials.get(todaySeconds);
+        final var aci = getSelfAci();
+        final var pni = getSelfPni();
+        return dependencies.getGroupsV2Api()
+                .getGroupsV2AuthorizationString(aci, pni, todaySeconds, groupSecretParams, authCredentialResponse);
+    }
+
     private ACI getSelfAci() {
         return context.getAccount().getAci();
     }
+
+    private PNI getSelfPni() {
+        return context.getAccount().getPni();
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
index ee74338e..82d44fde 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
@@ -12,18 +12,14 @@ import org.signal.libsignal.protocol.fingerprint.ScannableFingerprint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.push.ServiceId;
 
-import java.io.IOException;
 import java.util.Arrays;
-import java.util.Date;
-import java.util.function.Function;
-
-import static org.asamk.signal.manager.config.ServiceConfig.capabilities;
+import java.util.function.BiFunction;
 
 public class IdentityHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(IdentityHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(IdentityHelper.class);
 
     private final SignalAccount account;
     private final Context context;
@@ -35,19 +31,19 @@ public class IdentityHelper {
 
     public boolean trustIdentityVerified(RecipientId recipientId, byte[] fingerprint) {
         return trustIdentity(recipientId,
-                identityKey -> Arrays.equals(identityKey.serialize(), fingerprint),
+                (serviceId, identityKey) -> Arrays.equals(identityKey.serialize(), fingerprint),
                 TrustLevel.TRUSTED_VERIFIED);
     }
 
     public boolean trustIdentityVerifiedSafetyNumber(RecipientId recipientId, String safetyNumber) {
         return trustIdentity(recipientId,
-                identityKey -> safetyNumber.equals(computeSafetyNumber(recipientId, identityKey)),
+                (serviceId, identityKey) -> safetyNumber.equals(computeSafetyNumber(serviceId, identityKey)),
                 TrustLevel.TRUSTED_VERIFIED);
     }
 
     public boolean trustIdentityVerifiedSafetyNumber(RecipientId recipientId, byte[] safetyNumber) {
-        return trustIdentity(recipientId, identityKey -> {
-            final var fingerprint = computeSafetyNumberForScanning(recipientId, identityKey);
+        return trustIdentity(recipientId, (serviceId, identityKey) -> {
+            final var fingerprint = computeSafetyNumberForScanning(serviceId, identityKey);
             try {
                 return fingerprint != null && fingerprint.compareTo(safetyNumber);
             } catch (FingerprintVersionMismatchException | FingerprintParsingException e) {
@@ -57,60 +53,73 @@ public class IdentityHelper {
     }
 
     public boolean trustIdentityAllKeys(RecipientId recipientId) {
-        return trustIdentity(recipientId, identityKey -> true, TrustLevel.TRUSTED_UNVERIFIED);
+        return trustIdentity(recipientId, (serviceId, identityKey) -> true, TrustLevel.TRUSTED_UNVERIFIED);
     }
 
-    public String computeSafetyNumber(RecipientId recipientId, IdentityKey theirIdentityKey) {
-        var address = context.getRecipientHelper().resolveSignalServiceAddress(recipientId);
-        final Fingerprint fingerprint = computeSafetyNumberFingerprint(address, theirIdentityKey);
+    public String computeSafetyNumber(ServiceId serviceId, IdentityKey theirIdentityKey) {
+        final var fingerprint = computeSafetyNumberFingerprint(serviceId, theirIdentityKey);
         return fingerprint == null ? null : fingerprint.getDisplayableFingerprint().getDisplayText();
     }
 
-    public ScannableFingerprint computeSafetyNumberForScanning(RecipientId recipientId, IdentityKey theirIdentityKey) {
-        var address = context.getRecipientHelper().resolveSignalServiceAddress(recipientId);
-        final Fingerprint fingerprint = computeSafetyNumberFingerprint(address, theirIdentityKey);
+    public ScannableFingerprint computeSafetyNumberForScanning(ServiceId serviceId, IdentityKey theirIdentityKey) {
+        var fingerprint = computeSafetyNumberFingerprint(serviceId, theirIdentityKey);
         return fingerprint == null ? null : fingerprint.getScannableFingerprint();
     }
 
-    private Fingerprint computeSafetyNumberFingerprint(
-            final SignalServiceAddress theirAddress, final IdentityKey theirIdentityKey
-    ) {
-        return Utils.computeSafetyNumber(capabilities.isUuid(),
-                account.getSelfAddress(),
+    private Fingerprint computeSafetyNumberFingerprint(final ServiceId serviceId, final IdentityKey theirIdentityKey) {
+        if (!serviceId.isUnknown()) {
+            return Utils.computeSafetyNumberForUuid(account.getAci(),
+                    account.getAciIdentityKeyPair().getPublicKey(),
+                    serviceId,
+                    theirIdentityKey);
+        }
+
+        final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
+        final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
+
+        if (address.number().isEmpty()) {
+            return null;
+        }
+        return Utils.computeSafetyNumberForNumber(account.getNumber(),
                 account.getAciIdentityKeyPair().getPublicKey(),
-                theirAddress,
+                address.number().get(),
                 theirIdentityKey);
     }
 
     private boolean trustIdentity(
-            RecipientId recipientId, Function<IdentityKey, Boolean> verifier, TrustLevel trustLevel
+            RecipientId recipientId,
+            BiFunction<ServiceId, IdentityKey, Boolean> verifier,
+            TrustLevel trustLevel
     ) {
-        var identity = account.getIdentityKeyStore().getIdentity(recipientId);
+        final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
+        final var serviceId = address.serviceId().orElse(null);
+        if (serviceId == null) {
+            return false;
+        }
+        var identity = account.getIdentityKeyStore().getIdentityInfo(serviceId);
         if (identity == null) {
             return false;
         }
 
-        if (!verifier.apply(identity.getIdentityKey())) {
+        if (!verifier.apply(serviceId, identity.getIdentityKey())) {
             return false;
         }
 
-        account.getIdentityKeyStore().setIdentityTrustLevel(recipientId, identity.getIdentityKey(), trustLevel);
-        try {
-            var address = context.getRecipientHelper().resolveSignalServiceAddress(recipientId);
-            context.getSyncHelper().sendVerifiedMessage(address, identity.getIdentityKey(), trustLevel);
-        } catch (IOException e) {
-            logger.warn("Failed to send verification sync message: {}", e.getMessage());
-        }
+        account.getIdentityKeyStore().setIdentityTrustLevel(serviceId, identity.getIdentityKey(), trustLevel);
+        context.getSyncHelper()
+                .sendVerifiedMessage(address.toSignalServiceAddress(), identity.getIdentityKey(), trustLevel);
 
         return true;
     }
 
     public void handleIdentityFailure(
-            final RecipientId recipientId, final SendMessageResult.IdentityFailure identityFailure
+            final RecipientId recipientId,
+            final ServiceId serviceId,
+            final SendMessageResult.IdentityFailure identityFailure
     ) {
         final var identityKey = identityFailure.getIdentityKey();
         if (identityKey != null) {
-            account.getIdentityKeyStore().saveIdentity(recipientId, identityKey, new Date());
+            account.getIdentityKeyStore().saveIdentity(serviceId, identityKey);
         } else {
             // Retrieve profile to get the current identity key from the server
             context.getProfileHelper().refreshRecipientProfile(recipientId);
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index b6e3d8cb..dd9cb38f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -1,16 +1,13 @@
 package org.asamk.signal.manager.helper;
 
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.actions.HandleAction;
 import org.asamk.signal.manager.actions.RefreshPreKeysAction;
 import org.asamk.signal.manager.actions.RenewSessionAction;
 import org.asamk.signal.manager.actions.ResendMessageAction;
 import org.asamk.signal.manager.actions.RetrieveProfileAction;
-import org.asamk.signal.manager.actions.RetrieveStorageDataAction;
 import org.asamk.signal.manager.actions.SendGroupInfoAction;
 import org.asamk.signal.manager.actions.SendGroupInfoRequestAction;
-import org.asamk.signal.manager.actions.SendPniIdentityKeyAction;
 import org.asamk.signal.manager.actions.SendProfileKeyAction;
 import org.asamk.signal.manager.actions.SendReceiptAction;
 import org.asamk.signal.manager.actions.SendRetryMessageRequestAction;
@@ -19,51 +16,68 @@ import org.asamk.signal.manager.actions.SendSyncConfigurationAction;
 import org.asamk.signal.manager.actions.SendSyncContactsAction;
 import org.asamk.signal.manager.actions.SendSyncGroupsAction;
 import org.asamk.signal.manager.actions.SendSyncKeysAction;
+import org.asamk.signal.manager.actions.SyncStorageDataAction;
 import org.asamk.signal.manager.actions.UpdateAccountAttributesAction;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupNotFoundException;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.manager.api.StickerPackId;
 import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.api.UntrustedIdentityException;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.GroupUtils;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.jobs.RetrieveStickerPackJob;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfoV1;
-import org.asamk.signal.manager.storage.recipients.Profile;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
-import org.asamk.signal.manager.storage.stickers.Sticker;
-import org.asamk.signal.manager.util.KeyUtils;
+import org.asamk.signal.manager.storage.stickers.StickerPack;
 import org.signal.libsignal.metadata.ProtocolInvalidKeyException;
 import org.signal.libsignal.metadata.ProtocolInvalidKeyIdException;
 import org.signal.libsignal.metadata.ProtocolInvalidMessageException;
 import org.signal.libsignal.metadata.ProtocolNoSessionException;
 import org.signal.libsignal.metadata.ProtocolUntrustedIdentityException;
 import org.signal.libsignal.metadata.SelfSendException;
-import org.signal.libsignal.protocol.SignalProtocolAddress;
+import org.signal.libsignal.protocol.InvalidMessageException;
+import org.signal.libsignal.protocol.UsePqRatchet;
+import org.signal.libsignal.protocol.groups.GroupSessionBuilder;
 import org.signal.libsignal.protocol.message.DecryptionErrorMessage;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.InvalidMessageStructureException;
+import org.whispersystems.signalservice.api.crypto.SignalGroupSessionBuilder;
+import org.whispersystems.signalservice.api.crypto.SignalServiceCipherResult;
+import org.whispersystems.signalservice.api.messages.EnvelopeContentValidator;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
+import org.whispersystems.signalservice.api.messages.SignalServiceGroupContext;
+import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
+import org.whispersystems.signalservice.api.messages.SignalServicePniSignatureMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
+import org.whispersystems.signalservice.api.messages.SignalServiceStoryMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage;
+import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.internal.push.Envelope;
+import org.whispersystems.signalservice.internal.push.UnsupportedDataMessageException;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 public final class IncomingMessageHandler {
 
-    private final static Logger logger = LoggerFactory.getLogger(IncomingMessageHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(IncomingMessageHandler.class);
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
@@ -88,12 +102,20 @@ public final class IncomingMessageHandler {
         SignalServiceContent content = null;
         if (!envelope.isReceipt()) {
             account.getIdentityKeyStore().setRetryingDecryption(true);
+            final var destination = getDestination(envelope).serviceId();
             try {
-                content = dependencies.getCipher().decrypt(envelope);
+                final var cipherResult = dependencies.getCipher(destination == null
+                                || destination.equals(account.getAci()) ? ServiceIdType.ACI : ServiceIdType.PNI)
+                        .decrypt(envelope.getProto(), envelope.getServerDeliveredTimestamp(), UsePqRatchet.NO);
+                content = validate(envelope.getProto(), cipherResult, envelope.getServerDeliveredTimestamp());
+                if (content == null) {
+                    return new Pair<>(List.of(), null);
+                }
             } catch (ProtocolUntrustedIdentityException e) {
                 final var recipientId = account.getRecipientResolver().resolveRecipient(e.getSender());
                 final var exception = new UntrustedIdentityException(account.getRecipientAddressResolver()
-                        .resolveRecipientAddress(recipientId), e.getSenderDevice());
+                        .resolveRecipientAddress(recipientId)
+                        .toApiRecipientAddress(), e.getSenderDevice());
                 return new Pair<>(List.of(), exception);
             } catch (Exception e) {
                 return new Pair<>(List.of(), e);
@@ -111,40 +133,50 @@ public final class IncomingMessageHandler {
             final Manager.ReceiveMessageHandler handler
     ) {
         final var actions = new ArrayList<HandleAction>();
-        if (envelope.hasSourceUuid()) {
-            // Store uuid if we don't have it already
-            // address/uuid in envelope is sent by server
-            account.getRecipientTrustedResolver().resolveRecipientTrusted(envelope.getSourceAddress());
-        }
         SignalServiceContent content = null;
         Exception exception = null;
+        envelope.getSourceServiceId().map(ServiceId::parseOrNull)
+                // Store uuid if we don't have it already
+                // uuid in envelope is sent by server
+                .ifPresent(serviceId -> account.getRecipientResolver().resolveRecipient(serviceId));
         if (!envelope.isReceipt()) {
+            final var destination = getDestination(envelope).serviceId();
             try {
-                content = dependencies.getCipher().decrypt(envelope);
+                final var cipherResult = dependencies.getCipher(destination == null
+                                || destination.equals(account.getAci()) ? ServiceIdType.ACI : ServiceIdType.PNI)
+                        .decrypt(envelope.getProto(), envelope.getServerDeliveredTimestamp(), UsePqRatchet.NO);
+                content = validate(envelope.getProto(), cipherResult, envelope.getServerDeliveredTimestamp());
+                if (content == null) {
+                    return new Pair<>(List.of(), null);
+                }
             } catch (ProtocolUntrustedIdentityException e) {
                 final var recipientId = account.getRecipientResolver().resolveRecipient(e.getSender());
                 actions.add(new RetrieveProfileAction(recipientId));
                 exception = new UntrustedIdentityException(account.getRecipientAddressResolver()
-                        .resolveRecipientAddress(recipientId), e.getSenderDevice());
+                        .resolveRecipientAddress(recipientId)
+                        .toApiRecipientAddress(), e.getSenderDevice());
             } catch (ProtocolInvalidKeyIdException | ProtocolInvalidKeyException | ProtocolNoSessionException |
                      ProtocolInvalidMessageException e) {
                 logger.debug("Failed to decrypt incoming message", e);
+                if (e instanceof ProtocolInvalidKeyIdException) {
+                    actions.add(RefreshPreKeysAction.create());
+                }
                 final var sender = account.getRecipientResolver().resolveRecipient(e.getSender());
                 if (context.getContactHelper().isContactBlocked(sender)) {
                     logger.debug("Received invalid message from blocked contact, ignoring.");
                 } else {
-                    final var senderProfile = context.getProfileHelper().getRecipientProfile(sender);
-                    final var selfProfile = context.getProfileHelper().getSelfProfile();
-                    if ((!sender.equals(account.getSelfRecipientId()) || e.getSenderDevice() != account.getDeviceId())
-                            && senderProfile != null
-                            && senderProfile.getCapabilities().contains(Profile.Capability.senderKey)
-                            && selfProfile != null
-                            && selfProfile.getCapabilities().contains(Profile.Capability.senderKey)) {
-                        logger.debug("Received invalid message, requesting message resend.");
-                        actions.add(new SendRetryMessageRequestAction(sender, e, envelope));
-                    } else {
+                    var serviceId = ServiceId.parseOrNull(e.getSender());
+                    if (serviceId != null) {
+                        final var isSelf = sender.equals(account.getSelfRecipientId())
+                                && e.getSenderDevice() == account.getDeviceId();
                         logger.debug("Received invalid message, queuing renew session action.");
-                        actions.add(new RenewSessionAction(sender));
+                        actions.add(new RenewSessionAction(sender, serviceId, destination));
+                        if (!isSelf) {
+                            logger.debug("Received invalid message, requesting message resend.");
+                            actions.add(new SendRetryMessageRequestAction(sender, e, envelope));
+                        }
+                    } else {
+                        logger.debug("Received invalid message from invalid sender: {}", e.getSender());
                     }
                 }
                 exception = e;
@@ -161,6 +193,34 @@ public final class IncomingMessageHandler {
         return new Pair<>(actions, exception);
     }
 
+    private SignalServiceContent validate(
+            Envelope envelope,
+            SignalServiceCipherResult cipherResult,
+            long serverDeliveredTimestamp
+    ) throws ProtocolInvalidKeyException, ProtocolInvalidMessageException, UnsupportedDataMessageException, InvalidMessageStructureException {
+        final var content = cipherResult.getContent();
+        final var envelopeMetadata = cipherResult.getMetadata();
+        final var validationResult = EnvelopeContentValidator.INSTANCE.validate(envelope, content, account.getAci());
+
+        if (validationResult instanceof EnvelopeContentValidator.Result.Invalid v) {
+            logger.warn("Invalid content! {}", v.getReason(), v.getThrowable());
+            return null;
+        }
+
+        if (validationResult instanceof EnvelopeContentValidator.Result.UnsupportedDataMessage v) {
+            logger.warn("Unsupported DataMessage! Our version: {}, their version: {}",
+                    v.getOurVersion(),
+                    v.getTheirVersion());
+            return null;
+        }
+
+        return SignalServiceContent.Companion.createFrom(account.getNumber(),
+                envelope,
+                envelopeMetadata,
+                content,
+                serverDeliveredTimestamp);
+    }
+
     private List<HandleAction> checkAndHandleMessage(
             final SignalServiceEnvelope envelope,
             final SignalServiceContent content,
@@ -168,24 +228,44 @@ public final class IncomingMessageHandler {
             final Manager.ReceiveMessageHandler handler,
             final Exception exception
     ) {
-        if (!envelope.hasSourceUuid() && content != null) {
+        if (content != null) {
             // Store uuid if we don't have it already
             // address/uuid is validated by unidentified sender certificate
-            account.getRecipientTrustedResolver().resolveRecipientTrusted(content.getSender());
+
+            boolean handledPniSignature = false;
+            if (content.getPniSignatureMessage().isPresent()) {
+                final var message = content.getPniSignatureMessage().get();
+                final var senderAddress = getSenderAddress(envelope, content);
+                if (senderAddress != null) {
+                    handledPniSignature = handlePniSignatureMessage(message, senderAddress);
+                }
+            }
+            if (!handledPniSignature) {
+                account.getRecipientTrustedResolver().resolveRecipientTrusted(content.getSender());
+            }
         }
         if (envelope.isReceipt()) {
-            final var senderPair = getSender(envelope, content);
-            final var sender = senderPair.first();
-            final var senderDeviceId = senderPair.second();
+            final var senderDeviceAddress = getSender(envelope, content);
+            final var sender = senderDeviceAddress.serviceId();
+            final var senderDeviceId = senderDeviceAddress.deviceId();
             account.getMessageSendLogStore().deleteEntryForRecipient(envelope.getTimestamp(), sender, senderDeviceId);
         }
 
+        var notAllowedToSendToGroup = isNotAllowedToSendToGroup(envelope, content);
+        final var groupContext = getGroupContext(content);
+        if (groupContext != null && groupContext.getGroupV2().isPresent()) {
+            handleGroupV2Context(groupContext.getGroupV2().get());
+        }
+        // Check again in case the user just joined the group
+        notAllowedToSendToGroup = notAllowedToSendToGroup && isNotAllowedToSendToGroup(envelope, content);
+
         if (isMessageBlocked(envelope, content)) {
             logger.info("Ignoring a message from blocked user/group: {}", envelope.getTimestamp());
             return List.of();
-        } else if (isNotAllowedToSendToGroup(envelope, content)) {
+        } else if (notAllowedToSendToGroup) {
+            final var senderAddress = getSenderAddress(envelope, content);
             logger.info("Ignoring a group message from an unauthorized sender (no member or admin): {} {}",
-                    (envelope.hasSourceUuid() ? envelope.getSourceAddress() : content.getSender()).getIdentifier(),
+                    senderAddress == null ? null : senderAddress.getIdentifier(),
                     envelope.getTimestamp());
             return List.of();
         } else {
@@ -206,30 +286,39 @@ public final class IncomingMessageHandler {
     }
 
     public List<HandleAction> handleMessage(
-            SignalServiceEnvelope envelope, SignalServiceContent content, ReceiveConfig receiveConfig
+            SignalServiceEnvelope envelope,
+            SignalServiceContent content,
+            ReceiveConfig receiveConfig
     ) {
         var actions = new ArrayList<HandleAction>();
-        final var senderPair = getSender(envelope, content);
-        final var sender = senderPair.first();
-        final var senderDeviceId = senderPair.second();
+        final var senderDeviceAddress = getSender(envelope, content);
+        final var sender = senderDeviceAddress.recipientId();
+        final var senderServiceId = senderDeviceAddress.serviceId();
+        final var senderDeviceId = senderDeviceAddress.deviceId();
+        final var destination = getDestination(envelope);
+
+        if (account.getPni().equals(destination.serviceId)) {
+            account.getRecipientStore().markNeedsPniSignature(destination.recipientId, true);
+        } else if (account.getAci().equals(destination.serviceId)) {
+            account.getRecipientStore().markNeedsPniSignature(destination.recipientId, false);
+        }
 
         if (content.getReceiptMessage().isPresent()) {
             final var message = content.getReceiptMessage().get();
             if (message.isDeliveryReceipt()) {
                 account.getMessageSendLogStore()
-                        .deleteEntriesForRecipient(message.getTimestamps(), sender, senderDeviceId);
+                        .deleteEntriesForRecipient(message.getTimestamps(), senderServiceId, senderDeviceId);
             }
         }
 
         if (content.getSenderKeyDistributionMessage().isPresent()) {
             final var message = content.getSenderKeyDistributionMessage().get();
-            final var protocolAddress = new SignalProtocolAddress(context.getRecipientHelper()
-                    .resolveSignalServiceAddress(sender)
-                    .getIdentifier(), senderDeviceId);
+            final var protocolAddress = senderServiceId.toProtocolAddress(senderDeviceId);
             logger.debug("Received a sender key distribution message for distributionId {} from {}",
                     message.getDistributionId(),
                     protocolAddress);
-            dependencies.getMessageSender().processSenderKeyDistributionMessage(protocolAddress, message);
+            new SignalGroupSessionBuilder(dependencies.getSessionLock(),
+                    new GroupSessionBuilder(account.getSenderKeyStore())).process(protocolAddress, message);
         }
 
         if (content.getDecryptionErrorMessage().isPresent()) {
@@ -239,14 +328,21 @@ public final class IncomingMessageHandler {
                     senderDeviceId,
                     message.getTimestamp());
             if (message.getDeviceId() == account.getDeviceId()) {
-                handleDecryptionErrorMessage(actions, sender, senderDeviceId, message);
+                handleDecryptionErrorMessage(actions,
+                        sender,
+                        senderServiceId,
+                        senderDeviceId,
+                        message,
+                        destination.serviceId());
             } else {
                 logger.debug("Request is for another one of our devices");
             }
         }
 
-        if (content.getDataMessage().isPresent()) {
-            var message = content.getDataMessage().get();
+        if (content.getDataMessage().isPresent() || content.getEditMessage().isPresent()) {
+            var message = content.getDataMessage().isPresent()
+                    ? content.getDataMessage().get()
+                    : content.getEditMessage().get().getDataMessage();
 
             if (content.isNeedsReceipt()) {
                 actions.add(new SendReceiptAction(sender,
@@ -255,7 +351,10 @@ public final class IncomingMessageHandler {
             } else {
                 // Message wasn't sent as unidentified sender message
                 final var contact = context.getAccount().getContactStore().getContact(sender);
-                if (contact != null && !contact.isBlocked() && contact.isProfileSharingEnabled()) {
+                if (account.isPrimaryDevice()
+                        && contact != null
+                        && !contact.isBlocked()
+                        && contact.isProfileSharingEnabled()) {
                     actions.add(UpdateAccountAttributesAction.create());
                     actions.add(new SendProfileKeyAction(sender));
                 }
@@ -268,40 +367,83 @@ public final class IncomingMessageHandler {
 
             actions.addAll(handleSignalServiceDataMessage(message,
                     false,
-                    sender,
-                    account.getSelfRecipientId(),
+                    senderDeviceAddress,
+                    destination,
                     receiveConfig.ignoreAttachments()));
         }
 
+        if (content.getStoryMessage().isPresent()) {
+            final var message = content.getStoryMessage().get();
+            actions.addAll(handleSignalServiceStoryMessage(message, sender, receiveConfig.ignoreAttachments()));
+        }
+
         if (content.getSyncMessage().isPresent()) {
             var syncMessage = content.getSyncMessage().get();
-            actions.addAll(handleSyncMessage(syncMessage, sender, receiveConfig.ignoreAttachments()));
+            actions.addAll(handleSyncMessage(envelope,
+                    syncMessage,
+                    senderDeviceAddress,
+                    receiveConfig.ignoreAttachments()));
         }
 
         return actions;
     }
 
+    private boolean handlePniSignatureMessage(
+            final SignalServicePniSignatureMessage message,
+            final SignalServiceAddress senderAddress
+    ) {
+        final var aci = senderAddress.getServiceId();
+        final var aciIdentity = account.getIdentityKeyStore().getIdentityInfo(aci);
+        final var pni = message.getPni();
+        final var pniIdentity = account.getIdentityKeyStore().getIdentityInfo(pni);
+
+        if (aciIdentity == null || pniIdentity == null || aci.equals(pni)) {
+            return false;
+        }
+
+        final var verified = pniIdentity.getIdentityKey()
+                .verifyAlternateIdentity(aciIdentity.getIdentityKey(), message.getSignature());
+
+        if (!verified) {
+            logger.debug("Invalid PNI signature of ACI {} with PNI {}", aci, pni);
+            return false;
+        }
+
+        logger.debug("Verified association of ACI {} with PNI {}", aci, pni);
+        account.getRecipientTrustedResolver()
+                .resolveRecipientTrusted(Optional.of(ACI.from(aci.getRawUuid())),
+                        Optional.of(pni),
+                        senderAddress.getNumber());
+        return true;
+    }
+
     private void handleDecryptionErrorMessage(
             final List<HandleAction> actions,
             final RecipientId sender,
+            final ServiceId senderServiceId,
             final int senderDeviceId,
-            final DecryptionErrorMessage message
+            final DecryptionErrorMessage message,
+            final ServiceId destination
     ) {
         final var logEntries = account.getMessageSendLogStore()
-                .findMessages(sender, senderDeviceId, message.getTimestamp(), message.getRatchetKey().isEmpty());
+                .findMessages(senderServiceId,
+                        senderDeviceId,
+                        message.getTimestamp(),
+                        message.getRatchetKey().isEmpty());
 
         for (final var logEntry : logEntries) {
             actions.add(new ResendMessageAction(sender, message.getTimestamp(), logEntry));
         }
 
         if (message.getRatchetKey().isPresent()) {
-            if (account.getSessionStore().isCurrentRatchetKey(sender, senderDeviceId, message.getRatchetKey().get())) {
+            final var sessionStore = account.getAccountData(destination).getSessionStore();
+            if (sessionStore.isCurrentRatchetKey(senderServiceId, senderDeviceId, message.getRatchetKey().get())) {
                 if (logEntries.isEmpty()) {
                     logger.debug("Renewing the session with sender");
-                    actions.add(new RenewSessionAction(sender));
+                    actions.add(new RenewSessionAction(sender, senderServiceId, destination));
                 } else {
                     logger.trace("Archiving the session with sender, a resend message has already been queued");
-                    context.getAccount().getSessionStore().archiveSessions(sender);
+                    sessionStore.archiveSessions(senderServiceId);
                 }
             }
             return;
@@ -321,16 +463,19 @@ public final class IncomingMessageHandler {
                     sender,
                     senderDeviceId,
                     group.getDistributionId());
-            account.getSenderKeyStore().deleteSharedWith(sender, senderDeviceId, group.getDistributionId());
+            account.getSenderKeyStore().deleteSharedWith(senderServiceId, senderDeviceId, group.getDistributionId());
         }
         if (!found) {
             logger.debug("Reset all shared sender keys with this recipient, no related message found in send log");
-            account.getSenderKeyStore().deleteSharedWith(sender);
+            account.getSenderKeyStore().deleteSharedWith(senderServiceId);
         }
     }
 
     private List<HandleAction> handleSyncMessage(
-            final SignalServiceSyncMessage syncMessage, final RecipientId sender, final boolean ignoreAttachments
+            final SignalServiceEnvelope envelope,
+            final SignalServiceSyncMessage syncMessage,
+            final DeviceAddress sender,
+            final boolean ignoreAttachments
     ) {
         var actions = new ArrayList<HandleAction>();
         account.setMultiDevice(true);
@@ -341,7 +486,16 @@ public final class IncomingMessageHandler {
                 actions.addAll(handleSignalServiceDataMessage(message.getDataMessage().get(),
                         true,
                         sender,
-                        destination == null ? null : context.getRecipientHelper().resolveRecipient(destination),
+                        destination == null
+                                ? null
+                                : new DeviceAddress(account.getRecipientResolver().resolveRecipient(destination),
+                                        destination.getServiceId(),
+                                        0),
+                        ignoreAttachments));
+            }
+            if (message.getStoryMessage().isPresent()) {
+                actions.addAll(handleSignalServiceStoryMessage(message.getStoryMessage().get(),
+                        sender.recipientId(),
                         ignoreAttachments));
             }
         }
@@ -362,21 +516,25 @@ public final class IncomingMessageHandler {
             if (rm.isConfigurationRequest()) {
                 actions.add(SendSyncConfigurationAction.create());
             }
-            if (rm.isPniIdentityRequest()) {
-                actions.add(SendPniIdentityKeyAction.create());
-            }
+            actions.add(SyncStorageDataAction.create());
         }
         if (syncMessage.getGroups().isPresent()) {
-            logger.warn("Received a group v1 sync message, that can't be handled anymore, ignoring.");
+            try {
+                final var groupsMessage = syncMessage.getGroups().get();
+                context.getAttachmentHelper()
+                        .retrieveAttachment(groupsMessage, context.getSyncHelper()::handleSyncDeviceGroups);
+            } catch (Exception e) {
+                logger.warn("Failed to handle received sync groups, ignoring: {}", e.getMessage());
+            }
         }
         if (syncMessage.getBlockedList().isPresent()) {
             final var blockedListMessage = syncMessage.getBlockedList().get();
-            for (var address : blockedListMessage.getAddresses()) {
-                context.getContactHelper()
-                        .setContactBlocked(context.getRecipientHelper().resolveRecipient(address), true);
+            for (var individual : blockedListMessage.individuals) {
+                final var address = new RecipientAddress(individual.getAci(), individual.getE164());
+                final var recipientId = account.getRecipientResolver().resolveRecipient(address);
+                context.getContactHelper().setContactBlocked(recipientId, true);
             }
-            for (var groupId : blockedListMessage.getGroupIds()
-                    .stream()
+            for (var groupId : blockedListMessage.groupIds.stream()
                     .map(GroupId::unknownVersion)
                     .collect(Collectors.toSet())) {
                 try {
@@ -400,8 +558,7 @@ public final class IncomingMessageHandler {
         if (syncMessage.getVerified().isPresent()) {
             final var verifiedMessage = syncMessage.getVerified().get();
             account.getIdentityKeyStore()
-                    .setIdentityTrustLevel(account.getRecipientTrustedResolver()
-                                    .resolveRecipientTrusted(verifiedMessage.getDestination()),
+                    .setIdentityTrustLevel(verifiedMessage.getDestination().getServiceId(),
                             verifiedMessage.getIdentityKey(),
                             TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));
         }
@@ -412,40 +569,43 @@ public final class IncomingMessageHandler {
                     continue;
                 }
                 final var stickerPackId = StickerPackId.deserialize(m.getPackId().get());
+                final var stickerPackKey = m.getPackKey().orElse(null);
                 final var installed = m.getType().isEmpty()
                         || m.getType().get() == StickerPackOperationMessage.Type.INSTALL;
 
-                var sticker = account.getStickerStore().getStickerPack(stickerPackId);
-                if (m.getPackKey().isPresent()) {
-                    if (sticker == null) {
-                        sticker = new Sticker(stickerPackId, m.getPackKey().get());
-                    }
-                    if (installed) {
-                        context.getJobExecutor()
-                                .enqueueJob(new RetrieveStickerPackJob(stickerPackId, m.getPackKey().get()));
-                    }
-                }
+                final var sticker = context.getStickerHelper()
+                        .addOrUpdateStickerPack(stickerPackId, stickerPackKey, installed);
 
-                if (sticker != null) {
-                    sticker.setInstalled(installed);
-                    account.getStickerStore().updateSticker(sticker);
+                if (sticker != null && installed) {
+                    context.getJobExecutor().enqueueJob(new RetrieveStickerPackJob(stickerPackId, sticker.packKey()));
                 }
             }
         }
         if (syncMessage.getFetchType().isPresent()) {
             switch (syncMessage.getFetchType().get()) {
-                case LOCAL_PROFILE:
-                    actions.add(new RetrieveProfileAction(account.getSelfRecipientId()));
-                case STORAGE_MANIFEST:
-                    actions.add(RetrieveStorageDataAction.create());
+                case LOCAL_PROFILE -> actions.add(new RetrieveProfileAction(account.getSelfRecipientId()));
+                case STORAGE_MANIFEST -> actions.add(SyncStorageDataAction.create());
             }
         }
         if (syncMessage.getKeys().isPresent()) {
             final var keysMessage = syncMessage.getKeys().get();
-            if (keysMessage.getStorageService().isPresent()) {
-                final var storageKey = keysMessage.getStorageService().get();
+            if (keysMessage.getAccountEntropyPool() != null) {
+                final var aep = keysMessage.getAccountEntropyPool();
+                account.setAccountEntropyPool(aep);
+                actions.add(SyncStorageDataAction.create());
+            } else if (keysMessage.getMaster() != null) {
+                final var masterKey = keysMessage.getMaster();
+                account.setMasterKey(masterKey);
+                actions.add(SyncStorageDataAction.create());
+            } else if (keysMessage.getStorageService() != null) {
+                final var storageKey = keysMessage.getStorageService();
                 account.setStorageKey(storageKey);
-                actions.add(RetrieveStorageDataAction.create());
+                actions.add(SyncStorageDataAction.create());
+            }
+            if (keysMessage.getMediaRootBackupKey() != null) {
+                final var mrb = keysMessage.getMediaRootBackupKey();
+                account.setMediaRootBackupKey(mrb);
+                actions.add(SyncStorageDataAction.create());
             }
         }
         if (syncMessage.getConfiguration().isPresent()) {
@@ -465,82 +625,101 @@ public final class IncomingMessageHandler {
                         .get());
             }
         }
-        if (syncMessage.getPniIdentity().isPresent()) {
-            final var pniIdentity = syncMessage.getPniIdentity().get();
-            account.setPniIdentityKeyPair(KeyUtils.getIdentityKeyPair(pniIdentity.getPublicKey().toByteArray(),
-                    pniIdentity.getPrivateKey().toByteArray()));
-            actions.add(RefreshPreKeysAction.create());
+        if (syncMessage.getPniChangeNumber().isPresent()) {
+            final var pniChangeNumber = syncMessage.getPniChangeNumber().get();
+            logger.debug("Received PNI change number sync message, applying.");
+            final var updatedPniString = envelope.getUpdatedPni();
+            if (updatedPniString != null && !updatedPniString.isEmpty()) {
+                final var updatedPni = ServiceId.PNI.parseOrThrow(updatedPniString);
+                context.getAccountHelper().handlePniChangeNumberMessage(pniChangeNumber, updatedPni);
+            }
         }
         return actions;
     }
 
+    private SignalServiceGroupContext getGroupContext(SignalServiceContent content) {
+        if (content == null) {
+            return null;
+        }
+
+        if (content.getDataMessage().isPresent()) {
+            var message = content.getDataMessage().get();
+            if (message.getGroupContext().isPresent()) {
+                return message.getGroupContext().get();
+            }
+        }
+
+        if (content.getStoryMessage().isPresent()) {
+            var message = content.getStoryMessage().get();
+            if (message.getGroupContext().isPresent()) {
+                try {
+                    return SignalServiceGroupContext.create(null, message.getGroupContext().get());
+                } catch (InvalidMessageException e) {
+                    throw new AssertionError(e);
+                }
+            }
+        }
+
+        return null;
+    }
+
     private boolean isMessageBlocked(SignalServiceEnvelope envelope, SignalServiceContent content) {
-        SignalServiceAddress source;
-        if (!envelope.isUnidentifiedSender() && envelope.hasSourceUuid()) {
-            source = envelope.getSourceAddress();
-        } else if (content != null) {
-            source = content.getSender();
-        } else {
+        SignalServiceAddress source = getSenderAddress(envelope, content);
+        if (source == null) {
             return false;
         }
-        final var recipientId = context.getRecipientHelper().resolveRecipient(source);
+        final var recipientId = account.getRecipientResolver().resolveRecipient(source);
         if (context.getContactHelper().isContactBlocked(recipientId)) {
             return true;
         }
 
-        if (content != null && content.getDataMessage().isPresent()) {
-            var message = content.getDataMessage().get();
-            if (message.getGroupContext().isPresent()) {
-                var groupId = GroupUtils.getGroupId(message.getGroupContext().get());
-                return context.getGroupHelper().isGroupBlocked(groupId);
-            }
+        final var groupContext = getGroupContext(content);
+        if (groupContext != null) {
+            var groupId = GroupUtils.getGroupId(groupContext);
+            return context.getGroupHelper().isGroupBlocked(groupId);
         }
 
         return false;
     }
 
     private boolean isNotAllowedToSendToGroup(SignalServiceEnvelope envelope, SignalServiceContent content) {
-        SignalServiceAddress source;
-        if (!envelope.isUnidentifiedSender() && envelope.hasSourceUuid()) {
-            source = envelope.getSourceAddress();
-        } else if (content != null) {
-            source = content.getSender();
-        } else {
+        SignalServiceAddress source = getSenderAddress(envelope, content);
+        if (source == null) {
             return false;
         }
 
-        if (content == null || content.getDataMessage().isEmpty()) {
+        final var groupContext = getGroupContext(content);
+        if (groupContext == null) {
             return false;
         }
 
-        var message = content.getDataMessage().get();
-        if (message.getGroupContext().isEmpty()) {
-            return false;
-        }
-
-        if (message.getGroupContext().get().getGroupV1().isPresent()) {
-            var groupInfo = message.getGroupContext().get().getGroupV1().get();
+        if (groupContext.getGroupV1().isPresent()) {
+            var groupInfo = groupContext.getGroupV1().get();
             if (groupInfo.getType() == SignalServiceGroup.Type.QUIT) {
                 return false;
             }
         }
 
-        var groupId = GroupUtils.getGroupId(message.getGroupContext().get());
+        var groupId = GroupUtils.getGroupId(groupContext);
         var group = context.getGroupHelper().getGroup(groupId);
         if (group == null) {
             return false;
         }
 
-        final var recipientId = context.getRecipientHelper().resolveRecipient(source);
-        if (!group.isMember(recipientId) && !(group.isPendingMember(recipientId) && message.isGroupV2Update())) {
+        final var message = content.getDataMessage().orElse(null);
+
+        final var recipientId = account.getRecipientResolver().resolveRecipient(source);
+        if (!group.isMember(recipientId) && !(
+                group.isPendingMember(recipientId) && message != null && message.isGroupV2Update()
+        )) {
             return true;
         }
 
         if (group.isAnnouncementGroup() && !group.isAdmin(recipientId)) {
-            return message.getBody().isPresent()
+            return message == null
+                    || message.getBody().isPresent()
                     || message.getAttachments().isPresent()
-                    || message.getQuote()
-                    .isPresent()
+                    || message.getQuote().isPresent()
                     || message.getPreviews().isPresent()
                     || message.getMentions().isPresent()
                     || message.getSticker().isPresent();
@@ -551,20 +730,21 @@ public final class IncomingMessageHandler {
     private List<HandleAction> handleSignalServiceDataMessage(
             SignalServiceDataMessage message,
             boolean isSync,
-            RecipientId source,
-            RecipientId destination,
+            DeviceAddress source,
+            DeviceAddress destination,
             boolean ignoreAttachments
     ) {
         var actions = new ArrayList<HandleAction>();
         if (message.getGroupContext().isPresent()) {
-            if (message.getGroupContext().get().getGroupV1().isPresent()) {
-                var groupInfo = message.getGroupContext().get().getGroupV1().get();
+            final var groupContext = message.getGroupContext().get();
+            if (groupContext.getGroupV1().isPresent()) {
+                var groupInfo = groupContext.getGroupV1().get();
                 var groupId = GroupId.v1(groupInfo.getGroupId());
                 var group = context.getGroupHelper().getGroup(groupId);
                 if (group == null || group instanceof GroupInfoV1) {
                     var groupV1 = (GroupInfoV1) group;
                     switch (groupInfo.getType()) {
-                        case UPDATE: {
+                        case UPDATE -> {
                             if (groupV1 == null) {
                                 groupV1 = new GroupInfoV1(groupId);
                             }
@@ -579,57 +759,54 @@ public final class IncomingMessageHandler {
                             }
 
                             if (groupInfo.getMembers().isPresent()) {
+                                final var recipientResolver = account.getRecipientResolver();
                                 groupV1.addMembers(groupInfo.getMembers()
                                         .get()
                                         .stream()
-                                        .map(context.getRecipientHelper()::resolveRecipient)
+                                        .map(recipientResolver::resolveRecipient)
                                         .collect(Collectors.toSet()));
                             }
 
                             account.getGroupStore().updateGroup(groupV1);
-                            break;
                         }
-                        case DELIVER:
+                        case DELIVER -> {
                             if (groupV1 == null && !isSync) {
-                                actions.add(new SendGroupInfoRequestAction(source, groupId));
+                                actions.add(new SendGroupInfoRequestAction(source.recipientId(), groupId));
                             }
-                            break;
-                        case QUIT: {
+                        }
+                        case QUIT -> {
                             if (groupV1 != null) {
-                                groupV1.removeMember(source);
+                                groupV1.removeMember(source.recipientId());
                                 account.getGroupStore().updateGroup(groupV1);
                             }
-                            break;
                         }
-                        case REQUEST_INFO:
+                        case REQUEST_INFO -> {
                             if (groupV1 != null && !isSync) {
-                                actions.add(new SendGroupInfoAction(source, groupV1.getGroupId()));
+                                actions.add(new SendGroupInfoAction(source.recipientId(), groupV1.getGroupId()));
                             }
-                            break;
+                        }
                     }
                 } else {
                     // Received a group v1 message for a v2 group
                 }
             }
-            if (message.getGroupContext().get().getGroupV2().isPresent()) {
-                final var groupContext = message.getGroupContext().get().getGroupV2().get();
-                final var groupMasterKey = groupContext.getMasterKey();
-
-                context.getGroupHelper()
-                        .getOrMigrateGroup(groupMasterKey,
-                                groupContext.getRevision(),
-                                groupContext.hasSignedGroupChange() ? groupContext.getSignedGroupChange() : null);
+            if (groupContext.getGroupV2().isPresent()) {
+                handleGroupV2Context(groupContext.getGroupV2().get());
             }
         }
 
+        final var selfAddress = isSync ? source : destination;
         final var conversationPartnerAddress = isSync ? destination : source;
         if (conversationPartnerAddress != null && message.isEndSession()) {
-            account.getSessionStore().deleteAllSessions(conversationPartnerAddress);
+            account.getAccountData(selfAddress.serviceId())
+                    .getSessionStore()
+                    .deleteAllSessions(conversationPartnerAddress.serviceId());
         }
         if (message.isExpirationUpdate() || message.getBody().isPresent()) {
             if (message.getGroupContext().isPresent()) {
-                if (message.getGroupContext().get().getGroupV1().isPresent()) {
-                    var groupInfo = message.getGroupContext().get().getGroupV1().get();
+                final var groupContext = message.getGroupContext().get();
+                if (groupContext.getGroupV1().isPresent()) {
+                    var groupInfo = groupContext.getGroupV1().get();
                     var group = account.getGroupStore().getOrCreateGroupV1(GroupId.v1(groupInfo.getGroupId()));
                     if (group != null) {
                         if (group.messageExpirationTime != message.getExpiresInSeconds()) {
@@ -637,12 +814,14 @@ public final class IncomingMessageHandler {
                             account.getGroupStore().updateGroup(group);
                         }
                     }
-                } else if (message.getGroupContext().get().getGroupV2().isPresent()) {
+                } else if (groupContext.getGroupV2().isPresent()) {
                     // disappearing message timer already stored in the DecryptedGroup
                 }
             } else if (conversationPartnerAddress != null) {
                 context.getContactHelper()
-                        .setExpirationTimer(conversationPartnerAddress, message.getExpiresInSeconds());
+                        .setExpirationTimer(conversationPartnerAddress.recipientId(),
+                                message.getExpiresInSeconds(),
+                                message.getExpireTimerVersion());
             }
         }
         if (!ignoreAttachments) {
@@ -669,46 +848,130 @@ public final class IncomingMessageHandler {
             if (message.getQuote().isPresent()) {
                 final var quote = message.getQuote().get();
 
-                for (var quotedAttachment : quote.getAttachments()) {
-                    final var thumbnail = quotedAttachment.getThumbnail();
-                    if (thumbnail != null) {
-                        context.getAttachmentHelper().downloadAttachment(thumbnail);
+                if (quote.getAttachments() != null) {
+                    for (var quotedAttachment : quote.getAttachments()) {
+                        final var thumbnail = quotedAttachment.getThumbnail();
+                        if (thumbnail != null) {
+                            context.getAttachmentHelper().downloadAttachment(thumbnail);
+                        }
                     }
                 }
             }
         }
-        if (message.getProfileKey().isPresent() && message.getProfileKey().get().length == 32) {
-            final ProfileKey profileKey;
-            try {
-                profileKey = new ProfileKey(message.getProfileKey().get());
-            } catch (InvalidInputException e) {
-                throw new AssertionError(e);
-            }
-            if (account.getSelfRecipientId().equals(source)) {
-                this.account.setProfileKey(profileKey);
-            }
-            this.account.getProfileStore().storeProfileKey(source, profileKey);
+        if (message.getGiftBadge().isPresent()) {
+            handleIncomingGiftBadge(message.getGiftBadge().get());
+        }
+        if (message.getProfileKey().isPresent()) {
+            handleIncomingProfileKey(message.getProfileKey().get(), source.recipientId());
         }
         if (message.getSticker().isPresent()) {
             final var messageSticker = message.getSticker().get();
             final var stickerPackId = StickerPackId.deserialize(messageSticker.getPackId());
             var sticker = account.getStickerStore().getStickerPack(stickerPackId);
             if (sticker == null) {
-                sticker = new Sticker(stickerPackId, messageSticker.getPackKey());
-                account.getStickerStore().updateSticker(sticker);
+                sticker = new StickerPack(stickerPackId, messageSticker.getPackKey());
+                account.getStickerStore().addStickerPack(sticker);
             }
             context.getJobExecutor().enqueueJob(new RetrieveStickerPackJob(stickerPackId, messageSticker.getPackKey()));
         }
         return actions;
     }
 
-    private Pair<RecipientId, Integer> getSender(SignalServiceEnvelope envelope, SignalServiceContent content) {
-        if (!envelope.isUnidentifiedSender() && envelope.hasSourceUuid()) {
-            return new Pair<>(context.getRecipientHelper().resolveRecipient(envelope.getSourceAddress()),
+    private void handleIncomingGiftBadge(final SignalServiceDataMessage.GiftBadge giftBadge) {
+        // TODO
+    }
+
+    private List<HandleAction> handleSignalServiceStoryMessage(
+            SignalServiceStoryMessage message,
+            RecipientId source,
+            boolean ignoreAttachments
+    ) {
+        var actions = new ArrayList<HandleAction>();
+        if (message.getGroupContext().isPresent()) {
+            handleGroupV2Context(message.getGroupContext().get());
+        }
+
+        if (!ignoreAttachments) {
+            if (message.getFileAttachment().isPresent()) {
+                context.getAttachmentHelper().downloadAttachment(message.getFileAttachment().get());
+            }
+            if (message.getTextAttachment().isPresent()) {
+                final var textAttachment = message.getTextAttachment().get();
+                if (textAttachment.getPreview().isPresent()) {
+                    final var preview = textAttachment.getPreview().get();
+                    if (preview.getImage().isPresent()) {
+                        context.getAttachmentHelper().downloadAttachment(preview.getImage().get());
+                    }
+                }
+            }
+        }
+
+        if (message.getProfileKey().isPresent()) {
+            handleIncomingProfileKey(message.getProfileKey().get(), source);
+        }
+
+        return actions;
+    }
+
+    private void handleGroupV2Context(final SignalServiceGroupV2 groupContext) {
+        final var groupMasterKey = groupContext.getMasterKey();
+
+        context.getGroupHelper()
+                .getOrMigrateGroup(groupMasterKey,
+                        groupContext.getRevision(),
+                        groupContext.hasSignedGroupChange() ? groupContext.getSignedGroupChange() : null);
+    }
+
+    private void handleIncomingProfileKey(final byte[] profileKeyBytes, final RecipientId source) {
+        if (profileKeyBytes.length != 32) {
+            logger.debug("Received invalid profile key of length {}", profileKeyBytes.length);
+            return;
+        }
+        final ProfileKey profileKey;
+        try {
+            profileKey = new ProfileKey(profileKeyBytes);
+        } catch (InvalidInputException e) {
+            throw new AssertionError(e);
+        }
+        if (account.getSelfRecipientId().equals(source)) {
+            this.account.setProfileKey(profileKey);
+        }
+        this.account.getProfileStore().storeProfileKey(source, profileKey);
+    }
+
+    private SignalServiceAddress getSenderAddress(SignalServiceEnvelope envelope, SignalServiceContent content) {
+        final var serviceId = envelope.getSourceServiceId().map(ServiceId::parseOrNull).orElse(null);
+        if (!envelope.isUnidentifiedSender() && serviceId != null) {
+            return new SignalServiceAddress(serviceId);
+        } else if (content != null) {
+            return content.getSender();
+        } else {
+            return null;
+        }
+    }
+
+    private DeviceAddress getSender(SignalServiceEnvelope envelope, SignalServiceContent content) {
+        final var serviceId = envelope.getSourceServiceId().map(ServiceId::parseOrNull).orElse(null);
+        if (!envelope.isUnidentifiedSender() && serviceId != null) {
+            return new DeviceAddress(account.getRecipientResolver().resolveRecipient(serviceId),
+                    serviceId,
                     envelope.getSourceDevice());
         } else {
-            return new Pair<>(context.getRecipientHelper().resolveRecipient(content.getSender()),
+            return new DeviceAddress(account.getRecipientResolver().resolveRecipient(content.getSender()),
+                    content.getSender().getServiceId(),
                     content.getSenderDevice());
         }
     }
+
+    private DeviceAddress getDestination(SignalServiceEnvelope envelope) {
+        final var destination = envelope.getDestinationServiceId();
+        if (destination == null || destination.isUnknown()) {
+            return new DeviceAddress(account.getSelfRecipientId(), account.getAci(), account.getDeviceId());
+        }
+        return new DeviceAddress(account.getRecipientResolver().resolveRecipient(destination),
+                destination,
+                account.getDeviceId());
+    }
+
+    private record DeviceAddress(RecipientId recipientId, ServiceId serviceId, int deviceId) {}
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
index 4ebc4d05..40878647 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
@@ -1,103 +1,132 @@
 package org.asamk.signal.manager.helper;
 
 import org.asamk.signal.manager.api.IncorrectPinException;
-import org.asamk.signal.manager.util.PinHashing;
-import org.signal.libsignal.protocol.InvalidKeyException;
-import org.whispersystems.signalservice.api.KbsPinData;
-import org.whispersystems.signalservice.api.KeyBackupService;
-import org.whispersystems.signalservice.api.KeyBackupServicePinException;
-import org.whispersystems.signalservice.api.KeyBackupSystemNoDataException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
-import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
-import org.whispersystems.signalservice.internal.contacts.entities.TokenResponse;
+import org.whispersystems.signalservice.api.svr.SecureValueRecovery;
+import org.whispersystems.signalservice.internal.push.AuthCredentials;
 import org.whispersystems.signalservice.internal.push.LockedException;
 
 import java.io.IOException;
+import java.util.List;
 
 public class PinHelper {
 
-    private final KeyBackupService keyBackupService;
+    private static final Logger logger = LoggerFactory.getLogger(PinHelper.class);
 
-    public PinHelper(final KeyBackupService keyBackupService) {
-        this.keyBackupService = keyBackupService;
+    private final List<SecureValueRecovery> secureValueRecoveries;
+
+    public PinHelper(final List<SecureValueRecovery> secureValueRecoveries) {
+        this.secureValueRecoveries = secureValueRecoveries;
     }
 
-    public void setRegistrationLockPin(
-            String pin, MasterKey masterKey
-    ) throws IOException {
-        final var pinChangeSession = keyBackupService.newPinChangeSession();
-        final var hashedPin = PinHashing.hashPin(pin, pinChangeSession);
-
-        try {
-            pinChangeSession.setPin(hashedPin, masterKey);
-        } catch (UnauthenticatedResponseException e) {
-            throw new IOException(e);
+    public void setRegistrationLockPin(String pin, MasterKey masterKey) throws IOException {
+        IOException exception = null;
+        for (final var secureValueRecovery : secureValueRecoveries) {
+            try {
+                final var backupResponse = secureValueRecovery.setPin(pin, masterKey).execute();
+                switch (backupResponse) {
+                    case SecureValueRecovery.BackupResponse.Success success -> {
+                    }
+                    case SecureValueRecovery.BackupResponse.ServerRejected serverRejected ->
+                            logger.warn("Backup svr failed: ServerRejected");
+                    case SecureValueRecovery.BackupResponse.EnclaveNotFound enclaveNotFound ->
+                            logger.warn("Backup svr failed: EnclaveNotFound");
+                    case SecureValueRecovery.BackupResponse.ExposeFailure exposeFailure ->
+                            logger.warn("Backup svr failed: ExposeFailure");
+                    case SecureValueRecovery.BackupResponse.ApplicationError error ->
+                            throw new IOException(error.getException());
+                    case SecureValueRecovery.BackupResponse.NetworkError error -> throw error.getException();
+                    case null, default -> throw new AssertionError("Unexpected response");
+                }
+            } catch (IOException e) {
+                exception = e;
+            }
         }
-        pinChangeSession.enableRegistrationLock(masterKey);
+        if (exception != null) {
+            throw exception;
+        }
+    }
+
+    public void migrateRegistrationLockPin(String pin, MasterKey masterKey) throws IOException {
+        setRegistrationLockPin(pin, masterKey);
     }
 
     public void removeRegistrationLockPin() throws IOException {
-        final var pinChangeSession = keyBackupService.newPinChangeSession();
-        pinChangeSession.disableRegistrationLock();
-        try {
-            pinChangeSession.removePin();
-        } catch (UnauthenticatedResponseException e) {
-            throw new IOException(e);
-        }
-    }
-
-    public KbsPinData getRegistrationLockData(
-            String pin, LockedException e
-    ) throws IOException, IncorrectPinException {
-        var basicStorageCredentials = e.getBasicStorageCredentials();
-        if (basicStorageCredentials == null) {
-            return null;
-        }
-
-        try {
-            return getRegistrationLockData(pin, basicStorageCredentials);
-        } catch (KeyBackupSystemNoDataException ex) {
-            throw new IOException(e);
-        } catch (KeyBackupServicePinException ex) {
-            throw new IncorrectPinException(ex.getTriesRemaining());
-        }
-    }
-
-    private KbsPinData getRegistrationLockData(
-            String pin, String basicStorageCredentials
-    ) throws IOException, KeyBackupSystemNoDataException, KeyBackupServicePinException {
-        var tokenResponse = keyBackupService.getToken(basicStorageCredentials);
-        if (tokenResponse == null || tokenResponse.getTries() == 0) {
-            throw new IOException("KBS Account locked, maximum pin attempts reached.");
-        }
-
-        var registrationLockData = restoreMasterKey(pin, basicStorageCredentials, tokenResponse);
-        if (registrationLockData == null) {
-            throw new AssertionError("Failed to restore master key");
-        }
-        return registrationLockData;
-    }
-
-    private KbsPinData restoreMasterKey(
-            String pin, String basicStorageCredentials, TokenResponse tokenResponse
-    ) throws IOException, KeyBackupSystemNoDataException, KeyBackupServicePinException {
-        if (pin == null) return null;
-
-        if (basicStorageCredentials == null) {
-            throw new AssertionError("Cannot restore KBS key, no storage credentials supplied");
-        }
-
-        var session = keyBackupService.newRegistrationSession(basicStorageCredentials, tokenResponse);
-
-        try {
-            var hashedPin = PinHashing.hashPin(pin, session);
-            var kbsData = session.restorePin(hashedPin);
-            if (kbsData == null) {
-                throw new AssertionError("Null not expected");
+        IOException exception = null;
+        for (final var secureValueRecovery : secureValueRecoveries) {
+            try {
+                final var deleteResponse = secureValueRecovery.deleteData();
+                switch (deleteResponse) {
+                    case SecureValueRecovery.DeleteResponse.Success success -> {
+                    }
+                    case SecureValueRecovery.DeleteResponse.ServerRejected serverRejected ->
+                            logger.warn("Delete svr2 failed: ServerRejected");
+                    case SecureValueRecovery.DeleteResponse.EnclaveNotFound enclaveNotFound ->
+                            logger.warn("Delete svr2 failed: EnclaveNotFound");
+                    case SecureValueRecovery.DeleteResponse.ApplicationError error ->
+                            throw new IOException(error.getException());
+                    case SecureValueRecovery.DeleteResponse.NetworkError error -> throw error.getException();
+                    case null, default -> throw new AssertionError("Unexpected response");
+                }
+            } catch (IOException e) {
+                exception = e;
             }
-            return kbsData;
-        } catch (UnauthenticatedResponseException | InvalidKeyException e) {
-            throw new IOException(e);
+        }
+        if (exception != null) {
+            throw exception;
+        }
+    }
+
+    public SecureValueRecovery.RestoreResponse.Success getRegistrationLockData(
+            String pin,
+            LockedException lockedException
+    ) throws IOException, IncorrectPinException {
+        var svr2Credentials = lockedException.getSvr2Credentials();
+        if (svr2Credentials != null) {
+            IOException exception = null;
+            for (final var secureValueRecovery : secureValueRecoveries) {
+                try {
+                    final var lockData = getRegistrationLockData(secureValueRecovery, svr2Credentials, pin);
+                    if (lockData == null) {
+                        continue;
+                    }
+                    return lockData;
+                } catch (IOException e) {
+                    exception = e;
+                }
+            }
+            if (exception != null) {
+                throw exception;
+            }
+        }
+
+        return null;
+    }
+
+    public SecureValueRecovery.RestoreResponse.Success getRegistrationLockData(
+            SecureValueRecovery secureValueRecovery,
+            AuthCredentials authCredentials,
+            String pin
+    ) throws IOException, IncorrectPinException {
+        final var restoreResponse = secureValueRecovery.restoreDataPreRegistration(authCredentials, null, pin);
+
+        switch (restoreResponse) {
+            case SecureValueRecovery.RestoreResponse.Success s -> {
+                return s;
+            }
+            case SecureValueRecovery.RestoreResponse.PinMismatch pinMismatch ->
+                    throw new IncorrectPinException(pinMismatch.getTriesRemaining());
+            case SecureValueRecovery.RestoreResponse.ApplicationError error ->
+                    throw new IOException(error.getException());
+            case SecureValueRecovery.RestoreResponse.NetworkError error -> throw error.getException();
+            case SecureValueRecovery.RestoreResponse.Missing missing -> {
+                logger.debug("No SVR data stored for the given credentials.");
+                return null;
+            }
+            case null, default ->
+                    throw new AssertionError("Unexpected response: " + restoreResponse.getClass().getSimpleName());
         }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index 7a959dd2..bf7ad580 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -1,29 +1,38 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.config.ServiceConfig;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.libsignal.protocol.IdentityKeyPair;
+import org.signal.libsignal.protocol.InvalidKeyIdException;
+import org.signal.libsignal.protocol.state.KyberPreKeyRecord;
 import org.signal.libsignal.protocol.state.PreKeyRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.NetworkResultUtil;
+import org.whispersystems.signalservice.api.account.PreKeyUpload;
+import org.whispersystems.signalservice.api.keys.OneTimePreKeyCounts;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
+import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
+import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
 
 import java.io.IOException;
 import java.util.List;
 
+import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_STALE_AGE;
+import static org.asamk.signal.manager.config.ServiceConfig.SIGNED_PREKEY_ROTATE_AGE;
+import static org.asamk.signal.manager.util.Utils.handleResponseException;
+
 public class PreKeyHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(PreKeyHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(PreKeyHelper.class);
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
 
-    public PreKeyHelper(
-            final SignalAccount account, final SignalDependencies dependencies
-    ) {
+    public PreKeyHelper(final SignalAccount account, final SignalDependencies dependencies) {
         this.account = account;
         this.dependencies = dependencies;
     }
@@ -33,44 +42,238 @@ public class PreKeyHelper {
         refreshPreKeysIfNecessary(ServiceIdType.PNI);
     }
 
+    public void forceRefreshPreKeys() throws IOException {
+        forceRefreshPreKeys(ServiceIdType.ACI);
+        forceRefreshPreKeys(ServiceIdType.PNI);
+    }
+
     public void refreshPreKeysIfNecessary(ServiceIdType serviceIdType) throws IOException {
-        if (dependencies.getAccountManager().getPreKeysCount(serviceIdType) < ServiceConfig.PREKEY_MINIMUM_COUNT) {
-            refreshPreKeys(serviceIdType);
-        }
-    }
-
-    public void refreshPreKeys() throws IOException {
-        refreshPreKeys(ServiceIdType.ACI);
-        refreshPreKeys(ServiceIdType.PNI);
-    }
-
-    public void refreshPreKeys(ServiceIdType serviceIdType) throws IOException {
         final var identityKeyPair = account.getIdentityKeyPair(serviceIdType);
         if (identityKeyPair == null) {
             return;
         }
-        final var oneTimePreKeys = generatePreKeys(serviceIdType);
-        final var signedPreKeyRecord = generateSignedPreKey(serviceIdType, identityKeyPair);
+        final var accountId = account.getAccountId(serviceIdType);
+        if (accountId == null) {
+            return;
+        }
 
-        dependencies.getAccountManager()
-                .setPreKeys(serviceIdType, identityKeyPair.getPublicKey(), signedPreKeyRecord, oneTimePreKeys);
+        if (refreshPreKeysIfNecessary(serviceIdType, identityKeyPair)) {
+            refreshPreKeysIfNecessary(serviceIdType, identityKeyPair);
+        }
+    }
+
+    public void forceRefreshPreKeys(ServiceIdType serviceIdType) throws IOException {
+        final var identityKeyPair = account.getIdentityKeyPair(serviceIdType);
+        if (identityKeyPair == null) {
+            return;
+        }
+        final var accountId = account.getAccountId(serviceIdType);
+        if (accountId == null) {
+            return;
+        }
+
+        final var counts = new OneTimePreKeyCounts(0, 0);
+        if (refreshPreKeysIfNecessary(serviceIdType, identityKeyPair, counts, true)) {
+            refreshPreKeysIfNecessary(serviceIdType, identityKeyPair, counts, true);
+        }
+    }
+
+    private boolean refreshPreKeysIfNecessary(
+            final ServiceIdType serviceIdType,
+            final IdentityKeyPair identityKeyPair
+    ) throws IOException {
+        OneTimePreKeyCounts preKeyCounts;
+        try {
+            preKeyCounts = handleResponseException(dependencies.getKeysApi().getAvailablePreKeyCounts(serviceIdType));
+        } catch (AuthorizationFailedException e) {
+            logger.debug("Failed to get pre key count, ignoring: " + e.getClass().getSimpleName());
+            preKeyCounts = new OneTimePreKeyCounts(0, 0);
+        }
+
+        return refreshPreKeysIfNecessary(serviceIdType, identityKeyPair, preKeyCounts, false);
+    }
+
+    private boolean refreshPreKeysIfNecessary(
+            final ServiceIdType serviceIdType,
+            final IdentityKeyPair identityKeyPair,
+            final OneTimePreKeyCounts preKeyCounts,
+            final boolean force
+    ) throws IOException {
+        List<PreKeyRecord> preKeyRecords = null;
+        if (force || preKeyCounts.getEcCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
+            logger.debug("Refreshing {} ec pre keys, because only {} of min {} pre keys remain",
+                    serviceIdType,
+                    preKeyCounts.getEcCount(),
+                    ServiceConfig.PREKEY_MINIMUM_COUNT);
+            preKeyRecords = generatePreKeys(serviceIdType);
+        }
+
+        SignedPreKeyRecord signedPreKeyRecord = null;
+        if (force || signedPreKeyNeedsRefresh(serviceIdType)) {
+            logger.debug("Refreshing {} signed pre key.", serviceIdType);
+            signedPreKeyRecord = generateSignedPreKey(serviceIdType, identityKeyPair);
+        }
+
+        List<KyberPreKeyRecord> kyberPreKeyRecords = null;
+        if (force || preKeyCounts.getKyberCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
+            logger.debug("Refreshing {} kyber pre keys, because only {} of min {} pre keys remain",
+                    serviceIdType,
+                    preKeyCounts.getKyberCount(),
+                    ServiceConfig.PREKEY_MINIMUM_COUNT);
+            kyberPreKeyRecords = generateKyberPreKeys(serviceIdType, identityKeyPair);
+        }
+
+        KyberPreKeyRecord lastResortKyberPreKeyRecord = null;
+        if (force || lastResortKyberPreKeyNeedsRefresh(serviceIdType)) {
+            logger.debug("Refreshing {} last resort kyber pre key.", serviceIdType);
+            lastResortKyberPreKeyRecord = generateLastResortKyberPreKey(serviceIdType,
+                    identityKeyPair,
+                    kyberPreKeyRecords == null ? 0 : kyberPreKeyRecords.size());
+        }
+
+        if (signedPreKeyRecord == null
+                && preKeyRecords == null
+                && lastResortKyberPreKeyRecord == null
+                && kyberPreKeyRecords == null) {
+            return false;
+        }
+
+        final var preKeyUpload = new PreKeyUpload(serviceIdType,
+                signedPreKeyRecord,
+                preKeyRecords,
+                lastResortKyberPreKeyRecord,
+                kyberPreKeyRecords);
+        var needsReset = false;
+        try {
+            NetworkResultUtil.toPreKeysLegacy(dependencies.getKeysApi().setPreKeys(preKeyUpload));
+            try {
+                if (preKeyRecords != null) {
+                    account.addPreKeys(serviceIdType, preKeyRecords);
+                }
+                if (signedPreKeyRecord != null) {
+                    account.addSignedPreKey(serviceIdType, signedPreKeyRecord);
+                }
+            } catch (Exception e) {
+                logger.warn("Failed to store new pre keys, resetting preKey id offset", e);
+                account.resetPreKeyOffsets(serviceIdType);
+                needsReset = true;
+            }
+            try {
+                if (kyberPreKeyRecords != null) {
+                    account.addKyberPreKeys(serviceIdType, kyberPreKeyRecords);
+                }
+                if (lastResortKyberPreKeyRecord != null) {
+                    account.addLastResortKyberPreKey(serviceIdType, lastResortKyberPreKeyRecord);
+                }
+            } catch (Exception e) {
+                logger.warn("Failed to store new kyber pre keys, resetting preKey id offset", e);
+                account.resetKyberPreKeyOffsets(serviceIdType);
+                needsReset = true;
+            }
+        } catch (AuthorizationFailedException e) {
+            // This can happen when the primary device has changed phone number
+            logger.warn("Failed to updated pre keys: {}", e.getMessage());
+        } catch (NonSuccessfulResponseCodeException e) {
+            if (serviceIdType != ServiceIdType.PNI || e.code != 422) {
+                throw e;
+            }
+            logger.warn("Failed to set PNI pre keys, ignoring for now. Account needs to be reregistered to fix this.");
+        }
+        return needsReset;
+    }
+
+    public void cleanOldPreKeys() {
+        cleanOldPreKeys(ServiceIdType.ACI);
+        cleanOldPreKeys(ServiceIdType.PNI);
+    }
+
+    private void cleanOldPreKeys(final ServiceIdType serviceIdType) {
+        cleanSignedPreKeys(serviceIdType);
+        cleanOneTimePreKeys(serviceIdType);
     }
 
     private List<PreKeyRecord> generatePreKeys(ServiceIdType serviceIdType) {
-        final var offset = account.getPreKeyIdOffset(serviceIdType);
+        final var accountData = account.getAccountData(serviceIdType);
+        final var offset = accountData.getPreKeyMetadata().getNextPreKeyId();
 
-        var records = KeyUtils.generatePreKeyRecords(offset, ServiceConfig.PREKEY_BATCH_SIZE);
-        account.addPreKeys(serviceIdType, records);
+        return KeyUtils.generatePreKeyRecords(offset);
+    }
 
-        return records;
+    private boolean signedPreKeyNeedsRefresh(ServiceIdType serviceIdType) {
+        final var accountData = account.getAccountData(serviceIdType);
+
+        final var activeSignedPreKeyId = accountData.getPreKeyMetadata().getActiveSignedPreKeyId();
+        if (activeSignedPreKeyId == -1) {
+            return true;
+        }
+        try {
+            final var signedPreKeyRecord = accountData.getSignedPreKeyStore().loadSignedPreKey(activeSignedPreKeyId);
+            return signedPreKeyRecord.getTimestamp() < System.currentTimeMillis() - SIGNED_PREKEY_ROTATE_AGE;
+        } catch (InvalidKeyIdException e) {
+            return true;
+        }
     }
 
     private SignedPreKeyRecord generateSignedPreKey(ServiceIdType serviceIdType, IdentityKeyPair identityKeyPair) {
-        final var signedPreKeyId = account.getNextSignedPreKeyId(serviceIdType);
+        final var accountData = account.getAccountData(serviceIdType);
+        final var signedPreKeyId = accountData.getPreKeyMetadata().getNextSignedPreKeyId();
 
-        var record = KeyUtils.generateSignedPreKeyRecord(identityKeyPair, signedPreKeyId);
-        account.addSignedPreKey(serviceIdType, record);
+        return KeyUtils.generateSignedPreKeyRecord(signedPreKeyId, identityKeyPair.getPrivateKey());
+    }
 
-        return record;
+    private List<KyberPreKeyRecord> generateKyberPreKeys(
+            ServiceIdType serviceIdType,
+            final IdentityKeyPair identityKeyPair
+    ) {
+        final var accountData = account.getAccountData(serviceIdType);
+        final var offset = accountData.getPreKeyMetadata().getNextKyberPreKeyId();
+
+        return KeyUtils.generateKyberPreKeyRecords(offset, identityKeyPair.getPrivateKey());
+    }
+
+    private boolean lastResortKyberPreKeyNeedsRefresh(ServiceIdType serviceIdType) {
+        final var accountData = account.getAccountData(serviceIdType);
+
+        final var activeLastResortKyberPreKeyId = accountData.getPreKeyMetadata().getActiveLastResortKyberPreKeyId();
+        if (activeLastResortKyberPreKeyId == -1) {
+            return true;
+        }
+        try {
+            final var kyberPreKeyRecord = accountData.getKyberPreKeyStore()
+                    .loadKyberPreKey(activeLastResortKyberPreKeyId);
+            return kyberPreKeyRecord.getTimestamp() < System.currentTimeMillis() - SIGNED_PREKEY_ROTATE_AGE;
+        } catch (InvalidKeyIdException e) {
+            return true;
+        }
+    }
+
+    private KyberPreKeyRecord generateLastResortKyberPreKey(
+            ServiceIdType serviceIdType,
+            IdentityKeyPair identityKeyPair,
+            final int offset
+    ) {
+        final var accountData = account.getAccountData(serviceIdType);
+        final var signedPreKeyId = accountData.getPreKeyMetadata().getNextKyberPreKeyId() + offset;
+
+        return KeyUtils.generateKyberPreKeyRecord(signedPreKeyId, identityKeyPair.getPrivateKey());
+    }
+
+    private void cleanSignedPreKeys(ServiceIdType serviceIdType) {
+        final var accountData = account.getAccountData(serviceIdType);
+
+        final var activeSignedPreKeyId = accountData.getPreKeyMetadata().getActiveSignedPreKeyId();
+        accountData.getSignedPreKeyStore().removeOldSignedPreKeys(activeSignedPreKeyId);
+
+        final var activeLastResortKyberPreKeyId = accountData.getPreKeyMetadata().getActiveLastResortKyberPreKeyId();
+        accountData.getKyberPreKeyStore().removeOldLastResortKyberPreKeys(activeLastResortKyberPreKeyId);
+    }
+
+    private void cleanOneTimePreKeys(ServiceIdType serviceIdType) {
+        long threshold = System.currentTimeMillis() - PREKEY_STALE_AGE;
+        int minCount = 200;
+
+        final var accountData = account.getAccountData(serviceIdType);
+        accountData.getPreKeyStore().deleteAllStaleOneTimeEcPreKeys(threshold, minCount);
+        accountData.getKyberPreKeyStore().deleteAllStaleOneTimeKyberPreKeys(threshold, minCount);
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
index 812e4b3c..af16ed1d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
@@ -1,12 +1,14 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.SignalDependencies;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
+import org.asamk.signal.manager.api.PhoneNumberSharingMode;
+import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.config.ServiceConfig;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.manager.internal.SignalDependencies;
+import org.asamk.signal.manager.jobs.SyncStorageJob;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfoV2;
-import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.util.IOUtils;
@@ -14,13 +16,15 @@ import org.asamk.signal.manager.util.KeyUtils;
 import org.asamk.signal.manager.util.PaymentUtils;
 import org.asamk.signal.manager.util.ProfileUtils;
 import org.asamk.signal.manager.util.Utils;
+import org.jetbrains.annotations.Nullable;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.InvalidKeyException;
+import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
-import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
+import org.whispersystems.signalservice.api.NetworkResultUtil;
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.profiles.AvatarUploadParams;
 import org.whispersystems.signalservice.api.profiles.ProfileAndCredential;
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
@@ -28,14 +32,13 @@ import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.NotFoundException;
 import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
 import org.whispersystems.signalservice.api.services.ProfileService;
+import org.whispersystems.signalservice.api.util.ExpiringProfileCredentialUtil;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.util.Base64;
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
@@ -48,7 +51,7 @@ import io.reactivex.rxjava3.core.Single;
 
 public final class ProfileHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(ProfileHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(ProfileHelper.class);
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
@@ -67,7 +70,8 @@ public final class ProfileHelper {
         account.setProfileKey(profileKey);
         context.getAccountHelper().updateAccountAttributes();
         setProfile(true, true, null, null, null, null, null, null);
-        // TODO update profile key in storage
+        account.getRecipientStore().rotateSelfStorageId();
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
 
         final var recipientIds = account.getRecipientStore().getRecipientIdsWithEnabledProfileSharing();
         for (final var recipientId : recipientIds) {
@@ -78,7 +82,7 @@ public final class ProfileHelper {
         final var activeGroupIds = account.getGroupStore()
                 .getGroups()
                 .stream()
-                .filter(g -> g instanceof GroupInfoV2 && g.isMember(selfRecipientId))
+                .filter(g -> g instanceof GroupInfoV2 && g.isMember(selfRecipientId) && g.isProfileSharingEnabled())
                 .map(g -> (GroupInfoV2) g)
                 .map(GroupInfoV2::getGroupId)
                 .toList();
@@ -107,24 +111,20 @@ public final class ProfileHelper {
         getRecipientProfiles(recipientIds, true);
     }
 
-    public List<ProfileKeyCredential> getRecipientProfileKeyCredential(List<RecipientId> recipientIds) {
-        try {
-            account.getRecipientStore().setBulkUpdating(true);
-            final var profileFetches = Flowable.fromIterable(recipientIds)
-                    .filter(recipientId -> account.getProfileStore().getProfileKeyCredential(recipientId) == null)
-                    .map(recipientId -> retrieveProfile(recipientId,
-                            SignalServiceProfile.RequestType.PROFILE_AND_CREDENTIAL).onErrorComplete());
-            Maybe.merge(profileFetches, 10).blockingSubscribe();
-        } finally {
-            account.getRecipientStore().setBulkUpdating(false);
-        }
+    public List<ExpiringProfileKeyCredential> getExpiringProfileKeyCredential(List<RecipientId> recipientIds) {
+        final var profileFetches = Flowable.fromIterable(recipientIds)
+                .filter(recipientId -> !ExpiringProfileCredentialUtil.isValid(account.getProfileStore()
+                        .getExpiringProfileKeyCredential(recipientId)))
+                .map(recipientId -> retrieveProfile(recipientId,
+                        SignalServiceProfile.RequestType.PROFILE_AND_CREDENTIAL).onErrorComplete());
+        Maybe.merge(profileFetches, 10).blockingSubscribe();
 
-        return recipientIds.stream().map(r -> account.getProfileStore().getProfileKeyCredential(r)).toList();
+        return recipientIds.stream().map(r -> account.getProfileStore().getExpiringProfileKeyCredential(r)).toList();
     }
 
-    public ProfileKeyCredential getRecipientProfileKeyCredential(RecipientId recipientId) {
-        var profileKeyCredential = account.getProfileStore().getProfileKeyCredential(recipientId);
-        if (profileKeyCredential != null) {
+    public ExpiringProfileKeyCredential getExpiringProfileKeyCredential(RecipientId recipientId) {
+        var profileKeyCredential = account.getProfileStore().getExpiringProfileKeyCredential(recipientId);
+        if (ExpiringProfileCredentialUtil.isValid(profileKeyCredential)) {
             return profileKeyCredential;
         }
 
@@ -135,7 +135,7 @@ public final class ProfileHelper {
             return null;
         }
 
-        return account.getProfileStore().getProfileKeyCredential(recipientId);
+        return account.getProfileStore().getExpiringProfileKeyCredential(recipientId);
     }
 
     /**
@@ -150,7 +150,7 @@ public final class ProfileHelper {
             final String familyName,
             String about,
             String aboutEmoji,
-            Optional<File> avatar,
+            Optional<String> avatar,
             byte[] mobileCoinAddress
     ) throws IOException {
         setProfile(true, false, givenName, familyName, about, aboutEmoji, avatar, mobileCoinAddress);
@@ -163,7 +163,7 @@ public final class ProfileHelper {
             final String familyName,
             String about,
             String aboutEmoji,
-            Optional<File> avatar,
+            Optional<String> avatar,
             byte[] mobileCoinAddress
     ) throws IOException {
         var profile = getSelfProfile();
@@ -187,7 +187,8 @@ public final class ProfileHelper {
 
         if (uploadProfile) {
             final var streamDetails = avatar != null && avatar.isPresent()
-                    ? Utils.createStreamDetailsFromFile(avatar.get())
+                    ? Utils.createStreamDetails(avatar.get())
+                    .first()
                     : forceUploadAvatar && avatar == null ? context.getAvatarStore()
                             .retrieveProfileAvatar(account.getSelfRecipientAddress()) : null;
             try (streamDetails) {
@@ -196,9 +197,10 @@ public final class ProfileHelper {
                         : avatar == null ? AvatarUploadParams.unchanged(true) : AvatarUploadParams.unchanged(false);
                 final var paymentsAddress = Optional.ofNullable(newProfile.getMobileCoinAddress())
                         .map(address -> PaymentUtils.signPaymentsAddress(address,
-                                account.getAciIdentityKeyPair().getPrivateKey()));
+                                account.getAciIdentityKeyPair().getPrivateKey()))
+                        .orElse(null);
                 logger.debug("Uploading new profile");
-                final var avatarPath = dependencies.getAccountManager()
+                final var avatarPath = NetworkResultUtil.toSetProfileLegacy(dependencies.getProfileApi()
                         .setVersionedProfile(account.getAci(),
                                 account.getProfileKey(),
                                 newProfile.getInternalServiceName(),
@@ -206,9 +208,11 @@ public final class ProfileHelper {
                                 newProfile.getAboutEmoji() == null ? "" : newProfile.getAboutEmoji(),
                                 paymentsAddress,
                                 avatarUploadParams,
-                                List.of(/* TODO implement support for badges */));
+                                List.of(/* TODO implement support for badges */),
+                                account.getConfigurationStore().getPhoneNumberSharingMode()
+                                        == PhoneNumberSharingMode.EVERYBODY));
                 if (!avatarUploadParams.keepTheSame) {
-                    builder.withAvatarUrlPath(avatarPath.orElse(null));
+                    builder.withAvatarUrlPath(avatarPath);
                 }
                 newProfile = builder.build();
             }
@@ -216,9 +220,11 @@ public final class ProfileHelper {
 
         if (avatar != null) {
             if (avatar.isPresent()) {
-                context.getAvatarStore()
-                        .storeProfileAvatar(account.getSelfRecipientAddress(),
-                                outputStream -> IOUtils.copyFileToStream(avatar.get(), outputStream));
+                try (final var streamDetails = Utils.createStreamDetails(avatar.get()).first()) {
+                    context.getAvatarStore()
+                            .storeProfileAvatar(account.getSelfRecipientAddress(),
+                                    outputStream -> IOUtils.copyStream(streamDetails.getStream(), outputStream));
+                }
             } else {
                 context.getAvatarStore().deleteProfileAvatar(account.getSelfRecipientAddress());
             }
@@ -232,16 +238,11 @@ public final class ProfileHelper {
 
     private List<Profile> getRecipientProfiles(Collection<RecipientId> recipientIds, boolean force) {
         final var profileStore = account.getProfileStore();
-        try {
-            account.getRecipientStore().setBulkUpdating(true);
-            final var profileFetches = Flowable.fromIterable(recipientIds)
-                    .filter(recipientId -> force || isProfileRefreshRequired(profileStore.getProfile(recipientId)))
-                    .map(recipientId -> retrieveProfile(recipientId,
-                            SignalServiceProfile.RequestType.PROFILE).onErrorComplete());
-            Maybe.merge(profileFetches, 10).blockingSubscribe();
-        } finally {
-            account.getRecipientStore().setBulkUpdating(false);
-        }
+        final var profileFetches = Flowable.fromIterable(recipientIds)
+                .filter(recipientId -> force || isProfileRefreshRequired(profileStore.getProfile(recipientId)))
+                .map(recipientId -> retrieveProfile(recipientId,
+                        SignalServiceProfile.RequestType.PROFILE).onErrorComplete());
+        Maybe.merge(profileFetches, 10).blockingSubscribe();
 
         return recipientIds.stream().map(profileStore::getProfile).toList();
     }
@@ -271,13 +272,10 @@ public final class ProfileHelper {
         return now - profile.getLastUpdateTimestamp() >= 6 * 60 * 60 * 1000;
     }
 
-    private SignalServiceProfile retrieveProfileSync(String username) throws IOException {
-        final var locale = Utils.getDefaultLocale(Locale.US);
-        return dependencies.getMessageReceiver().retrieveProfileByUsername(username, Optional.empty(), locale);
-    }
-
     private Profile decryptProfileAndDownloadAvatar(
-            final RecipientId recipientId, final ProfileKey profileKey, final SignalServiceProfile encryptedProfile
+            final RecipientId recipientId,
+            final ProfileKey profileKey,
+            final SignalServiceProfile encryptedProfile
     ) {
         final var avatarPath = encryptedProfile.getAvatar();
         downloadProfileAvatar(recipientId, avatarPath, profileKey);
@@ -286,7 +284,9 @@ public final class ProfileHelper {
     }
 
     public void downloadProfileAvatar(
-            final RecipientId recipientId, final String avatarPath, final ProfileKey profileKey
+            final RecipientId recipientId,
+            final String avatarPath,
+            final ProfileKey profileKey
     ) {
         var profile = account.getProfileStore().getProfile(recipientId);
         if (profile == null || !Objects.equals(avatarPath, profile.getAvatarUrlPath())) {
@@ -314,7 +314,8 @@ public final class ProfileHelper {
     }
 
     private Single<ProfileAndCredential> retrieveProfile(
-            RecipientId recipientId, SignalServiceProfile.RequestType requestType
+            RecipientId recipientId,
+            SignalServiceProfile.RequestType requestType
     ) {
         var unidentifiedAccess = getUnidentifiedAccess(recipientId);
         var profileKey = Optional.ofNullable(account.getProfileStore().getProfileKey(recipientId));
@@ -328,10 +329,11 @@ public final class ProfileHelper {
             final var encryptedProfile = p.getProfile();
 
             if (requestType == SignalServiceProfile.RequestType.PROFILE_AND_CREDENTIAL
-                    || account.getProfileStore().getProfileKeyCredential(recipientId) == null) {
+                    || !ExpiringProfileCredentialUtil.isValid(account.getProfileStore()
+                    .getExpiringProfileKeyCredential(recipientId))) {
                 logger.trace("Storing profile credential");
-                final var profileKeyCredential = p.getProfileKeyCredential().orElse(null);
-                account.getProfileStore().storeProfileKeyCredential(recipientId, profileKeyCredential);
+                final var profileKeyCredential = p.getExpiringProfileKeyCredential().orElse(null);
+                account.getProfileStore().storeExpiringProfileKeyCredential(recipientId, profileKeyCredential);
             }
 
             final var profile = account.getProfileStore().getProfile(recipientId);
@@ -351,10 +353,22 @@ public final class ProfileHelper {
                         .build();
             }
 
+            if (recipientId.equals(account.getSelfRecipientId())) {
+                final var isUnrestricted = encryptedProfile.isUnrestrictedUnidentifiedAccess();
+                if (account.isUnrestrictedUnidentifiedAccess() != isUnrestricted) {
+                    account.setUnrestrictedUnidentifiedAccess(isUnrestricted);
+                }
+                if (account.isPrimaryDevice() && profile != null && newProfile.getCapabilities()
+                        .contains(Profile.Capability.storageServiceEncryptionV2Capability) && !profile.getCapabilities()
+                        .contains(Profile.Capability.storageServiceEncryptionV2Capability)) {
+                    context.getJobExecutor().enqueueJob(new SyncStorageJob(true));
+                }
+            }
+
             try {
                 logger.trace("Storing identity");
                 final var identityKey = new IdentityKey(Base64.getDecoder().decode(encryptedProfile.getIdentityKey()));
-                account.getIdentityKeyStore().saveIdentity(recipientId, identityKey, new Date());
+                account.getIdentityKeyStore().saveIdentity(p.getProfile().getServiceId(), identityKey);
             } catch (InvalidKeyException ignored) {
                 logger.warn("Got invalid identity key in profile for {}",
                         context.getRecipientHelper().resolveSignalServiceAddress(recipientId).getIdentifier());
@@ -362,6 +376,7 @@ public final class ProfileHelper {
 
             logger.trace("Storing profile");
             account.getProfileStore().storeProfile(recipientId, newProfile);
+            account.getRecipientStore().markRegistered(recipientId, true);
 
             logger.trace("Done handling retrieved profile");
         }).doOnError(e -> {
@@ -373,6 +388,10 @@ public final class ProfileHelper {
                     .withUnidentifiedAccessMode(Profile.UnidentifiedAccessMode.UNKNOWN)
                     .withCapabilities(Set.of())
                     .build();
+            if (e instanceof NotFoundException) {
+                logger.debug("Marking recipient {} as unregistered after 404 profile fetch.", recipientId);
+                account.getRecipientStore().markRegistered(recipientId, false);
+            }
 
             account.getProfileStore().storeProfile(recipientId, newProfile);
         });
@@ -381,7 +400,7 @@ public final class ProfileHelper {
     private Single<ProfileAndCredential> retrieveProfile(
             SignalServiceAddress address,
             Optional<ProfileKey> profileKey,
-            Optional<UnidentifiedAccess> unidentifiedAccess,
+            @Nullable SealedSenderAccess unidentifiedAccess,
             SignalServiceProfile.RequestType requestType
     ) {
         final var profileService = dependencies.getProfileService();
@@ -401,9 +420,7 @@ public final class ProfileHelper {
         });
     }
 
-    private void downloadProfileAvatar(
-            RecipientAddress address, String avatarPath, ProfileKey profileKey
-    ) {
+    private void downloadProfileAvatar(RecipientAddress address, String avatarPath, ProfileKey profileKey) {
         if (avatarPath == null) {
             try {
                 context.getAvatarStore().deleteProfileAvatar(address);
@@ -423,7 +440,9 @@ public final class ProfileHelper {
     }
 
     private void retrieveProfileAvatar(
-            String avatarPath, ProfileKey profileKey, OutputStream outputStream
+            String avatarPath,
+            ProfileKey profileKey,
+            OutputStream outputStream
     ) throws IOException {
         var tmpFile = IOUtils.createTempFile();
         try (var input = dependencies.getMessageReceiver()
@@ -444,13 +463,7 @@ public final class ProfileHelper {
         }
     }
 
-    private Optional<UnidentifiedAccess> getUnidentifiedAccess(RecipientId recipientId) {
-        var unidentifiedAccess = context.getUnidentifiedAccessHelper().getAccessFor(recipientId, true);
-
-        if (unidentifiedAccess.isPresent()) {
-            return unidentifiedAccess.get().getTargetUnidentifiedAccess();
-        }
-
-        return Optional.empty();
+    private @Nullable SealedSenderAccess getUnidentifiedAccess(RecipientId recipientId) {
+        return context.getUnidentifiedAccessHelper().getSealedSenderAccessFor(recipientId, true);
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index d3c1ef56..71f69081 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -1,15 +1,20 @@
 package org.asamk.signal.manager.helper;
 
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.actions.HandleAction;
 import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.manager.api.UntrustedIdentityException;
+import org.asamk.signal.manager.internal.SignalDependencies;
+import org.asamk.signal.manager.jobs.CleanOldPreKeysJob;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.messageCache.CachedMessage;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
+import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.websocket.SignalWebSocket;
 import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState;
 import org.whispersystems.signalservice.api.websocket.WebSocketUnavailableException;
 
@@ -23,20 +28,18 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeoutException;
 
-import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class ReceiveHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(ReceiveHelper.class);
-    private final static int MAX_BACKOFF_COUNTER = 9;
+    private static final Logger logger = LoggerFactory.getLogger(ReceiveHelper.class);
+    private static final int MAX_BACKOFF_COUNTER = 9;
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
     private final Context context;
 
-    private ReceiveConfig receiveConfig = new ReceiveConfig(false, false);
-    private boolean needsToRetryFailedMessages = false;
+    private ReceiveConfig receiveConfig = new ReceiveConfig(false, false, false);
     private boolean hasCaughtUpWithOldMessages = false;
     private boolean isWaitingForMessage = false;
     private boolean shouldStop = false;
@@ -51,14 +54,7 @@ public class ReceiveHelper {
 
     public void setReceiveConfig(final ReceiveConfig receiveConfig) {
         this.receiveConfig = receiveConfig;
-    }
-
-    public void setNeedsToRetryFailedMessages(final boolean needsToRetryFailedMessages) {
-        this.needsToRetryFailedMessages = needsToRetryFailedMessages;
-    }
-
-    public boolean hasCaughtUpWithOldMessages() {
-        return hasCaughtUpWithOldMessages;
+        dependencies.setAllowStories(!receiveConfig.ignoreStories());
     }
 
     public void setAuthenticationFailureListener(final Callable authenticationFailureListener) {
@@ -77,7 +73,7 @@ public class ReceiveHelper {
     public void receiveMessagesContinuously(Manager.ReceiveMessageHandler handler) {
         while (!shouldStop) {
             try {
-                receiveMessages(Duration.ofMinutes(1), false, handler);
+                receiveMessages(Duration.ofMinutes(1), false, null, handler);
                 break;
             } catch (IOException e) {
                 logger.warn("Receiving messages failed, retrying", e);
@@ -86,50 +82,54 @@ public class ReceiveHelper {
     }
 
     public void receiveMessages(
-            Duration timeout, boolean returnOnTimeout, Manager.ReceiveMessageHandler handler
+            Duration timeout,
+            boolean returnOnTimeout,
+            Integer maxMessages,
+            Manager.ReceiveMessageHandler handler
     ) throws IOException {
-        needsToRetryFailedMessages = true;
+        account.setNeedsToRetryFailedMessages(true);
         hasCaughtUpWithOldMessages = false;
 
         // Use a Map here because java Set doesn't have a get method ...
         Map<HandleAction, HandleAction> queuedActions = new HashMap<>();
 
-        final var signalWebSocket = dependencies.getSignalWebSocket();
-        final var webSocketStateDisposable = Observable.merge(signalWebSocket.getUnidentifiedWebSocketState(),
-                        signalWebSocket.getWebSocketState())
+        final var signalWebSocket = dependencies.getAuthenticatedSignalWebSocket();
+        final var webSocketStateDisposable = signalWebSocket.getState()
                 .subscribeOn(Schedulers.computation())
                 .observeOn(Schedulers.computation())
                 .distinctUntilChanged()
                 .subscribe(this::onWebSocketStateChange);
         signalWebSocket.connect();
+        signalWebSocket.registerKeepAliveToken("receive");
 
         try {
-            receiveMessagesInternal(timeout, returnOnTimeout, handler, queuedActions);
+            receiveMessagesInternal(signalWebSocket, timeout, returnOnTimeout, maxMessages, handler, queuedActions);
         } finally {
             hasCaughtUpWithOldMessages = false;
             handleQueuedActions(queuedActions.keySet());
             queuedActions.clear();
-            dependencies.getSignalWebSocket().disconnect();
+            signalWebSocket.removeKeepAliveToken("receive");
+            signalWebSocket.disconnect();
             webSocketStateDisposable.dispose();
             shouldStop = false;
         }
     }
 
     private void receiveMessagesInternal(
+            final SignalWebSocket.AuthenticatedWebSocket signalWebSocket,
             Duration timeout,
             boolean returnOnTimeout,
+            Integer maxMessages,
             Manager.ReceiveMessageHandler handler,
             final Map<HandleAction, HandleAction> queuedActions
     ) throws IOException {
-        final var signalWebSocket = dependencies.getSignalWebSocket();
-
+        int remainingMessages = maxMessages == null ? -1 : maxMessages;
         var backOffCounter = 0;
         isWaitingForMessage = false;
 
-        while (!shouldStop) {
-            if (needsToRetryFailedMessages) {
+        while (!shouldStop && remainingMessages != 0) {
+            if (account.getNeedsToRetryFailedMessages()) {
                 retryFailedReceivedMessages(handler);
-                needsToRetryFailedMessages = false;
             }
             SignalServiceEnvelope envelope;
             final CachedMessage[] cachedMessage = {null};
@@ -140,25 +140,41 @@ public class ReceiveHelper {
             logger.debug("Checking for new message from server");
             try {
                 isWaitingForMessage = true;
-                var result = signalWebSocket.readOrEmpty(timeout.toMillis(), envelope1 -> {
+                var queueNotEmpty = signalWebSocket.readMessageBatch(timeout.toMillis(), 1, batch -> {
+                    logger.debug("Retrieved {} envelopes!", batch.size());
                     isWaitingForMessage = false;
-                    final var recipientId = envelope1.hasSourceUuid() ? account.getRecipientResolver()
-                            .resolveRecipient(envelope1.getSourceAddress()) : null;
-                    logger.trace("Storing new message from {}", recipientId);
-                    // store message on disk, before acknowledging receipt to the server
-                    cachedMessage[0] = account.getMessageCache().cacheMessage(envelope1, recipientId);
+                    for (final var it : batch) {
+                        SignalServiceEnvelope envelope1 = new SignalServiceEnvelope(it.getEnvelope(),
+                                it.getServerDeliveredTimestamp());
+                        final var recipientId = envelope1.getSourceServiceId()
+                                .map(ServiceId::parseOrNull)
+                                .map(s -> account.getRecipientResolver().resolveRecipient(s))
+                                .orElse(null);
+                        logger.trace("Storing new message from {}", recipientId);
+                        // store message on disk, before acknowledging receipt to the server
+                        cachedMessage[0] = account.getMessageCache().cacheMessage(envelope1, recipientId);
+                        try {
+                            signalWebSocket.sendAck(it);
+                        } catch (IOException e) {
+                            logger.warn("Failed to ack envelope to server after storing it: {}", e.getMessage());
+                        }
+                    }
                 });
                 isWaitingForMessage = false;
                 backOffCounter = 0;
 
-                if (result.isPresent()) {
-                    envelope = result.get();
+                if (queueNotEmpty) {
+                    if (remainingMessages > 0) {
+                        remainingMessages -= 1;
+                    }
+                    envelope = cachedMessage[0].loadEnvelope();
                     logger.debug("New message received from server");
                 } else {
                     logger.debug("Received indicator that server queue is empty");
                     handleQueuedActions(queuedActions.keySet());
                     queuedActions.clear();
 
+                    context.getJobExecutor().enqueueJob(new CleanOldPreKeysJob());
                     hasCaughtUpWithOldMessages = true;
                     caughtUpWithOldMessagesListener.call();
 
@@ -191,39 +207,49 @@ public class ReceiveHelper {
                 backOffCounter = 0;
                 if (returnOnTimeout) return;
                 continue;
+            } catch (Exception e) {
+                logger.error("Unknown error when receiving messages", e);
+                continue;
             }
 
-            final var result = context.getIncomingMessageHandler().handleEnvelope(envelope, receiveConfig, handler);
-            for (final var h : result.first()) {
-                final var existingAction = queuedActions.get(h);
-                if (existingAction == null) {
-                    queuedActions.put(h, h);
-                } else {
-                    existingAction.mergeOther(h);
-                }
-            }
-            final var exception = result.second();
-
-            if (hasCaughtUpWithOldMessages) {
-                handleQueuedActions(queuedActions.keySet());
-                queuedActions.clear();
-            }
-            if (cachedMessage[0] != null) {
-                if (exception instanceof UntrustedIdentityException) {
-                    logger.debug("Keeping message with untrusted identity in message cache");
-                    final var address = ((UntrustedIdentityException) exception).getSender();
-                    final var recipientId = account.getRecipientResolver().resolveRecipient(address);
-                    if (!envelope.hasSourceUuid()) {
-                        try {
-                            cachedMessage[0] = account.getMessageCache().replaceSender(cachedMessage[0], recipientId);
-                        } catch (IOException ioException) {
-                            logger.warn("Failed to move cached message to recipient folder: {}",
-                                    ioException.getMessage());
-                        }
+            try {
+                final var result = context.getIncomingMessageHandler().handleEnvelope(envelope, receiveConfig, handler);
+                for (final var h : result.first()) {
+                    final var existingAction = queuedActions.get(h);
+                    if (existingAction == null) {
+                        queuedActions.put(h, h);
+                    } else {
+                        existingAction.mergeOther(h);
                     }
-                } else {
-                    cachedMessage[0].delete();
                 }
+                final var exception = result.second();
+
+                if (hasCaughtUpWithOldMessages) {
+                    handleQueuedActions(queuedActions.keySet());
+                    queuedActions.clear();
+                }
+                if (cachedMessage[0] != null) {
+                    if (exception instanceof UntrustedIdentityException) {
+                        logger.debug("Keeping message with untrusted identity in message cache");
+                        final var address = ((UntrustedIdentityException) exception).getSender();
+                        if (envelope.getSourceServiceId().isEmpty() && address.aci().isPresent()) {
+                            final var recipientId = account.getRecipientResolver()
+                                    .resolveRecipient(ACI.parseOrThrow(address.aci().get()));
+                            try {
+                                cachedMessage[0] = account.getMessageCache()
+                                        .replaceSender(cachedMessage[0], recipientId);
+                            } catch (IOException ioException) {
+                                logger.warn("Failed to move cached message to recipient folder: {}",
+                                        ioException.getMessage(),
+                                        ioException);
+                            }
+                        }
+                    } else {
+                        cachedMessage[0].delete();
+                    }
+                }
+            } catch (Exception e) {
+                logger.error("Unknown error when handling messages", e);
             }
         }
     }
@@ -237,10 +263,12 @@ public class ReceiveHelper {
             }
         }
         handleQueuedActions(queuedActions);
+        account.setNeedsToRetryFailedMessages(false);
     }
 
     private List<HandleAction> retryFailedReceivedMessage(
-            final Manager.ReceiveMessageHandler handler, final CachedMessage cachedMessage
+            final Manager.ReceiveMessageHandler handler,
+            final CachedMessage cachedMessage
     ) {
         var envelope = cachedMessage.loadEnvelope();
         if (envelope == null) {
@@ -253,18 +281,21 @@ public class ReceiveHelper {
         final var exception = result.second();
 
         if (exception instanceof UntrustedIdentityException) {
-            if (System.currentTimeMillis() - envelope.getServerDeliveredTimestamp() > 1000L * 60 * 60 * 24 * 30) {
-                // Envelope is more than a month old, cleaning up.
+            if (System.currentTimeMillis() - envelope.getServerDeliveredTimestamp() > 1000L * 60 * 60 * 24 * 14) {
+                // Envelope is more than two weeks old, cleaning up.
                 cachedMessage.delete();
                 return null;
             }
-            if (!envelope.hasSourceUuid()) {
+            if (envelope.getSourceServiceId().isEmpty()) {
                 final var identifier = ((UntrustedIdentityException) exception).getSender();
-                final var recipientId = account.getRecipientResolver().resolveRecipient(identifier);
+                final var recipientId = account.getRecipientResolver()
+                        .resolveRecipient(new RecipientAddress(identifier));
                 try {
                     account.getMessageCache().replaceSender(cachedMessage, recipientId);
                 } catch (IOException ioException) {
-                    logger.warn("Failed to move cached message to recipient folder: {}", ioException.getMessage());
+                    logger.warn("Failed to move cached message to recipient folder: {}",
+                            ioException.getMessage(),
+                            ioException);
                 }
             }
             return null;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 2f254b5d..a73bb741 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -1,56 +1,60 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
-import org.asamk.signal.manager.config.ServiceConfig;
-import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
+import org.asamk.signal.manager.api.UsernameLinkUrl;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
-import org.signal.libsignal.protocol.InvalidKeyException;
+import org.signal.libsignal.usernames.BaseUsernameException;
+import org.signal.libsignal.usernames.Username;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.push.ACI;
+import org.whispersystems.signalservice.api.cds.CdsiV2Service;
 import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-import org.whispersystems.signalservice.internal.contacts.crypto.Quote;
-import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedQuoteException;
-import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
+import org.whispersystems.signalservice.api.push.exceptions.CdsiInvalidArgumentException;
+import org.whispersystems.signalservice.api.push.exceptions.CdsiInvalidTokenException;
+import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
 
 import java.io.IOException;
-import java.security.SignatureException;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
+
+import static org.asamk.signal.manager.config.ServiceConfig.MAXIMUM_ONE_OFF_REQUEST_SIZE;
+import static org.asamk.signal.manager.util.Utils.handleResponseException;
 
 public class RecipientHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(RecipientHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(RecipientHelper.class);
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
-    private final ServiceEnvironmentConfig serviceEnvironmentConfig;
 
     public RecipientHelper(final Context context) {
         this.account = context.getAccount();
         this.dependencies = context.getDependencies();
-        this.serviceEnvironmentConfig = dependencies.getServiceEnvironmentConfig();
     }
 
     public SignalServiceAddress resolveSignalServiceAddress(RecipientId recipientId) {
         final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
-        if (address.number().isEmpty() || address.uuid().isPresent()) {
+        if (address.number().isEmpty() || address.serviceId().isPresent()) {
             return address.toSignalServiceAddress();
         }
 
         // Address in recipient store doesn't have a uuid, this shouldn't happen
         // Try to retrieve the uuid from the server
         final var number = address.number().get();
-        final ACI aci;
+        final ServiceId serviceId;
         try {
-            aci = getRegisteredUser(number);
+            serviceId = getRegisteredUserByNumber(number);
         } catch (UnregisteredRecipientException e) {
             logger.warn("Failed to get uuid for e164 number: {}", number);
             // Return SignalServiceAddress with unknown UUID
@@ -61,15 +65,11 @@ public class RecipientHelper {
             return address.toSignalServiceAddress();
         }
         return account.getRecipientAddressResolver()
-                .resolveRecipientAddress(account.getRecipientResolver().resolveRecipient(aci))
+                .resolveRecipientAddress(account.getRecipientResolver().resolveRecipient(serviceId))
                 .toSignalServiceAddress();
     }
 
-    public RecipientId resolveRecipient(final SignalServiceAddress address) {
-        return account.getRecipientResolver().resolveRecipient(address);
-    }
-
-    public Set<RecipientId> resolveRecipients(Collection<RecipientIdentifier.Single> recipients) throws UnregisteredRecipientException {
+    public Set<RecipientId> resolveRecipients(Collection<RecipientIdentifier.Single> recipients) throws UnregisteredRecipientException, IOException {
         final var recipientIds = new HashSet<RecipientId>(recipients.size());
         for (var number : recipients) {
             final var recipientId = resolveRecipient(number);
@@ -79,18 +79,90 @@ public class RecipientHelper {
     }
 
     public RecipientId resolveRecipient(final RecipientIdentifier.Single recipient) throws UnregisteredRecipientException {
-        if (recipient instanceof RecipientIdentifier.Uuid uuidRecipient) {
-            return account.getRecipientResolver().resolveRecipient(ServiceId.from(uuidRecipient.uuid()));
-        } else {
-            final var number = ((RecipientIdentifier.Number) recipient).number();
-            return account.getRecipientStore().resolveRecipient(number, () -> {
+        if (recipient instanceof RecipientIdentifier.Uuid(UUID uuid)) {
+            return account.getRecipientResolver().resolveRecipient(ACI.from(uuid));
+        } else if (recipient instanceof RecipientIdentifier.Pni(UUID pni)) {
+            return account.getRecipientResolver().resolveRecipient(PNI.from(pni));
+        } else if (recipient instanceof RecipientIdentifier.Number(String number)) {
+            return account.getRecipientStore().resolveRecipientByNumber(number, () -> {
                 try {
-                    return getRegisteredUser(number);
+                    return getRegisteredUserByNumber(number);
                 } catch (Exception e) {
                     return null;
                 }
             });
+        } else if (recipient instanceof RecipientIdentifier.Username(String username)) {
+            try {
+                return resolveRecipientByUsernameOrLink(username, false);
+            } catch (Exception e) {
+                return null;
+            }
         }
+        throw new AssertionError("Unexpected RecipientIdentifier: " + recipient);
+    }
+
+    public RecipientId resolveRecipientByUsernameOrLink(
+            String username,
+            boolean forceRefresh
+    ) throws UnregisteredRecipientException, IOException {
+        final Username finalUsername;
+        try {
+            finalUsername = getUsernameFromUsernameOrLink(username);
+        } catch (IOException | BaseUsernameException e) {
+            throw new RuntimeException(e);
+        }
+        if (forceRefresh) {
+            try {
+                final var aci = handleResponseException(dependencies.getUsernameApi().getAciByUsername(finalUsername));
+                return account.getRecipientStore().resolveRecipientTrusted(aci, finalUsername.getUsername());
+            } catch (NonSuccessfulResponseCodeException e) {
+                if (e.code == 404) {
+                    throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(null,
+                            null,
+                            null,
+                            username));
+                }
+                logger.debug("Failed to get uuid for username: {}", username, e);
+                throw e;
+            }
+        }
+        return account.getRecipientStore().resolveRecipientByUsername(finalUsername.getUsername(), () -> {
+            try {
+                return handleResponseException(dependencies.getUsernameApi().getAciByUsername(finalUsername));
+            } catch (Exception e) {
+                return null;
+            }
+        });
+    }
+
+    private Username getUsernameFromUsernameOrLink(String username) throws BaseUsernameException, IOException {
+        try {
+            final var usernameLinkUrl = UsernameLinkUrl.fromUri(username);
+            final var components = usernameLinkUrl.getComponents();
+            final var encryptedUsername = handleResponseException(dependencies.getUsernameApi()
+                    .getEncryptedUsernameFromLinkServerId(components.getServerId()));
+            final var link = new Username.UsernameLink(components.getEntropy(), encryptedUsername);
+
+            return Username.fromLink(link);
+        } catch (UsernameLinkUrl.InvalidUsernameLinkException e) {
+            return new Username(username);
+        }
+    }
+
+    public Optional<RecipientId> resolveRecipientOptional(final RecipientIdentifier.Single recipient) {
+        try {
+            return Optional.of(resolveRecipient(recipient));
+        } catch (UnregisteredRecipientException e) {
+            if (recipient instanceof RecipientIdentifier.Number(String number)) {
+                return account.getRecipientStore().resolveRecipientByNumberOptional(number);
+            } else {
+                return Optional.empty();
+            }
+        }
+    }
+
+    public void refreshUsers() throws IOException {
+        getRegisteredUsers(account.getRecipientStore().getAllNumbers(), false);
     }
 
     public RecipientId refreshRegisteredUser(RecipientId recipientId) throws IOException, UnregisteredRecipientException {
@@ -99,40 +171,129 @@ public class RecipientHelper {
             return recipientId;
         }
         final var number = address.getNumber().get();
-        final var uuid = getRegisteredUser(number);
-        return account.getRecipientTrustedResolver().resolveRecipientTrusted(new SignalServiceAddress(uuid, number));
+        final var serviceId = getRegisteredUserByNumber(number);
+        return account.getRecipientTrustedResolver()
+                .resolveRecipientTrusted(new SignalServiceAddress(serviceId, number));
     }
 
-    public Map<String, ACI> getRegisteredUsers(final Set<String> numbers) throws IOException {
-        final Map<String, ACI> registeredUsers;
-        try {
-            registeredUsers = dependencies.getAccountManager()
-                    .getRegisteredUsers(ServiceConfig.getIasKeyStore(),
-                            numbers,
-                            serviceEnvironmentConfig.getCdsMrenclave());
-        } catch (Quote.InvalidQuoteFormatException | UnauthenticatedQuoteException | SignatureException |
-                 UnauthenticatedResponseException | InvalidKeyException | NumberFormatException e) {
-            throw new IOException(e);
+    public Map<String, RegisteredUser> getRegisteredUsers(
+            final Set<String> numbers
+    ) throws IOException {
+        if (numbers.size() > MAXIMUM_ONE_OFF_REQUEST_SIZE) {
+            final var allNumbers = new HashSet<>(account.getRecipientStore().getAllNumbers()) {{
+                addAll(numbers);
+            }};
+            return getRegisteredUsers(allNumbers, false);
+        } else {
+            return getRegisteredUsers(numbers, true);
         }
+    }
+
+    private Map<String, RegisteredUser> getRegisteredUsers(
+            final Set<String> numbers,
+            final boolean isPartialRefresh
+    ) throws IOException {
+        Map<String, RegisteredUser> registeredUsers = getRegisteredUsersV2(numbers, isPartialRefresh);
 
         // Store numbers as recipients, so we have the number/uuid association
-        registeredUsers.forEach((number, aci) -> account.getRecipientTrustedResolver()
-                .resolveRecipientTrusted(new SignalServiceAddress(aci, number)));
+        registeredUsers.forEach((number, u) -> account.getRecipientTrustedResolver()
+                .resolveRecipientTrusted(u.aci, u.pni, Optional.of(number)));
+
+        final var unregisteredUsers = new HashSet<>(numbers);
+        unregisteredUsers.removeAll(registeredUsers.keySet());
+        account.getRecipientStore().markUndiscoverablePossiblyUnregistered(unregisteredUsers);
+        account.getRecipientStore().markDiscoverable(registeredUsers.keySet());
 
         return registeredUsers;
     }
 
-    private ACI getRegisteredUser(final String number) throws IOException, UnregisteredRecipientException {
-        final Map<String, ACI> aciMap;
+    private ServiceId getRegisteredUserByNumber(final String number) throws IOException, UnregisteredRecipientException {
+        final Map<String, RegisteredUser> aciMap;
         try {
-            aciMap = getRegisteredUsers(Set.of(number));
+            aciMap = getRegisteredUsers(Set.of(number), true);
         } catch (NumberFormatException e) {
-            throw new UnregisteredRecipientException(new RecipientAddress(null, number));
+            throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(number));
         }
-        final var uuid = aciMap.get(number);
-        if (uuid == null) {
-            throw new UnregisteredRecipientException(new RecipientAddress(null, number));
+        final var user = aciMap.get(number);
+        if (user == null) {
+            throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(number));
+        }
+        return user.getServiceId();
+    }
+
+    private Map<String, RegisteredUser> getRegisteredUsersV2(
+            final Set<String> numbers,
+            boolean isPartialRefresh
+    ) throws IOException {
+        final var previousNumbers = isPartialRefresh ? Set.<String>of() : account.getCdsiStore().getAllNumbers();
+        final var newNumbers = new HashSet<>(numbers) {{
+            removeAll(previousNumbers);
+        }};
+        if (newNumbers.isEmpty() && previousNumbers.isEmpty()) {
+            logger.debug("No new numbers to query.");
+            return Map.of();
+        }
+        logger.trace("Querying CDSI for {} new numbers ({} previous), isPartialRefresh={}",
+                newNumbers.size(),
+                previousNumbers.size(),
+                isPartialRefresh);
+        final var token = previousNumbers.isEmpty()
+                ? Optional.<byte[]>empty()
+                : Optional.ofNullable(account.getCdsiToken());
+
+        final CdsiV2Service.Response response;
+        try {
+            response = handleResponseException(dependencies.getCdsApi()
+                    .getRegisteredUsers(token.isEmpty() ? Set.of() : previousNumbers,
+                            newNumbers,
+                            account.getRecipientStore().getServiceIdToProfileKeyMap(),
+                            token,
+                            null,
+                            dependencies.getLibSignalNetwork(),
+                            newToken -> {
+                                if (isPartialRefresh) {
+                                    account.getCdsiStore().updateAfterPartialCdsQuery(newNumbers);
+                                    // Not storing newToken for partial refresh
+                                } else {
+                                    final var fullNumbers = new HashSet<>(previousNumbers) {{
+                                        addAll(newNumbers);
+                                    }};
+                                    final var seenNumbers = new HashSet<>(numbers) {{
+                                        addAll(newNumbers);
+                                    }};
+                                    account.getCdsiStore().updateAfterFullCdsQuery(fullNumbers, seenNumbers);
+                                    account.setCdsiToken(newToken);
+                                    account.setLastRecipientsRefresh(System.currentTimeMillis());
+                                }
+                            }));
+        } catch (CdsiInvalidTokenException | CdsiInvalidArgumentException e) {
+            account.setCdsiToken(null);
+            account.getCdsiStore().clearAll();
+            throw e;
+        } catch (NumberFormatException e) {
+            throw new IOException(e);
+        }
+        logger.debug("CDSI request successful, quota used by this request: {}", response.getQuotaUsedDebugOnly());
+
+        final var registeredUsers = new HashMap<String, RegisteredUser>();
+        response.getResults()
+                .forEach((key, value) -> registeredUsers.put(key,
+                        new RegisteredUser(value.getAci(), Optional.of(value.getPni()))));
+        return registeredUsers;
+    }
+
+    public record RegisteredUser(Optional<ACI> aci, Optional<PNI> pni) {
+
+        public RegisteredUser {
+            aci = aci.isPresent() && aci.get().isUnknown() ? Optional.empty() : aci;
+            pni = pni.isPresent() && pni.get().isUnknown() ? Optional.empty() : pni;
+            if (aci.isEmpty() && pni.isEmpty()) {
+                throw new AssertionError("Must have either a ACI or PNI!");
+            }
+        }
+
+        public ServiceId getServiceId() {
+            return aci.map(a -> (ServiceId) a).or(this::pni).orElse(null);
         }
-        return uuid;
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 758fe1b9..2fb55003 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -1,20 +1,19 @@
 package org.asamk.signal.manager.helper;
 
-import com.google.protobuf.ByteString;
-
-import org.asamk.signal.manager.SignalDependencies;
+import org.asamk.signal.manager.api.Contact;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
+import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.groups.GroupUtils;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfo;
-import org.asamk.signal.manager.storage.recipients.Contact;
-import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.sendLog.MessageSendLogEntry;
+import org.jetbrains.annotations.Nullable;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.InvalidRegistrationIdException;
 import org.signal.libsignal.protocol.NoSessionException;
@@ -24,11 +23,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.crypto.ContentHint;
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
+import org.whispersystems.signalservice.api.groupsv2.GroupSendEndorsements;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
+import org.whispersystems.signalservice.api.messages.SignalServiceEditMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
@@ -40,6 +41,7 @@ import org.whispersystems.signalservice.api.push.exceptions.ProofRequiredExcepti
 import org.whispersystems.signalservice.api.push.exceptions.RateLimitException;
 import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
 import org.whispersystems.signalservice.internal.push.exceptions.InvalidUnidentifiedAccessHeaderException;
+import org.whispersystems.signalservice.internal.push.http.PartialSendCompleteListener;
 
 import java.io.IOException;
 import java.time.Duration;
@@ -51,11 +53,12 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.stream.Collectors;
+
+import okio.ByteString;
 
 public class SendHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(SendHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(SendHelper.class);
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
@@ -72,17 +75,19 @@ public class SendHelper {
      * The message is extended with the current expiration timer.
      */
     public SendMessageResult sendMessage(
-            final SignalServiceDataMessage.Builder messageBuilder, final RecipientId recipientId
-    ) throws IOException {
+            final SignalServiceDataMessage.Builder messageBuilder,
+            final RecipientId recipientId,
+            Optional<Long> editTargetTimestamp
+    ) {
         var contact = account.getContactStore().getContact(recipientId);
-        if (contact == null || !contact.isProfileSharingEnabled()) {
+        if (contact == null || !contact.isProfileSharingEnabled() || contact.isHidden()) {
             final var contactBuilder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
-            contact = contactBuilder.withProfileSharingEnabled(true).build();
+            contact = contactBuilder.withIsProfileSharingEnabled(true).withIsHidden(false).build();
             account.getContactStore().storeContact(recipientId, contact);
         }
 
-        final var expirationTime = contact.getMessageExpirationTime();
-        messageBuilder.withExpiration(expirationTime);
+        messageBuilder.withExpiration(contact.messageExpirationTime());
+        messageBuilder.withExpireTimerVersion(contact.messageExpirationTimeVersion());
 
         if (!contact.isBlocked()) {
             final var profileKey = account.getProfileKey().serialize();
@@ -90,7 +95,7 @@ public class SendHelper {
         }
 
         final var message = messageBuilder.build();
-        return sendMessage(message, recipientId);
+        return sendMessage(message, recipientId, editTargetTimestamp);
     }
 
     /**
@@ -98,10 +103,13 @@ public class SendHelper {
      * The message is extended with the current expiration timer for the group and the group context.
      */
     public List<SendMessageResult> sendAsGroupMessage(
-            SignalServiceDataMessage.Builder messageBuilder, GroupId groupId
+            final SignalServiceDataMessage.Builder messageBuilder,
+            final GroupId groupId,
+            final boolean includeSelf,
+            final Optional<Long> editTargetTimestamp
     ) throws IOException, GroupNotFoundException, NotAGroupMemberException, GroupSendingNotAllowedException {
         final var g = getGroupForSending(groupId);
-        return sendAsGroupMessage(messageBuilder, g);
+        return sendAsGroupMessage(messageBuilder, g, includeSelf, editTargetTimestamp);
     }
 
     /**
@@ -113,18 +121,20 @@ public class SendHelper {
             final Set<RecipientId> recipientIds,
             final DistributionId distributionId
     ) throws IOException {
-        return sendGroupMessage(message, recipientIds, distributionId, ContentHint.IMPLICIT);
+        return sendGroupMessage(message, recipientIds, distributionId, ContentHint.IMPLICIT, Optional.empty());
     }
 
     public SendMessageResult sendReceiptMessage(
-            final SignalServiceReceiptMessage receiptMessage, final RecipientId recipientId
+            final SignalServiceReceiptMessage receiptMessage,
+            final RecipientId recipientId
     ) {
         final var messageSendLogStore = account.getMessageSendLogStore();
         final var result = handleSendMessage(recipientId,
-                (messageSender, address, unidentifiedAccess) -> messageSender.sendReceipt(address,
+                (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.sendReceipt(address,
                         unidentifiedAccess,
-                        receiptMessage));
-        messageSendLogStore.insertIfPossible(receiptMessage.getWhen(), result, ContentHint.IMPLICIT);
+                        receiptMessage,
+                        includePniSignature));
+        messageSendLogStore.insertIfPossible(receiptMessage.getWhen(), result, ContentHint.IMPLICIT, false);
         handleSendMessageResult(result);
         return result;
     }
@@ -137,22 +147,28 @@ public class SendHelper {
                 .withProfileKey(profileKey)
                 .build();
         return handleSendMessage(recipientId,
-                (messageSender, address, unidentifiedAccess) -> messageSender.sendDataMessage(address,
+                (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.sendDataMessage(
+                        address,
                         unidentifiedAccess,
                         ContentHint.IMPLICIT,
                         message,
-                        SignalServiceMessageSender.IndividualSendEvents.EMPTY));
+                        SignalServiceMessageSender.IndividualSendEvents.EMPTY,
+                        false,
+                        includePniSignature));
     }
 
     public SendMessageResult sendRetryReceipt(
-            DecryptionErrorMessage errorMessage, RecipientId recipientId, Optional<GroupId> groupId
+            DecryptionErrorMessage errorMessage,
+            RecipientId recipientId,
+            Optional<GroupId> groupId
     ) {
         logger.debug("Sending retry receipt for {} to {}, device: {}",
                 errorMessage.getTimestamp(),
                 recipientId,
                 errorMessage.getDeviceId());
         final var result = handleSendMessage(recipientId,
-                (messageSender, address, unidentifiedAccess) -> messageSender.sendRetryReceipt(address,
+                (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.sendRetryReceipt(
+                        address,
                         unidentifiedAccess,
                         groupId.map(GroupId::serialize),
                         errorMessage));
@@ -161,61 +177,58 @@ public class SendHelper {
     }
 
     public SendMessageResult sendNullMessage(RecipientId recipientId) {
-        final var result = handleSendMessage(recipientId, SignalServiceMessageSender::sendNullMessage);
+        final var result = handleSendMessage(recipientId,
+                (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.sendNullMessage(
+                        address,
+                        unidentifiedAccess));
         handleSendMessageResult(result);
         return result;
     }
 
     public SendMessageResult sendSelfMessage(
-            SignalServiceDataMessage.Builder messageBuilder
+            SignalServiceDataMessage.Builder messageBuilder,
+            Optional<Long> editTargetTimestamp
     ) {
         final var recipientId = account.getSelfRecipientId();
         final var contact = account.getContactStore().getContact(recipientId);
-        final var expirationTime = contact != null ? contact.getMessageExpirationTime() : 0;
-        messageBuilder.withExpiration(expirationTime);
+        messageBuilder.withExpiration(contact != null ? contact.messageExpirationTime() : 0);
+        messageBuilder.withExpireTimerVersion(contact != null ? contact.messageExpirationTimeVersion() : 1);
 
         var message = messageBuilder.build();
-        return sendSelfMessage(message);
+        return sendSelfMessage(message, editTargetTimestamp);
     }
 
     public SendMessageResult sendSyncMessage(SignalServiceSyncMessage message) {
         var messageSender = dependencies.getMessageSender();
+        if (!account.isMultiDevice()) {
+            logger.trace("Not sending sync message because there are no linked devices.");
+            return SendMessageResult.success(account.getSelfAddress(), List.of(), false, false, 0, Optional.empty());
+        }
         try {
-            return messageSender.sendSyncMessage(message, context.getUnidentifiedAccessHelper().getAccessForSync());
-        } catch (UnregisteredUserException e) {
+            return messageSender.sendSyncMessage(message);
+        } catch (Throwable e) {
             var address = context.getRecipientHelper().resolveSignalServiceAddress(account.getSelfRecipientId());
-            return SendMessageResult.unregisteredFailure(address);
-        } catch (ProofRequiredException e) {
-            var address = context.getRecipientHelper().resolveSignalServiceAddress(account.getSelfRecipientId());
-            return SendMessageResult.proofRequiredFailure(address, e);
-        } catch (RateLimitException e) {
-            var address = context.getRecipientHelper().resolveSignalServiceAddress(account.getSelfRecipientId());
-            logger.warn("Sending failed due to rate limiting from the signal server: {}", e.getMessage());
-            return SendMessageResult.rateLimitFailure(address, e);
-        } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {
-            var address = context.getRecipientHelper().resolveSignalServiceAddress(account.getSelfRecipientId());
-            return SendMessageResult.identityFailure(address, e.getIdentityKey());
-        } catch (IOException e) {
-            var address = context.getRecipientHelper().resolveSignalServiceAddress(account.getSelfRecipientId());
-            logger.warn("Failed to send message due to IO exception: {}", e.getMessage());
-            return SendMessageResult.networkFailure(address);
+            try {
+                return SignalServiceMessageSender.mapSendErrorToSendResult(e, System.currentTimeMillis(), address);
+            } catch (IOException ex) {
+                logger.warn("Failed to send message due to IO exception: {}", e.getMessage());
+                logger.debug("Exception", e);
+                return SendMessageResult.networkFailure(address);
+            }
         }
     }
 
-    public SendMessageResult sendTypingMessage(
-            SignalServiceTypingMessage message, RecipientId recipientId
-    ) {
+    public SendMessageResult sendTypingMessage(SignalServiceTypingMessage message, RecipientId recipientId) {
         final var result = handleSendMessage(recipientId,
-                (messageSender, address, unidentifiedAccess) -> messageSender.sendTyping(List.of(address),
-                        List.of(unidentifiedAccess),
-                        message,
-                        null).get(0));
+                (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.sendTyping(List.of(
+                        address), List.of(unidentifiedAccess), message, null).getFirst());
         handleSendMessageResult(result);
         return result;
     }
 
     public List<SendMessageResult> sendGroupTypingMessage(
-            SignalServiceTypingMessage message, GroupId groupId
+            SignalServiceTypingMessage message,
+            GroupId groupId
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         final var g = getGroupForSending(groupId);
         if (g.isAnnouncementGroup() && !g.isAdmin(account.getSelfRecipientId())) {
@@ -228,21 +241,25 @@ public class SendHelper {
     }
 
     public SendMessageResult resendMessage(
-            final RecipientId recipientId, final long timestamp, final MessageSendLogEntry messageSendLogEntry
+            final RecipientId recipientId,
+            final long timestamp,
+            final MessageSendLogEntry messageSendLogEntry
     ) {
         logger.trace("Resending message {} to {}", timestamp, recipientId);
         if (messageSendLogEntry.groupId().isEmpty()) {
             return handleSendMessage(recipientId,
-                    (messageSender, address, unidentifiedAccess) -> messageSender.resendContent(address,
+                    (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.resendContent(
+                            address,
                             unidentifiedAccess,
                             timestamp,
                             messageSendLogEntry.content(),
                             messageSendLogEntry.contentHint(),
-                            Optional.empty()));
+                            Optional.empty(),
+                            messageSendLogEntry.urgent()));
         }
 
         final var groupId = messageSendLogEntry.groupId().get();
-        final var group = account.getGroupStore().getGroup(groupId);
+        final var group = context.getGroupHelper().getGroup(groupId);
 
         if (group == null) {
             logger.debug("Could not find a matching group for the groupId {}! Skipping message send.",
@@ -255,19 +272,20 @@ public class SendHelper {
 
         final var senderKeyDistributionMessage = dependencies.getMessageSender()
                 .getOrCreateNewGroupSession(group.getDistributionId());
-        final var distributionBytes = ByteString.copyFrom(senderKeyDistributionMessage.serialize());
+        final var distributionBytes = ByteString.of(senderKeyDistributionMessage.serialize());
         final var contentToSend = messageSendLogEntry.content()
-                .toBuilder()
-                .setSenderKeyDistributionMessage(distributionBytes)
+                .newBuilder()
+                .senderKeyDistributionMessage(distributionBytes)
                 .build();
 
         final var result = handleSendMessage(recipientId,
-                (messageSender, address, unidentifiedAccess) -> messageSender.resendContent(address,
+                (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.resendContent(address,
                         unidentifiedAccess,
                         timestamp,
                         contentToSend,
                         messageSendLogEntry.contentHint(),
-                        Optional.of(group.getGroupId().serialize())));
+                        Optional.of(group.getGroupId().serialize()),
+                        messageSendLogEntry.urgent()));
 
         if (result.isSuccess()) {
             final var address = context.getRecipientHelper().resolveSignalServiceAddress(recipientId);
@@ -275,7 +293,7 @@ public class SendHelper {
                     .getDevices()
                     .stream()
                     .map(device -> new SignalProtocolAddress(address.getIdentifier(), device))
-                    .collect(Collectors.toList());
+                    .toList();
 
             account.getSenderKeyStore().markSenderKeySharedWith(group.getDistributionId(), addresses);
         }
@@ -284,13 +302,16 @@ public class SendHelper {
     }
 
     private List<SendMessageResult> sendAsGroupMessage(
-            final SignalServiceDataMessage.Builder messageBuilder, final GroupInfo g
+            final SignalServiceDataMessage.Builder messageBuilder,
+            final GroupInfo g,
+            final boolean includeSelf,
+            final Optional<Long> editTargetTimestamp
     ) throws IOException, GroupSendingNotAllowedException {
         GroupUtils.setGroupContext(messageBuilder, g);
         messageBuilder.withExpiration(g.getMessageExpirationTimer());
 
         final var message = messageBuilder.build();
-        final var recipients = g.getMembersWithout(account.getSelfRecipientId());
+        final var recipients = includeSelf ? g.getMembers() : g.getMembersWithout(account.getSelfRecipientId());
 
         if (g.isAnnouncementGroup() && !g.isAdmin(account.getSelfRecipientId())) {
             if (message.getBody().isPresent()
@@ -303,58 +324,97 @@ public class SendHelper {
             }
         }
 
-        return sendGroupMessage(message, recipients, g.getDistributionId(), ContentHint.RESENDABLE);
+        return sendGroupMessage(message,
+                recipients,
+                g.getDistributionId(),
+                ContentHint.RESENDABLE,
+                editTargetTimestamp);
     }
 
     private List<SendMessageResult> sendGroupMessage(
             final SignalServiceDataMessage message,
             final Set<RecipientId> recipientIds,
             final DistributionId distributionId,
-            final ContentHint contentHint
+            final ContentHint contentHint,
+            final Optional<Long> editTargetTimestamp
     ) throws IOException {
         final var messageSender = dependencies.getMessageSender();
         final var messageSendLogStore = account.getMessageSendLogStore();
         final AtomicLong entryId = new AtomicLong(-1);
 
-        final LegacySenderHandler legacySender = (recipients, unidentifiedAccess, isRecipientUpdate) -> messageSender.sendDataMessage(
+        final var urgent = true;
+        final PartialSendCompleteListener partialSendCompleteListener = sendResult -> {
+            logger.trace("Partial message send result: {}", sendResult.isSuccess());
+            synchronized (entryId) {
+                if (entryId.get() == -1) {
+                    final var newId = messageSendLogStore.insertIfPossible(message.getTimestamp(),
+                            sendResult,
+                            contentHint,
+                            urgent);
+                    entryId.set(newId);
+                } else {
+                    messageSendLogStore.addRecipientToExistingEntryIfPossible(entryId.get(), sendResult);
+                }
+            }
+        };
+        final LegacySenderHandler legacySender = (recipients, unidentifiedAccess, isRecipientUpdate) ->
+                editTargetTimestamp.isEmpty()
+                        ? messageSender.sendDataMessage(recipients,
+                        unidentifiedAccess,
+                        isRecipientUpdate,
+                        contentHint,
+                        message,
+                        SignalServiceMessageSender.LegacyGroupEvents.EMPTY,
+                        partialSendCompleteListener,
+                        () -> false,
+                        urgent)
+                        : messageSender.sendEditMessage(recipients,
+                                unidentifiedAccess,
+                                isRecipientUpdate,
+                                contentHint,
+                                message,
+                                SignalServiceMessageSender.LegacyGroupEvents.EMPTY,
+                                partialSendCompleteListener,
+                                () -> false,
+                                urgent,
+                                editTargetTimestamp.get());
+        final SenderKeySenderHandler senderKeySender = (distId, recipients, unidentifiedAccess, groupSendEndorsements, isRecipientUpdate) -> messageSender.sendGroupDataMessage(
+                distId,
                 recipients,
                 unidentifiedAccess,
+                groupSendEndorsements,
                 isRecipientUpdate,
                 contentHint,
                 message,
-                SignalServiceMessageSender.LegacyGroupEvents.EMPTY,
+                SignalServiceMessageSender.SenderKeyGroupEvents.EMPTY,
+                urgent,
+                false,
+                editTargetTimestamp.map(timestamp -> new SignalServiceEditMessage(timestamp, message)).orElse(null),
                 sendResult -> {
-                    logger.trace("Partial message send result: {}", sendResult.isSuccess());
+                    logger.trace("Partial message send results: {}", sendResult.size());
                     synchronized (entryId) {
                         if (entryId.get() == -1) {
                             final var newId = messageSendLogStore.insertIfPossible(message.getTimestamp(),
                                     sendResult,
-                                    contentHint);
+                                    contentHint,
+                                    urgent);
                             entryId.set(newId);
                         } else {
                             messageSendLogStore.addRecipientToExistingEntryIfPossible(entryId.get(), sendResult);
                         }
                     }
-                },
-                () -> false);
-        final SenderKeySenderHandler senderKeySender = (distId, recipients, unidentifiedAccess, isRecipientUpdate) -> {
-            final var res = messageSender.sendGroupDataMessage(distId,
-                    recipients,
-                    unidentifiedAccess,
-                    isRecipientUpdate,
-                    contentHint,
-                    message,
-                    SignalServiceMessageSender.SenderKeyGroupEvents.EMPTY);
-            synchronized (entryId) {
-                if (entryId.get() == -1) {
-                    final var newId = messageSendLogStore.insertIfPossible(message.getTimestamp(), res, contentHint);
-                    entryId.set(newId);
-                } else {
-                    messageSendLogStore.addRecipientToExistingEntryIfPossible(entryId.get(), res);
-                }
-            }
-            return res;
-        };
+                    synchronized (entryId) {
+                        if (entryId.get() == -1) {
+                            final var newId = messageSendLogStore.insertIfPossible(message.getTimestamp(),
+                                    sendResult,
+                                    contentHint,
+                                    urgent);
+                            entryId.set(newId);
+                        } else {
+                            messageSendLogStore.addRecipientToExistingEntryIfPossible(entryId.get(), sendResult);
+                        }
+                    }
+                });
         final var results = sendGroupMessageInternal(legacySender, senderKeySender, recipientIds, distributionId);
 
         for (var r : results) {
@@ -375,9 +435,11 @@ public class SendHelper {
                         unidentifiedAccess,
                         message,
                         () -> false),
-                (distId, recipients, unidentifiedAccess, isRecipientUpdate) -> messageSender.sendGroupTyping(distId,
+                (distId, recipients, unidentifiedAccess, groupSendEndorsements, isRecipientUpdate) -> messageSender.sendGroupTyping(
+                        distId,
                         recipients,
                         unidentifiedAccess,
+                        groupSendEndorsements,
                         message),
                 recipientIds,
                 distributionId);
@@ -397,6 +459,10 @@ public class SendHelper {
         if (!g.isMember(account.getSelfRecipientId())) {
             throw new NotAGroupMemberException(groupId, g.getTitle());
         }
+        if (!g.isProfileSharingEnabled()) {
+            g.setProfileSharingEnabled(true);
+            account.getGroupStore().updateGroup(g);
+        }
         return g;
     }
 
@@ -414,7 +480,7 @@ public class SendHelper {
                 : getSenderKeyCapableRecipientIds(recipientIds);
         final var allResults = new ArrayList<SendMessageResult>(recipientIds.size());
 
-        if (senderKeyTargets.size() > 0) {
+        if (!senderKeyTargets.isEmpty()) {
             final var results = sendGroupMessageInternalWithSenderKey(senderKeySender,
                     senderKeyTargets,
                     distributionId,
@@ -424,11 +490,12 @@ public class SendHelper {
                 senderKeyTargets = Set.of();
             } else {
                 results.stream().filter(SendMessageResult::isSuccess).forEach(allResults::add);
+                final var recipientResolver = account.getRecipientResolver();
                 final var failedTargets = results.stream()
                         .filter(r -> !r.isSuccess())
-                        .map(r -> context.getRecipientHelper().resolveRecipient(r.getAddress()))
+                        .map(r -> recipientResolver.resolveRecipient(r.getAddress()))
                         .toList();
-                if (failedTargets.size() > 0) {
+                if (!failedTargets.isEmpty()) {
                     senderKeyTargets = new HashSet<>(senderKeyTargets);
                     failedTargets.forEach(senderKeyTargets::remove);
                 }
@@ -439,8 +506,8 @@ public class SendHelper {
         legacyTargets.removeAll(senderKeyTargets);
         final boolean onlyTargetIsSelfWithLinkedDevice = recipientIds.isEmpty() && account.isMultiDevice();
 
-        if (legacyTargets.size() > 0 || onlyTargetIsSelfWithLinkedDevice) {
-            if (legacyTargets.size() > 0) {
+        if (!legacyTargets.isEmpty() || onlyTargetIsSelfWithLinkedDevice) {
+            if (!legacyTargets.isEmpty()) {
                 logger.debug("Need to do {} legacy sends.", legacyTargets.size());
             } else {
                 logger.debug("Need to do a legacy send to send a sync message for a group of only ourselves.");
@@ -448,7 +515,7 @@ public class SendHelper {
 
             final List<SendMessageResult> results = sendGroupMessageInternalWithLegacy(legacySender,
                     legacyTargets,
-                    isRecipientUpdate || allResults.size() > 0);
+                    isRecipientUpdate || !allResults.isEmpty());
             allResults.addAll(results);
         }
         final var duration = Duration.ofMillis(System.currentTimeMillis() - startTime);
@@ -457,27 +524,22 @@ public class SendHelper {
     }
 
     private Set<RecipientId> getSenderKeyCapableRecipientIds(final Set<RecipientId> recipientIds) {
-        final var selfProfile = context.getProfileHelper().getSelfProfile();
-        if (selfProfile == null || !selfProfile.getCapabilities().contains(Profile.Capability.senderKey)) {
-            logger.debug("Not all of our devices support sender key. Using legacy.");
-            return Set.of();
-        }
-
         final var senderKeyTargets = new HashSet<RecipientId>();
         final var recipientList = new ArrayList<>(recipientIds);
-        final var profiles = context.getProfileHelper().getRecipientProfiles(recipientList).iterator();
         for (final var recipientId : recipientList) {
-            final var profile = profiles.next();
-            if (profile == null || !profile.getCapabilities().contains(Profile.Capability.senderKey)) {
+            final var access = context.getUnidentifiedAccessHelper().getSealedSenderAccessFor(recipientId);
+            if (access == null) {
                 continue;
             }
 
-            final var access = context.getUnidentifiedAccessHelper().getAccessFor(recipientId);
-            if (access.isEmpty() || access.get().getTargetUnidentifiedAccess().isEmpty()) {
+            final var serviceId = account.getRecipientAddressResolver()
+                    .resolveRecipientAddress(recipientId)
+                    .serviceId()
+                    .orElse(null);
+            if (serviceId == null) {
                 continue;
             }
-
-            final var identity = account.getIdentityKeyStore().getIdentity(recipientId);
+            final var identity = account.getIdentityKeyStore().getIdentityInfo(serviceId);
             if (identity == null || !identity.getTrustLevel().isTrusted()) {
                 continue;
             }
@@ -495,13 +557,16 @@ public class SendHelper {
     }
 
     private List<SendMessageResult> sendGroupMessageInternalWithLegacy(
-            final LegacySenderHandler sender, final Set<RecipientId> recipientIds, final boolean isRecipientUpdate
+            final LegacySenderHandler sender,
+            final Set<RecipientId> recipientIds,
+            final boolean isRecipientUpdate
     ) throws IOException {
         final var recipientIdList = new ArrayList<>(recipientIds);
         final var addresses = recipientIdList.stream()
                 .map(context.getRecipientHelper()::resolveSignalServiceAddress)
                 .toList();
-        final var unidentifiedAccesses = context.getUnidentifiedAccessHelper().getAccessFor(recipientIdList);
+        final var unidentifiedAccesses = context.getUnidentifiedAccessHelper()
+                .getSealedSenderAccessFor(recipientIdList);
         try {
             final var results = sender.send(addresses, unidentifiedAccesses, isRecipientUpdate);
 
@@ -522,7 +587,7 @@ public class SendHelper {
         final var recipientIdList = new ArrayList<>(recipientIds);
 
         long keyCreateTime = account.getSenderKeyStore()
-                .getCreateTimeForOurKey(account.getSelfRecipientId(), account.getDeviceId(), distributionId);
+                .getCreateTimeForOurKey(account.getAci(), account.getDeviceId(), distributionId);
         long keyAge = System.currentTimeMillis() - keyCreateTime;
 
         if (keyCreateTime != -1 && keyAge > TimeUnit.DAYS.toMillis(14)) {
@@ -531,24 +596,23 @@ public class SendHelper {
                     keyCreateTime,
                     keyAge,
                     TimeUnit.MILLISECONDS.toDays(keyAge));
-            account.getSenderKeyStore().deleteOurKey(account.getSelfRecipientId(), distributionId);
+            account.getSenderKeyStore().deleteOurKey(account.getAci(), distributionId);
         }
 
         List<SignalServiceAddress> addresses = recipientIdList.stream()
                 .map(context.getRecipientHelper()::resolveSignalServiceAddress)
-                .collect(Collectors.toList());
+                .toList();
         List<UnidentifiedAccess> unidentifiedAccesses = context.getUnidentifiedAccessHelper()
                 .getAccessFor(recipientIdList)
                 .stream()
-                .map(Optional::get)
-                .map(UnidentifiedAccessPair::getTargetUnidentifiedAccess)
-                .map(Optional::get)
-                .collect(Collectors.toList());
+                .toList();
 
+        final GroupSendEndorsements groupSendEndorsements = null;//TODO
         try {
             List<SendMessageResult> results = sender.send(distributionId,
                     addresses,
                     unidentifiedAccesses,
+                    groupSendEndorsements,
                     isRecipientUpdate);
 
             final var successCount = results.stream().filter(SendMessageResult::isSuccess).count();
@@ -564,11 +628,11 @@ public class SendHelper {
             return null;
         } catch (NoSessionException e) {
             logger.warn("No session. Falling back to legacy sends.", e);
-            account.getSenderKeyStore().deleteOurKey(account.getSelfRecipientId(), distributionId);
+            account.getSenderKeyStore().deleteOurKey(account.getAci(), distributionId);
             return null;
         } catch (InvalidKeyException e) {
             logger.warn("Invalid key. Falling back to legacy sends.", e);
-            account.getSenderKeyStore().deleteOurKey(account.getSelfRecipientId(), distributionId);
+            account.getSenderKeyStore().deleteOurKey(account.getAci(), distributionId);
             return null;
         } catch (InvalidRegistrationIdException e) {
             logger.warn("Invalid registrationId. Falling back to legacy sends.", e);
@@ -576,20 +640,42 @@ public class SendHelper {
         } catch (NotFoundException e) {
             logger.warn("Someone was unregistered. Falling back to legacy sends.", e);
             return null;
+        } catch (IOException e) {
+            if (e.getCause() instanceof InvalidKeyException) {
+                logger.warn("Invalid key. Falling back to legacy sends.", e);
+                return null;
+            } else {
+                throw e;
+            }
         }
     }
 
     private SendMessageResult sendMessage(
-            SignalServiceDataMessage message, RecipientId recipientId
+            SignalServiceDataMessage message,
+            RecipientId recipientId,
+            Optional<Long> editTargetTimestamp
     ) {
         final var messageSendLogStore = account.getMessageSendLogStore();
+        final var urgent = true;
         final var result = handleSendMessage(recipientId,
-                (messageSender, address, unidentifiedAccess) -> messageSender.sendDataMessage(address,
+                editTargetTimestamp.isEmpty()
+                        ? (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.sendDataMessage(
+                        address,
                         unidentifiedAccess,
                         ContentHint.RESENDABLE,
                         message,
-                        SignalServiceMessageSender.IndividualSendEvents.EMPTY));
-        messageSendLogStore.insertIfPossible(message.getTimestamp(), result, ContentHint.RESENDABLE);
+                        SignalServiceMessageSender.IndividualSendEvents.EMPTY,
+                        urgent,
+                        includePniSignature)
+                        : (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.sendEditMessage(
+                                address,
+                                unidentifiedAccess,
+                                ContentHint.RESENDABLE,
+                                message,
+                                SignalServiceMessageSender.IndividualSendEvents.EMPTY,
+                                urgent,
+                                editTargetTimestamp.get()));
+        messageSendLogStore.insertIfPossible(message.getTimestamp(), result, ContentHint.RESENDABLE, urgent);
         handleSendMessageResult(result);
         return result;
     }
@@ -599,8 +685,12 @@ public class SendHelper {
 
         var address = context.getRecipientHelper().resolveSignalServiceAddress(recipientId);
         try {
+            final boolean includePniSignature = account.getRecipientStore().needsPniSignature(recipientId);
             try {
-                return s.send(messageSender, address, context.getUnidentifiedAccessHelper().getAccessFor(recipientId));
+                return s.send(messageSender,
+                        address,
+                        context.getUnidentifiedAccessHelper().getSealedSenderAccessFor(recipientId),
+                        includePniSignature);
             } catch (UnregisteredUserException e) {
                 final RecipientId newRecipientId;
                 try {
@@ -611,33 +701,31 @@ public class SendHelper {
                 address = context.getRecipientHelper().resolveSignalServiceAddress(newRecipientId);
                 return s.send(messageSender,
                         address,
-                        context.getUnidentifiedAccessHelper().getAccessFor(newRecipientId));
+                        context.getUnidentifiedAccessHelper().getSealedSenderAccessFor(newRecipientId),
+                        includePniSignature);
+            }
+        } catch (Throwable e) {
+            try {
+                return SignalServiceMessageSender.mapSendErrorToSendResult(e, System.currentTimeMillis(), address);
+            } catch (IOException ex) {
+                logger.warn("Failed to send message due to IO exception: {}", e.getMessage());
+                logger.debug("Exception", e);
+                return SendMessageResult.networkFailure(address);
             }
-        } catch (UnregisteredUserException e) {
-            return SendMessageResult.unregisteredFailure(address);
-        } catch (ProofRequiredException e) {
-            return SendMessageResult.proofRequiredFailure(address, e);
-        } catch (RateLimitException e) {
-            logger.warn("Sending failed due to rate limiting from the signal server: {}", e.getMessage());
-            return SendMessageResult.rateLimitFailure(address, e);
-        } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {
-            return SendMessageResult.identityFailure(address, e.getIdentityKey());
-        } catch (IOException e) {
-            logger.warn("Failed to send message due to IO exception: {}", e.getMessage());
-            return SendMessageResult.networkFailure(address);
         }
     }
 
-    private SendMessageResult sendSelfMessage(SignalServiceDataMessage message) {
+    private SendMessageResult sendSelfMessage(SignalServiceDataMessage message, Optional<Long> editTargetTimestamp) {
         var address = account.getSelfAddress();
         var transcript = new SentTranscriptMessage(Optional.of(address),
                 message.getTimestamp(),
-                Optional.of(message),
+                editTargetTimestamp.isEmpty() ? Optional.of(message) : Optional.empty(),
                 message.getExpiresInSeconds(),
-                Map.of(address, true),
+                Map.of(address.getServiceId(), true),
                 false,
                 Optional.empty(),
-                Set.of());
+                Set.of(),
+                editTargetTimestamp.map((timestamp) -> new SignalServiceEditMessage(timestamp, message)));
         var syncMessage = SignalServiceSyncMessage.forSentTranscript(transcript);
 
         return sendSyncMessage(syncMessage);
@@ -645,7 +733,7 @@ public class SendHelper {
 
     private void handleSendMessageResult(final SendMessageResult r) {
         if (r.isSuccess() && !r.getSuccess().isUnidentified()) {
-            final var recipientId = context.getRecipientHelper().resolveRecipient(r.getAddress());
+            final var recipientId = account.getRecipientResolver().resolveRecipient(r.getAddress());
             final var profile = account.getProfileStore().getProfile(recipientId);
             if (profile != null && (
                     profile.getUnidentifiedAccessMode() == Profile.UnidentifiedAccessMode.ENABLED
@@ -659,7 +747,7 @@ public class SendHelper {
             }
         }
         if (r.isUnregisteredFailure()) {
-            final var recipientId = context.getRecipientHelper().resolveRecipient(r.getAddress());
+            final var recipientId = account.getRecipientResolver().resolveRecipient(r.getAddress());
             final var profile = account.getProfileStore().getProfile(recipientId);
             if (profile != null && (
                     profile.getUnidentifiedAccessMode() == Profile.UnidentifiedAccessMode.ENABLED
@@ -673,8 +761,9 @@ public class SendHelper {
             }
         }
         if (r.getIdentityFailure() != null) {
-            final var recipientId = context.getRecipientHelper().resolveRecipient(r.getAddress());
-            context.getIdentityHelper().handleIdentityFailure(recipientId, r.getIdentityFailure());
+            final var recipientId = account.getRecipientResolver().resolveRecipient(r.getAddress());
+            context.getIdentityHelper()
+                    .handleIdentityFailure(recipientId, r.getAddress().getServiceId(), r.getIdentityFailure());
         }
     }
 
@@ -683,7 +772,8 @@ public class SendHelper {
         SendMessageResult send(
                 SignalServiceMessageSender messageSender,
                 SignalServiceAddress address,
-                Optional<UnidentifiedAccessPair> unidentifiedAccess
+                @Nullable SealedSenderAccess unidentifiedAccess,
+                boolean includePniSignature
         ) throws IOException, UnregisteredUserException, ProofRequiredException, RateLimitException, org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
     }
 
@@ -693,6 +783,7 @@ public class SendHelper {
                 DistributionId distributionId,
                 List<SignalServiceAddress> recipients,
                 List<UnidentifiedAccess> unidentifiedAccess,
+                GroupSendEndorsements groupSendEndorsements,
                 boolean isRecipientUpdate
         ) throws IOException, UntrustedIdentityException, NoSessionException, InvalidKeyException, InvalidRegistrationIdException;
     }
@@ -701,7 +792,7 @@ public class SendHelper {
 
         List<SendMessageResult> send(
                 List<SignalServiceAddress> recipients,
-                List<Optional<UnidentifiedAccessPair>> unidentifiedAccess,
+                List<SealedSenderAccess> unidentifiedAccess,
                 boolean isRecipientUpdate
         ) throws IOException, UntrustedIdentityException;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
index c67a6573..b6d90ff9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
@@ -1,10 +1,11 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.api.InvalidStickerException;
 import org.asamk.signal.manager.api.StickerPackId;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.stickerPacks.JsonStickerPack;
+import org.asamk.signal.manager.storage.stickers.StickerPack;
 import org.asamk.signal.manager.util.IOUtils;
 import org.signal.libsignal.protocol.InvalidMessageException;
 import org.slf4j.Logger;
@@ -16,7 +17,7 @@ import java.util.HashSet;
 
 public class StickerHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(StickerHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(StickerHelper.class);
 
     private final Context context;
     private final SignalAccount account;
@@ -28,15 +29,36 @@ public class StickerHelper {
         this.context = context;
     }
 
-    public JsonStickerPack getOrRetrieveStickerPack(
-            StickerPackId packId, byte[] packKey
-    ) throws InvalidStickerException {
-        if (!context.getStickerPackStore().existsStickerPack(packId)) {
-            try {
-                retrieveStickerPack(packId, packKey);
-            } catch (InvalidMessageException | IOException e) {
-                throw new InvalidStickerException("Failed to retrieve sticker pack");
+    public StickerPack addOrUpdateStickerPack(
+            final StickerPackId stickerPackId,
+            final byte[] stickerPackKey,
+            final boolean installed
+    ) {
+        final var sticker = account.getStickerStore().getStickerPack(stickerPackId);
+        if (sticker != null) {
+            if (sticker.isInstalled() != installed) {
+                account.getStickerStore().updateStickerPackInstalled(sticker.packId(), installed);
             }
+            return sticker;
+        }
+
+        if (stickerPackKey == null) {
+            return null;
+        }
+
+        final var newSticker = new StickerPack(-1, stickerPackId, stickerPackKey, installed);
+        account.getStickerStore().addStickerPack(newSticker);
+        return newSticker;
+    }
+
+    public JsonStickerPack getOrRetrieveStickerPack(
+            StickerPackId packId,
+            byte[] packKey
+    ) throws InvalidStickerException {
+        try {
+            retrieveStickerPack(packId, packKey);
+        } catch (InvalidMessageException | IOException e) {
+            throw new InvalidStickerException("Failed to retrieve sticker pack");
         }
         final JsonStickerPack manifest;
         try {
@@ -48,6 +70,10 @@ public class StickerHelper {
     }
 
     public void retrieveStickerPack(StickerPackId packId, byte[] packKey) throws InvalidMessageException, IOException {
+        if (context.getStickerPackStore().existsStickerPack(packId)) {
+            logger.debug("Sticker pack {} already downloaded.", Hex.toStringCondensed(packId.serialize()));
+            return;
+        }
         logger.debug("Retrieving sticker pack {}.", Hex.toStringCondensed(packId.serialize()));
         final var messageReceiver = dependencies.getMessageReceiver();
         final var manifest = messageReceiver.retrieveStickerManifest(packId.serialize(), packKey);
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index 281901c1..14db7c13 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -1,37 +1,55 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.SignalDependencies;
-import org.asamk.signal.manager.api.PhoneNumberSharingMode;
-import org.asamk.signal.manager.api.TrustLevel;
-import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.api.GroupIdV1;
+import org.asamk.signal.manager.api.GroupIdV2;
+import org.asamk.signal.manager.api.Profile;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
-import org.asamk.signal.manager.storage.recipients.Contact;
-import org.signal.libsignal.protocol.IdentityKey;
+import org.asamk.signal.manager.storage.recipients.RecipientId;
+import org.asamk.signal.manager.syncStorage.AccountRecordProcessor;
+import org.asamk.signal.manager.syncStorage.ContactRecordProcessor;
+import org.asamk.signal.manager.syncStorage.GroupV1RecordProcessor;
+import org.asamk.signal.manager.syncStorage.GroupV2RecordProcessor;
+import org.asamk.signal.manager.syncStorage.StorageSyncModels;
+import org.asamk.signal.manager.syncStorage.StorageSyncValidations;
+import org.asamk.signal.manager.syncStorage.WriteOperationResult;
+import org.asamk.signal.manager.util.KeyUtils;
+import org.signal.core.util.SetUtil;
 import org.signal.libsignal.protocol.InvalidKeyException;
-import org.signal.libsignal.zkgroup.InvalidInputException;
-import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
-import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
+import org.whispersystems.signalservice.api.storage.RecordIkm;
 import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
 import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
 import org.whispersystems.signalservice.api.storage.StorageId;
-import org.whispersystems.signalservice.internal.storage.protos.AccountRecord;
+import org.whispersystems.signalservice.api.storage.StorageKey;
+import org.whispersystems.signalservice.api.storage.StorageRecordConvertersKt;
+import org.whispersystems.signalservice.api.storage.StorageServiceRepository;
+import org.whispersystems.signalservice.api.storage.StorageServiceRepository.ManifestIfDifferentVersionResult;
+import org.whispersystems.signalservice.api.storage.StorageServiceRepository.WriteStorageRecordsResult;
 import org.whispersystems.signalservice.internal.storage.protos.ManifestRecord;
+import org.whispersystems.signalservice.internal.storage.protos.StorageRecord;
 
 import java.io.IOException;
+import java.sql.Connection;
+import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
-import java.util.Optional;
+import java.util.Map;
 import java.util.stream.Collectors;
 
+import static org.asamk.signal.manager.util.Utils.handleResponseException;
+
 public class StorageHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(StorageHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(StorageHelper.class);
+    private static final List<Integer> KNOWN_TYPES = List.of(ManifestRecord.Identifier.Type.CONTACT.getValue(),
+            ManifestRecord.Identifier.Type.GROUPV1.getValue(),
+            ManifestRecord.Identifier.Type.GROUPV2.getValue(),
+            ManifestRecord.Identifier.Type.ACCOUNT.getValue());
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
@@ -43,228 +61,616 @@ public class StorageHelper {
         this.context = context;
     }
 
-    public void readDataFromStorage() throws IOException {
-        logger.debug("Reading data from remote storage");
-        Optional<SignalStorageManifest> manifest;
-        try {
-            manifest = dependencies.getAccountManager()
-                    .getStorageManifestIfDifferentVersion(account.getStorageKey(), account.getStorageManifestVersion());
-        } catch (InvalidKeyException e) {
-            logger.warn("Manifest couldn't be decrypted, ignoring.");
-            return;
-        }
-
-        if (manifest.isEmpty()) {
-            logger.debug("Manifest is up to date, does not exist or couldn't be decrypted, ignoring.");
-            return;
-        }
-
-        logger.trace("Remote storage manifest has {} records", manifest.get().getStorageIds().size());
-        final var storageIds = manifest.get()
-                .getStorageIds()
-                .stream()
-                .filter(id -> !id.isUnknown())
-                .collect(Collectors.toSet());
-
-        Optional<SignalStorageManifest> localManifest = account.getStorageManifest();
-        localManifest.ifPresent(m -> m.getStorageIds().forEach(storageIds::remove));
-
-        logger.trace("Reading {} new records", manifest.get().getStorageIds().size());
-        for (final var record : getSignalStorageRecords(storageIds)) {
-            logger.debug("Reading record of type {}", record.getType());
-            if (record.getType() == ManifestRecord.Identifier.Type.ACCOUNT_VALUE) {
-                readAccountRecord(record);
-            } else if (record.getType() == ManifestRecord.Identifier.Type.GROUPV2_VALUE) {
-                readGroupV2Record(record);
-            } else if (record.getType() == ManifestRecord.Identifier.Type.GROUPV1_VALUE) {
-                readGroupV1Record(record);
-            } else if (record.getType() == ManifestRecord.Identifier.Type.CONTACT_VALUE) {
-                readContactRecord(record);
+    public void syncDataWithStorage() throws IOException {
+        var storageKey = account.getOrCreateStorageKey();
+        if (storageKey == null) {
+            if (!account.isPrimaryDevice()) {
+                logger.debug("Storage key unknown, requesting from primary device.");
+                context.getSyncHelper().requestSyncKeys();
             }
-        }
-        account.setStorageManifestVersion(manifest.get().getVersion());
-        account.setStorageManifest(manifest.get());
-        logger.debug("Done reading data from remote storage");
-    }
-
-    private void readContactRecord(final SignalStorageRecord record) {
-        if (record == null || record.getContact().isEmpty()) {
             return;
         }
 
-        final var contactRecord = record.getContact().get();
-        final var address = contactRecord.getAddress();
+        logger.trace("Reading manifest from remote storage");
+        final var localManifestVersion = account.getStorageManifestVersion();
+        final var localManifest = account.getStorageManifest().orElse(SignalStorageManifest.Companion.getEMPTY());
+        final var storageServiceRepository = dependencies.getStorageServiceRepository();
+        final var result = storageServiceRepository.getStorageManifestIfDifferentVersion(storageKey,
+                localManifestVersion);
 
-        final var recipientId = account.getRecipientResolver().resolveRecipient(address);
-        final var contact = account.getContactStore().getContact(recipientId);
-        final var blocked = contact != null && contact.isBlocked();
-        final var profileShared = contact != null && contact.isProfileSharingEnabled();
-        final var givenName = contact == null ? null : contact.getGivenName();
-        final var familyName = contact == null ? null : contact.getFamilyName();
-        if ((contactRecord.getGivenName().isPresent() && !contactRecord.getGivenName().get().equals(givenName)) || (
-                contactRecord.getFamilyName().isPresent() && !contactRecord.getFamilyName().get().equals(familyName)
-        ) || blocked != contactRecord.isBlocked() || profileShared != contactRecord.isProfileSharingEnabled()) {
-            logger.debug("Storing new or updated contact {}", recipientId);
-            final var contactBuilder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
-            final var newContact = contactBuilder.withBlocked(contactRecord.isBlocked())
-                    .withGivenName(contactRecord.getGivenName().orElse(null))
-                    .withFamilyName(contactRecord.getFamilyName().orElse(null))
-                    .withProfileSharingEnabled(contactRecord.isProfileSharingEnabled())
-                    .build();
-            account.getContactStore().storeContact(recipientId, newContact);
-        }
-
-        if (contactRecord.getProfileKey().isPresent()) {
-            try {
-                logger.trace("Storing profile key {}", recipientId);
-                final var profileKey = new ProfileKey(contactRecord.getProfileKey().get());
-                account.getProfileStore().storeProfileKey(recipientId, profileKey);
-            } catch (InvalidInputException e) {
-                logger.warn("Received invalid contact profile key from storage");
+        var needsForcePush = false;
+        final var remoteManifest = switch (result) {
+            case ManifestIfDifferentVersionResult.DifferentVersion diff -> {
+                final var manifest = diff.getManifest();
+                storeManifestLocally(manifest);
+                yield manifest;
             }
-        }
-        if (contactRecord.getIdentityKey().isPresent()) {
-            try {
-                logger.trace("Storing identity key {}", recipientId);
-                final var identityKey = new IdentityKey(contactRecord.getIdentityKey().get());
-                account.getIdentityKeyStore().saveIdentity(recipientId, identityKey, new Date());
-
-                final var trustLevel = TrustLevel.fromIdentityState(contactRecord.getIdentityState());
-                if (trustLevel != null) {
-                    account.getIdentityKeyStore().setIdentityTrustLevel(recipientId, identityKey, trustLevel);
+            case ManifestIfDifferentVersionResult.DecryptionError ignore -> {
+                logger.warn("Manifest couldn't be decrypted.");
+                if (account.isPrimaryDevice()) {
+                    needsForcePush = true;
+                } else {
+                    context.getSyncHelper().requestSyncKeys();
                 }
-            } catch (InvalidKeyException e) {
-                logger.warn("Received invalid contact identity key from storage");
+                yield null;
             }
-        }
-    }
+            case ManifestIfDifferentVersionResult.SameVersion ignored -> localManifest;
+            case ManifestIfDifferentVersionResult.NetworkError e -> throw e.getException();
+            case ManifestIfDifferentVersionResult.StatusCodeError e -> throw e.getException();
+            default -> throw new RuntimeException("Unhandled ManifestIfDifferentVersionResult type");
+        };
 
-    private void readGroupV1Record(final SignalStorageRecord record) {
-        if (record == null || record.getGroupV1().isEmpty()) {
-            return;
+        if (remoteManifest != null) {
+            logger.trace("Manifest versions: local {}, remote {}", localManifestVersion, remoteManifest.version);
+
+            if (remoteManifest.version > localManifestVersion) {
+                logger.trace("Remote version was newer, reading records.");
+                needsForcePush = readDataFromStorage(storageKey, localManifest, remoteManifest);
+            } else if (remoteManifest.version < localManifest.version) {
+                logger.debug("Remote storage manifest version was older. User might have switched accounts.");
+            }
+            logger.trace("Done reading data from remote storage");
+
+            readRecordsWithPreviouslyUnknownTypes(storageKey, remoteManifest);
         }
 
-        final var groupV1Record = record.getGroupV1().get();
-        final var groupIdV1 = GroupId.v1(groupV1Record.getGroupId());
+        logger.trace("Adding missing storageIds to local data");
+        account.getRecipientStore().setMissingStorageIds();
+        account.getGroupStore().setMissingStorageIds();
 
-        var group = account.getGroupStore().getGroup(groupIdV1);
-        if (group == null) {
+        var needsMultiDeviceSync = false;
+
+        if (account.needsStorageKeyMigration()) {
+            logger.debug("Storage needs force push due to new account entropy pool");
+            // Set new aep and reset previous master key and storage key
+            account.setAccountEntropyPool(account.getOrCreateAccountEntropyPool());
+            storageKey = account.getOrCreateStorageKey();
+            context.getSyncHelper().sendKeysMessage();
+            needsForcePush = true;
+        } else if (remoteManifest == null) {
+            if (account.isPrimaryDevice()) {
+                needsForcePush = true;
+            }
+        } else if (remoteManifest.recordIkm == null && account.getSelfRecipientProfile()
+                .getCapabilities()
+                .contains(Profile.Capability.storageServiceEncryptionV2Capability)) {
+            logger.debug("The SSRE2 capability is supported, but no recordIkm is set! Force pushing.");
+            needsForcePush = true;
+        } else {
             try {
-                context.getGroupHelper().sendGroupInfoRequest(groupIdV1, account.getSelfRecipientId());
-            } catch (Throwable e) {
-                logger.warn("Failed to send group request", e);
+                needsMultiDeviceSync = writeToStorage(storageKey, remoteManifest, needsForcePush);
+            } catch (RetryLaterException e) {
+                // TODO retry later
+                return;
             }
-            group = account.getGroupStore().getOrCreateGroupV1(groupIdV1);
-        }
-        if (group != null && group.isBlocked() != groupV1Record.isBlocked()) {
-            group.setBlocked(groupV1Record.isBlocked());
-            account.getGroupStore().updateGroup(group);
-        }
-    }
-
-    private void readGroupV2Record(final SignalStorageRecord record) {
-        if (record == null || record.getGroupV2().isEmpty()) {
-            return;
         }
 
-        final var groupV2Record = record.getGroupV2().get();
-        if (groupV2Record.isArchived()) {
-            return;
-        }
-
-        final GroupMasterKey groupMasterKey;
-        try {
-            groupMasterKey = new GroupMasterKey(groupV2Record.getMasterKeyBytes());
-        } catch (InvalidInputException e) {
-            logger.warn("Received invalid group master key from storage");
-            return;
-        }
-
-        final var group = context.getGroupHelper().getOrMigrateGroup(groupMasterKey, 0, null);
-        if (group.isBlocked() != groupV2Record.isBlocked()) {
-            group.setBlocked(groupV2Record.isBlocked());
-            account.getGroupStore().updateGroup(group);
-        }
-    }
-
-    private void readAccountRecord(final SignalStorageRecord record) throws IOException {
-        if (record == null) {
-            logger.warn("Could not find account record, even though we had an ID, ignoring.");
-            return;
-        }
-
-        SignalAccountRecord accountRecord = record.getAccount().orElse(null);
-        if (accountRecord == null) {
-            logger.warn("The storage record didn't actually have an account, ignoring.");
-            return;
-        }
-
-        if (!accountRecord.getE164().equals(account.getNumber())) {
-            context.getAccountHelper().checkWhoAmiI();
-        }
-
-        account.getConfigurationStore().setReadReceipts(accountRecord.isReadReceiptsEnabled());
-        account.getConfigurationStore().setTypingIndicators(accountRecord.isTypingIndicatorsEnabled());
-        account.getConfigurationStore()
-                .setUnidentifiedDeliveryIndicators(accountRecord.isSealedSenderIndicatorsEnabled());
-        account.getConfigurationStore().setLinkPreviews(accountRecord.isLinkPreviewsEnabled());
-        if (accountRecord.getPhoneNumberSharingMode() != AccountRecord.PhoneNumberSharingMode.UNRECOGNIZED) {
-            account.getConfigurationStore()
-                    .setPhoneNumberSharingMode(switch (accountRecord.getPhoneNumberSharingMode()) {
-                        case EVERYBODY -> PhoneNumberSharingMode.EVERYBODY;
-                        case NOBODY -> PhoneNumberSharingMode.NOBODY;
-                        default -> PhoneNumberSharingMode.CONTACTS;
-                    });
-        }
-        account.getConfigurationStore().setPhoneNumberUnlisted(accountRecord.isPhoneNumberUnlisted());
-
-        if (accountRecord.getProfileKey().isPresent()) {
-            ProfileKey profileKey;
+        if (needsForcePush) {
+            logger.debug("Doing a force push.");
             try {
-                profileKey = new ProfileKey(accountRecord.getProfileKey().get());
-            } catch (InvalidInputException e) {
-                logger.warn("Received invalid profile key from storage");
-                profileKey = null;
-            }
-            if (profileKey != null) {
-                account.setProfileKey(profileKey);
-                final var avatarPath = accountRecord.getAvatarUrlPath().orElse(null);
-                context.getProfileHelper().downloadProfileAvatar(account.getSelfRecipientId(), avatarPath, profileKey);
+                forcePushToStorage(storageKey);
+                needsMultiDeviceSync = true;
+            } catch (RetryLaterException e) {
+                // TODO retry later
+                return;
             }
         }
 
-        context.getProfileHelper()
-                .setProfile(false,
-                        false,
-                        accountRecord.getGivenName().orElse(null),
-                        accountRecord.getFamilyName().orElse(null),
-                        null,
-                        null,
-                        null,
-                        null);
-    }
-
-    private SignalStorageRecord getSignalStorageRecord(final StorageId accountId) throws IOException {
-        List<SignalStorageRecord> records;
-        try {
-            records = dependencies.getAccountManager()
-                    .readStorageRecords(account.getStorageKey(), Collections.singletonList(accountId));
-        } catch (InvalidKeyException e) {
-            logger.warn("Failed to read storage records, ignoring.");
-            return null;
+        if (needsMultiDeviceSync) {
+            context.getSyncHelper().sendSyncFetchStorageMessage();
         }
-        return records.size() > 0 ? records.get(0) : null;
+
+        logger.debug("Done syncing data with remote storage");
     }
 
-    private List<SignalStorageRecord> getSignalStorageRecords(final Collection<StorageId> storageIds) throws IOException {
-        List<SignalStorageRecord> records;
+    public void forcePushToStorage() throws IOException {
+        if (!account.isPrimaryDevice()) {
+            return;
+        }
+
+        final var storageKey = account.getOrCreateStorageKey();
+        if (storageKey == null) {
+            return;
+        }
+
         try {
-            records = dependencies.getAccountManager()
-                    .readStorageRecords(account.getStorageKey(), new ArrayList<>(storageIds));
-        } catch (InvalidKeyException e) {
-            logger.warn("Failed to read storage records, ignoring.");
-            return List.of();
+            forcePushToStorage(storageKey);
+        } catch (RetryLaterException e) {
+            // TODO retry later
+        }
+    }
+
+    private boolean readDataFromStorage(
+            final StorageKey storageKey,
+            final SignalStorageManifest localManifest,
+            final SignalStorageManifest remoteManifest
+    ) throws IOException {
+        var needsForcePush = false;
+        try (final var connection = account.getAccountDatabase().getConnection()) {
+            connection.setAutoCommit(false);
+
+            var idDifference = findIdDifference(remoteManifest.storageIds, localManifest.storageIds);
+
+            if (idDifference.hasTypeMismatches() && account.isPrimaryDevice()) {
+                logger.debug("Found type mismatches in the ID sets! Scheduling a force push after this sync completes.");
+                needsForcePush = true;
+            }
+
+            logger.debug("Pre-Merge ID Difference :: {}", idDifference);
+
+            if (!idDifference.isEmpty()) {
+                final var remoteOnlyRecords = getSignalStorageRecords(storageKey,
+                        remoteManifest,
+                        idDifference.remoteOnlyIds());
+
+                if (remoteOnlyRecords.size() != idDifference.remoteOnlyIds().size()) {
+                    logger.debug(
+                            "Could not find all remote-only records! Requested: {}, Found: {}. These stragglers should naturally get deleted during the sync.",
+                            idDifference.remoteOnlyIds().size(),
+                            remoteOnlyRecords.size());
+                }
+
+                if (!idDifference.localOnlyIds().isEmpty()) {
+                    final var updated = account.getRecipientStore()
+                            .removeStorageIdsFromLocalOnlyUnregisteredRecipients(connection,
+                                    idDifference.localOnlyIds());
+
+                    if (updated > 0) {
+                        logger.warn(
+                                "Found {} records that were deleted remotely but only marked unregistered locally. Removed those from local store.",
+                                updated);
+                    }
+                }
+
+                final var unknownInserts = processKnownRecords(connection, remoteOnlyRecords);
+                final var unknownDeletes = idDifference.localOnlyIds()
+                        .stream()
+                        .filter(id -> !KNOWN_TYPES.contains(id.getType()))
+                        .toList();
+
+                logger.debug("Storage ids with unknown type: {} inserts, {} deletes",
+                        unknownInserts.size(),
+                        unknownDeletes.size());
+
+                account.getUnknownStorageIdStore().addUnknownStorageIds(connection, unknownInserts);
+                account.getUnknownStorageIdStore().deleteUnknownStorageIds(connection, unknownDeletes);
+            } else {
+                logger.debug("Remote version was newer, but there were no remote-only IDs.");
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed to sync remote storage", e);
+        }
+        return needsForcePush;
+    }
+
+    private void readRecordsWithPreviouslyUnknownTypes(
+            final StorageKey storageKey,
+            final SignalStorageManifest remoteManifest
+    ) throws IOException {
+        try (final var connection = account.getAccountDatabase().getConnection()) {
+            connection.setAutoCommit(false);
+            final var knownUnknownIds = account.getUnknownStorageIdStore()
+                    .getUnknownStorageIds(connection, KNOWN_TYPES);
+
+            if (!knownUnknownIds.isEmpty()) {
+                logger.debug("We have {} unknown records that we can now process.", knownUnknownIds.size());
+
+                final var remote = getSignalStorageRecords(storageKey, remoteManifest, knownUnknownIds);
+
+                logger.debug("Found {} of the known-unknowns remotely.", remote.size());
+
+                processKnownRecords(connection, remote);
+                account.getUnknownStorageIdStore()
+                        .deleteUnknownStorageIds(connection, remote.stream().map(SignalStorageRecord::getId).toList());
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed to sync remote storage", e);
+        }
+    }
+
+    private boolean writeToStorage(
+            final StorageKey storageKey,
+            final SignalStorageManifest remoteManifest,
+            final boolean needsForcePush
+    ) throws IOException, RetryLaterException {
+        final WriteOperationResult remoteWriteOperation;
+        try (final var connection = account.getAccountDatabase().getConnection()) {
+            connection.setAutoCommit(false);
+
+            var localStorageIds = getAllLocalStorageIds(connection);
+            var idDifference = findIdDifference(remoteManifest.storageIds, localStorageIds);
+            logger.debug("ID Difference :: {}", idDifference);
+
+            final var unknownOnlyLocal = idDifference.localOnlyIds()
+                    .stream()
+                    .filter(id -> !KNOWN_TYPES.contains(id.getType()))
+                    .toList();
+
+            if (!unknownOnlyLocal.isEmpty()) {
+                logger.debug("Storage ids with unknown type: {} to delete", unknownOnlyLocal.size());
+                account.getUnknownStorageIdStore().deleteUnknownStorageIds(connection, unknownOnlyLocal);
+                localStorageIds = getAllLocalStorageIds(connection);
+                idDifference = findIdDifference(remoteManifest.storageIds, localStorageIds);
+            }
+
+            final var remoteDeletes = idDifference.remoteOnlyIds().stream().map(StorageId::getRaw).toList();
+            final var remoteInserts = buildLocalStorageRecords(connection, idDifference.localOnlyIds());
+            // TODO check if local storage record proto matches remote, then reset to remote storage_id
+
+            remoteWriteOperation = new WriteOperationResult(new SignalStorageManifest(remoteManifest.version + 1,
+                    account.getDeviceId(),
+                    remoteManifest.recordIkm,
+                    localStorageIds), remoteInserts, remoteDeletes);
+
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed to sync remote storage", e);
+        }
+
+        if (remoteWriteOperation.isEmpty()) {
+            logger.debug("No remote writes needed. Still at version: {}", remoteManifest.version);
+            return false;
+        }
+
+        logger.debug("We have something to write remotely.");
+        logger.debug("WriteOperationResult :: {}", remoteWriteOperation);
+
+        StorageSyncValidations.validate(remoteWriteOperation,
+                remoteManifest,
+                needsForcePush,
+                account.getSelfRecipientAddress());
+
+        final var result = dependencies.getStorageServiceRepository()
+                .writeStorageRecords(storageKey,
+                        remoteWriteOperation.manifest(),
+                        remoteWriteOperation.inserts(),
+                        remoteWriteOperation.deletes());
+        switch (result) {
+            case WriteStorageRecordsResult.ConflictError ignored -> {
+                logger.debug("Hit a conflict when trying to resolve the conflict! Retrying.");
+                throw new RetryLaterException();
+            }
+            case WriteStorageRecordsResult.NetworkError networkError -> throw networkError.getException();
+            case WriteStorageRecordsResult.StatusCodeError statusCodeError -> throw statusCodeError.getException();
+            case WriteStorageRecordsResult.Success ignored -> {
+                logger.debug("Saved new manifest. Now at version: {}", remoteWriteOperation.manifest().version);
+                storeManifestLocally(remoteWriteOperation.manifest());
+                return true;
+            }
+            default -> throw new IllegalStateException("Unexpected value: " + result);
+        }
+    }
+
+    private void forcePushToStorage(
+            final StorageKey storageServiceKey
+    ) throws IOException, RetryLaterException {
+        logger.debug("Force pushing local state to remote storage");
+
+        final var currentVersion = handleResponseException(dependencies.getStorageServiceRepository()
+                .getManifestVersion());
+        final var newVersion = currentVersion + 1;
+        final var newStorageRecords = new ArrayList<SignalStorageRecord>();
+        final Map<RecipientId, StorageId> newContactStorageIds;
+        final Map<GroupIdV1, StorageId> newGroupV1StorageIds;
+        final Map<GroupIdV2, StorageId> newGroupV2StorageIds;
+
+        try (final var connection = account.getAccountDatabase().getConnection()) {
+            connection.setAutoCommit(false);
+
+            final var recipientIds = account.getRecipientStore().getRecipientIds(connection);
+            newContactStorageIds = generateContactStorageIds(recipientIds);
+            for (final var recipientId : recipientIds) {
+                final var storageId = newContactStorageIds.get(recipientId);
+                if (storageId.getType() == ManifestRecord.Identifier.Type.ACCOUNT.getValue()) {
+                    final var recipient = account.getRecipientStore().getRecipient(connection, recipientId);
+                    final var accountRecord = StorageSyncModels.localToRemoteRecord(connection,
+                            account.getConfigurationStore(),
+                            recipient,
+                            account.getUsernameLink());
+                    newStorageRecords.add(new SignalStorageRecord(storageId,
+                            new StorageRecord.Builder().account(accountRecord).build()));
+                } else {
+                    final var recipient = account.getRecipientStore().getRecipient(connection, recipientId);
+                    final var address = recipient.getAddress().getIdentifier();
+                    final var identity = account.getIdentityKeyStore().getIdentityInfo(connection, address);
+                    final var record = StorageSyncModels.localToRemoteRecord(recipient, identity);
+                    newStorageRecords.add(new SignalStorageRecord(storageId,
+                            new StorageRecord.Builder().contact(record).build()));
+                }
+            }
+
+            final var groupV1Ids = account.getGroupStore().getGroupV1Ids(connection);
+            newGroupV1StorageIds = generateGroupV1StorageIds(groupV1Ids);
+            for (final var groupId : groupV1Ids) {
+                final var storageId = newGroupV1StorageIds.get(groupId);
+                final var group = account.getGroupStore().getGroup(connection, groupId);
+                final var record = StorageSyncModels.localToRemoteRecord(group);
+                newStorageRecords.add(new SignalStorageRecord(storageId,
+                        new StorageRecord.Builder().groupV1(record).build()));
+            }
+
+            final var groupV2Ids = account.getGroupStore().getGroupV2Ids(connection);
+            newGroupV2StorageIds = generateGroupV2StorageIds(groupV2Ids);
+            for (final var groupId : groupV2Ids) {
+                final var storageId = newGroupV2StorageIds.get(groupId);
+                final var group = account.getGroupStore().getGroup(connection, groupId);
+                final var record = StorageSyncModels.localToRemoteRecord(group);
+                newStorageRecords.add(new SignalStorageRecord(storageId,
+                        new StorageRecord.Builder().groupV2(record).build()));
+            }
+
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed to sync remote storage", e);
+        }
+        final var newStorageIds = newStorageRecords.stream().map(SignalStorageRecord::getId).toList();
+
+        final RecordIkm recordIkm;
+        if (account.getSelfRecipientProfile()
+                .getCapabilities()
+                .contains(Profile.Capability.storageServiceEncryptionV2Capability)) {
+            logger.debug("Generating and including a new recordIkm.");
+            recordIkm = RecordIkm.Companion.generate();
+        } else {
+            logger.debug("SSRE2 not yet supported. Not including recordIkm.");
+            recordIkm = null;
+        }
+
+        final var manifest = new SignalStorageManifest(newVersion, account.getDeviceId(), recordIkm, newStorageIds);
+
+        StorageSyncValidations.validateForcePush(manifest, newStorageRecords, account.getSelfRecipientAddress());
+
+        final WriteStorageRecordsResult result;
+        if (newVersion > 1) {
+            logger.trace("Force-pushing data. Inserting {} IDs.", newStorageRecords.size());
+            result = dependencies.getStorageServiceRepository()
+                    .resetAndWriteStorageRecords(storageServiceKey, manifest, newStorageRecords);
+        } else {
+            logger.trace("First version, normal push. Inserting {} IDs.", newStorageRecords.size());
+            result = dependencies.getStorageServiceRepository()
+                    .writeStorageRecords(storageServiceKey, manifest, newStorageRecords, Collections.emptyList());
+        }
+
+        switch (result) {
+            case WriteStorageRecordsResult.ConflictError ignored -> {
+                logger.debug("Hit a conflict. Trying again.");
+                throw new RetryLaterException();
+            }
+            case WriteStorageRecordsResult.NetworkError networkError -> throw networkError.getException();
+            case WriteStorageRecordsResult.StatusCodeError statusCodeError -> throw statusCodeError.getException();
+            case WriteStorageRecordsResult.Success ignored -> {
+                logger.debug("Force push succeeded. Updating local manifest version to: {}", manifest.version);
+                storeManifestLocally(manifest);
+            }
+            default -> throw new IllegalStateException("Unexpected value: " + result);
+        }
+
+        try (final var connection = account.getAccountDatabase().getConnection()) {
+            connection.setAutoCommit(false);
+            account.getRecipientStore().updateStorageIds(connection, newContactStorageIds);
+            account.getGroupStore().updateStorageIds(connection, newGroupV1StorageIds, newGroupV2StorageIds);
+
+            // delete all unknown storage ids
+            account.getUnknownStorageIdStore().deleteAllUnknownStorageIds(connection);
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed to sync remote storage", e);
+        }
+    }
+
+    private Map<RecipientId, StorageId> generateContactStorageIds(List<RecipientId> recipientIds) {
+        final var selfRecipientId = account.getSelfRecipientId();
+        return recipientIds.stream().collect(Collectors.toMap(recipientId -> recipientId, recipientId -> {
+            if (recipientId.equals(selfRecipientId)) {
+                return StorageId.forAccount(KeyUtils.createRawStorageId());
+            } else {
+                return StorageId.forContact(KeyUtils.createRawStorageId());
+            }
+        }));
+    }
+
+    private Map<GroupIdV1, StorageId> generateGroupV1StorageIds(List<GroupIdV1> groupIds) {
+        return groupIds.stream()
+                .collect(Collectors.toMap(recipientId -> recipientId,
+                        recipientId -> StorageId.forGroupV1(KeyUtils.createRawStorageId())));
+    }
+
+    private Map<GroupIdV2, StorageId> generateGroupV2StorageIds(List<GroupIdV2> groupIds) {
+        return groupIds.stream()
+                .collect(Collectors.toMap(recipientId -> recipientId,
+                        recipientId -> StorageId.forGroupV2(KeyUtils.createRawStorageId())));
+    }
+
+    private void storeManifestLocally(
+            final SignalStorageManifest remoteManifest
+    ) {
+        account.setStorageManifestVersion(remoteManifest.version);
+        account.setStorageManifest(remoteManifest);
+    }
+
+    private List<SignalStorageRecord> getSignalStorageRecords(
+            final StorageKey storageKey,
+            final SignalStorageManifest manifest,
+            final List<StorageId> storageIds
+    ) throws IOException {
+        final var result = dependencies.getStorageServiceRepository()
+                .readStorageRecords(storageKey, manifest.recordIkm, storageIds);
+        return switch (result) {
+            case StorageServiceRepository.StorageRecordResult.DecryptionError decryptionError -> {
+                if (decryptionError.getException() instanceof InvalidKeyException) {
+                    logger.warn("Failed to read storage records, ignoring.");
+                    yield List.of();
+                } else if (decryptionError.getException() instanceof IOException ioe) {
+                    throw ioe;
+                } else {
+                    throw new IOException(decryptionError.getException());
+                }
+            }
+            case StorageServiceRepository.StorageRecordResult.NetworkError networkError ->
+                    throw networkError.getException();
+            case StorageServiceRepository.StorageRecordResult.StatusCodeError statusCodeError ->
+                    throw statusCodeError.getException();
+            case StorageServiceRepository.StorageRecordResult.Success success -> success.getRecords();
+            default -> throw new IllegalStateException("Unexpected value: " + result);
+        };
+    }
+
+    private List<StorageId> getAllLocalStorageIds(final Connection connection) throws SQLException {
+        final var storageIds = new ArrayList<StorageId>();
+        storageIds.addAll(account.getUnknownStorageIdStore().getUnknownStorageIds(connection));
+        storageIds.addAll(account.getGroupStore().getStorageIds(connection));
+        storageIds.addAll(account.getRecipientStore().getStorageIds(connection));
+        storageIds.add(account.getRecipientStore().getSelfStorageId(connection));
+        return storageIds;
+    }
+
+    private List<SignalStorageRecord> buildLocalStorageRecords(
+            final Connection connection,
+            final List<StorageId> storageIds
+    ) throws SQLException {
+        final var records = new ArrayList<SignalStorageRecord>(storageIds.size());
+        for (final var storageId : storageIds) {
+            final var record = buildLocalStorageRecord(connection, storageId);
+            records.add(record);
         }
         return records;
     }
+
+    private SignalStorageRecord buildLocalStorageRecord(
+            Connection connection,
+            StorageId storageId
+    ) throws SQLException {
+        return switch (ManifestRecord.Identifier.Type.fromValue(storageId.getType())) {
+            case ManifestRecord.Identifier.Type.CONTACT -> {
+                final var recipient = account.getRecipientStore().getRecipient(connection, storageId);
+                final var address = recipient.getAddress().getIdentifier();
+                final var identity = account.getIdentityKeyStore().getIdentityInfo(connection, address);
+                final var record = StorageSyncModels.localToRemoteRecord(recipient, identity);
+                yield new SignalStorageRecord(storageId, new StorageRecord.Builder().contact(record).build());
+            }
+            case ManifestRecord.Identifier.Type.GROUPV1 -> {
+                final var groupV1 = account.getGroupStore().getGroupV1(connection, storageId);
+                final var record = StorageSyncModels.localToRemoteRecord(groupV1);
+                yield new SignalStorageRecord(storageId, new StorageRecord.Builder().groupV1(record).build());
+            }
+            case ManifestRecord.Identifier.Type.GROUPV2 -> {
+                final var groupV2 = account.getGroupStore().getGroupV2(connection, storageId);
+                final var record = StorageSyncModels.localToRemoteRecord(groupV2);
+                yield new SignalStorageRecord(storageId, new StorageRecord.Builder().groupV2(record).build());
+            }
+            case ManifestRecord.Identifier.Type.ACCOUNT -> {
+                final var selfRecipient = account.getRecipientStore()
+                        .getRecipient(connection, account.getSelfRecipientId());
+
+                final var record = StorageSyncModels.localToRemoteRecord(connection,
+                        account.getConfigurationStore(),
+                        selfRecipient,
+                        account.getUsernameLink());
+                yield new SignalStorageRecord(storageId, new StorageRecord.Builder().account(record).build());
+            }
+            case null, default -> {
+                throw new AssertionError("Got unknown local storage record type: " + storageId);
+            }
+        };
+    }
+
+    /**
+     * Given a list of all the local and remote keys you know about, this will
+     * return a result telling
+     * you which keys are exclusively remote and which are exclusively local.
+     *
+     * @param remoteIds All remote keys available.
+     * @param localIds  All local keys available.
+     * @return An object describing which keys are exclusive to the remote data set
+     * and which keys are
+     * exclusive to the local data set.
+     */
+    private static IdDifferenceResult findIdDifference(
+            Collection<StorageId> remoteIds,
+            Collection<StorageId> localIds
+    ) {
+        final var base64Encoder = Base64.getEncoder();
+        final var remoteByRawId = remoteIds.stream()
+                .collect(Collectors.toMap(id -> base64Encoder.encodeToString(id.getRaw()), id -> id));
+        final var localByRawId = localIds.stream()
+                .collect(Collectors.toMap(id -> base64Encoder.encodeToString(id.getRaw()), id -> id));
+
+        boolean hasTypeMismatch = remoteByRawId.size() != remoteIds.size() || localByRawId.size() != localIds.size();
+
+        final var remoteOnlyRawIds = SetUtil.difference(remoteByRawId.keySet(), localByRawId.keySet());
+        final var localOnlyRawIds = SetUtil.difference(localByRawId.keySet(), remoteByRawId.keySet());
+        final var sharedRawIds = SetUtil.intersection(localByRawId.keySet(), remoteByRawId.keySet());
+
+        for (String rawId : sharedRawIds) {
+            final var remote = remoteByRawId.get(rawId);
+            final var local = localByRawId.get(rawId);
+
+            if (remote.getType() != local.getType() && KNOWN_TYPES.contains(local.getType())) {
+                remoteOnlyRawIds.remove(rawId);
+                localOnlyRawIds.remove(rawId);
+                hasTypeMismatch = true;
+                logger.debug("Remote type {} did not match local type {} for {}!",
+                        remote.getType(),
+                        local.getType(),
+                        rawId);
+            }
+        }
+
+        final var remoteOnlyKeys = remoteOnlyRawIds.stream().map(remoteByRawId::get).toList();
+        final var localOnlyKeys = localOnlyRawIds.stream().map(localByRawId::get).toList();
+
+        return new IdDifferenceResult(remoteOnlyKeys, localOnlyKeys, hasTypeMismatch);
+    }
+
+    private List<StorageId> processKnownRecords(
+            final Connection connection,
+            List<SignalStorageRecord> records
+    ) throws SQLException {
+        final var unknownRecords = new ArrayList<StorageId>();
+
+        final var accountRecordProcessor = new AccountRecordProcessor(account, connection, context.getJobExecutor());
+        final var contactRecordProcessor = new ContactRecordProcessor(account, connection, context.getJobExecutor());
+        final var groupV1RecordProcessor = new GroupV1RecordProcessor(account, connection);
+        final var groupV2RecordProcessor = new GroupV2RecordProcessor(account, connection);
+
+        for (final var record : records) {
+            if (record.getProto().account != null) {
+                logger.debug("Reading record {} of type account", record.getId());
+                accountRecordProcessor.process(StorageRecordConvertersKt.toSignalAccountRecord(record.getProto().account,
+                        record.getId()));
+            } else if (record.getProto().groupV1 != null) {
+                logger.debug("Reading record {} of type groupV1", record.getId());
+                groupV1RecordProcessor.process(StorageRecordConvertersKt.toSignalGroupV1Record(record.getProto().groupV1,
+                        record.getId()));
+            } else if (record.getProto().groupV2 != null) {
+                logger.debug("Reading record {} of type groupV2", record.getId());
+                groupV2RecordProcessor.process(StorageRecordConvertersKt.toSignalGroupV2Record(record.getProto().groupV2,
+                        record.getId()));
+            } else if (record.getProto().contact != null) {
+                logger.debug("Reading record {} of type contact", record.getId());
+                contactRecordProcessor.process(StorageRecordConvertersKt.toSignalContactRecord(record.getProto().contact,
+                        record.getId()));
+            } else {
+                unknownRecords.add(record.getId());
+            }
+        }
+
+        return unknownRecords;
+    }
+
+    /**
+     * hasTypeMismatches is True if there exist some keys that have matching raw ID's but different types, otherwise false.
+     */
+    private record IdDifferenceResult(
+            List<StorageId> remoteOnlyIds, List<StorageId> localOnlyIds, boolean hasTypeMismatches
+    ) {
+
+        public boolean isEmpty() {
+            return remoteOnlyIds.isEmpty() && localOnlyIds.isEmpty();
+        }
+    }
+
+    private static class RetryLaterException extends Throwable {}
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 4e77d738..108ba1a4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -1,33 +1,44 @@
 package org.asamk.signal.manager.helper;
 
-import com.google.protobuf.ByteString;
-
+import org.asamk.signal.manager.api.Contact;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.MessageEnvelope.Sync.MessageRequestResponse;
 import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfoV1;
-import org.asamk.signal.manager.storage.recipients.Contact;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
-import org.asamk.signal.manager.util.AttachmentUtils;
+import org.asamk.signal.manager.storage.recipients.RecipientId;
+import org.asamk.signal.manager.storage.stickers.StickerPack;
 import org.asamk.signal.manager.util.IOUtils;
+import org.asamk.signal.manager.util.MimeUtils;
+import org.jetbrains.annotations.NotNull;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
+import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.BlockedListMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.ConfigurationMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.ContactsMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.DeviceContact;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceContactAvatar;
 import org.whispersystems.signalservice.api.messages.multidevice.DeviceContactsInputStream;
 import org.whispersystems.signalservice.api.messages.multidevice.DeviceContactsOutputStream;
 import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroup;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroupsInputStream;
 import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroupsOutputStream;
 import org.whispersystems.signalservice.api.messages.multidevice.KeysMessage;
+import org.whispersystems.signalservice.api.messages.multidevice.MessageRequestResponseMessage;
+import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.RequestMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
+import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
+import org.whispersystems.signalservice.api.messages.multidevice.ViewedMessage;
+import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+import org.whispersystems.signalservice.internal.push.SyncMessage;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -36,11 +47,14 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class SyncHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(SyncHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(SyncHelper.class);
 
     private final Context context;
     private final SignalAccount account;
@@ -51,27 +65,43 @@ public class SyncHelper {
     }
 
     public void requestAllSyncData() {
-        requestSyncData(SignalServiceProtos.SyncMessage.Request.Type.GROUPS);
-        requestSyncData(SignalServiceProtos.SyncMessage.Request.Type.CONTACTS);
-        requestSyncData(SignalServiceProtos.SyncMessage.Request.Type.BLOCKED);
-        requestSyncData(SignalServiceProtos.SyncMessage.Request.Type.CONFIGURATION);
+        requestSyncData(SyncMessage.Request.Type.GROUPS);
+        requestSyncData(SyncMessage.Request.Type.CONTACTS);
+        requestSyncData(SyncMessage.Request.Type.BLOCKED);
+        requestSyncData(SyncMessage.Request.Type.CONFIGURATION);
         requestSyncKeys();
-        requestSyncPniIdentity();
     }
 
     public void requestSyncKeys() {
-        requestSyncData(SignalServiceProtos.SyncMessage.Request.Type.KEYS);
+        requestSyncData(SyncMessage.Request.Type.KEYS);
     }
 
-    public void requestSyncPniIdentity() {
-        requestSyncData(SignalServiceProtos.SyncMessage.Request.Type.PNI_IDENTITY);
-    }
-
-    public void sendSyncFetchProfileMessage() {
-        context.getSendHelper()
+    public SendMessageResult sendSyncFetchProfileMessage() {
+        return context.getSendHelper()
                 .sendSyncMessage(SignalServiceSyncMessage.forFetchLatest(SignalServiceSyncMessage.FetchType.LOCAL_PROFILE));
     }
 
+    public void sendSyncFetchStorageMessage() {
+        context.getSendHelper()
+                .sendSyncMessage(SignalServiceSyncMessage.forFetchLatest(SignalServiceSyncMessage.FetchType.STORAGE_MANIFEST));
+    }
+
+    public void sendSyncReceiptMessage(ServiceId sender, SignalServiceReceiptMessage receiptMessage) {
+        if (receiptMessage.isReadReceipt()) {
+            final var readMessages = receiptMessage.getTimestamps()
+                    .stream()
+                    .map(t -> new ReadMessage(sender, t))
+                    .toList();
+            context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forRead(readMessages));
+        } else if (receiptMessage.isViewedReceipt()) {
+            final var viewedMessages = receiptMessage.getTimestamps()
+                    .stream()
+                    .map(t -> new ViewedMessage(sender, t))
+                    .toList();
+            context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forViewed(viewedMessages));
+        }
+    }
+
     public void sendGroups() throws IOException {
         var groupsFile = IOUtils.createTempFile();
 
@@ -99,10 +129,12 @@ public class SyncHelper {
 
             if (groupsFile.exists() && groupsFile.length() > 0) {
                 try (var groupsFileStream = new FileInputStream(groupsFile)) {
+                    final var uploadSpec = context.getDependencies().getMessageSender().getResumableUploadSpec();
                     var attachmentStream = SignalServiceAttachment.newStreamBuilder()
                             .withStream(groupsFileStream)
-                            .withContentType("application/octet-stream")
+                            .withContentType(MimeUtils.OCTET_STREAM)
                             .withLength(groupsFile.length())
+                            .withResumableUploadSpec(uploadSpec)
                             .build();
 
                     context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forGroups(attachmentStream));
@@ -126,51 +158,42 @@ public class SyncHelper {
                 for (var contactPair : account.getContactStore().getContacts()) {
                     final var recipientId = contactPair.first();
                     final var contact = contactPair.second();
-                    final var address = context.getRecipientHelper().resolveSignalServiceAddress(recipientId);
+                    final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
 
-                    var currentIdentity = account.getIdentityKeyStore().getIdentity(recipientId);
-                    VerifiedMessage verifiedMessage = null;
-                    if (currentIdentity != null) {
-                        verifiedMessage = new VerifiedMessage(address,
-                                currentIdentity.getIdentityKey(),
-                                currentIdentity.getTrustLevel().toVerifiedState(),
-                                currentIdentity.getDateAdded().getTime());
-                    }
-
-                    var profileKey = account.getProfileStore().getProfileKey(recipientId);
-                    out.write(new DeviceContact(address,
-                            Optional.ofNullable(contact.getName()),
-                            createContactAvatarAttachment(new RecipientAddress(address)),
-                            Optional.ofNullable(contact.getColor()),
-                            Optional.ofNullable(verifiedMessage),
-                            Optional.ofNullable(profileKey),
-                            contact.isBlocked(),
-                            Optional.of(contact.getMessageExpirationTime()),
-                            Optional.empty(),
-                            contact.isArchived()));
+                    final var deviceContact = getDeviceContact(address, contact);
+                    out.write(deviceContact);
+                    deviceContact.getAvatar().ifPresent(a -> {
+                        try {
+                            a.getInputStream().close();
+                        } catch (IOException ignored) {
+                        }
+                    });
                 }
 
                 if (account.getProfileKey() != null) {
                     // Send our own profile key as well
-                    out.write(new DeviceContact(account.getSelfAddress(),
-                            Optional.empty(),
-                            Optional.empty(),
-                            Optional.empty(),
-                            Optional.empty(),
-                            Optional.of(account.getProfileKey()),
-                            false,
-                            Optional.empty(),
-                            Optional.empty(),
-                            false));
+                    final var address = account.getSelfRecipientAddress();
+                    final var recipientId = account.getSelfRecipientId();
+                    final var contact = account.getContactStore().getContact(recipientId);
+                    final var deviceContact = getDeviceContact(address, contact);
+                    out.write(deviceContact);
+                    deviceContact.getAvatar().ifPresent(a -> {
+                        try {
+                            a.getInputStream().close();
+                        } catch (IOException ignored) {
+                        }
+                    });
                 }
             }
 
             if (contactsFile.exists() && contactsFile.length() > 0) {
                 try (var contactsFileStream = new FileInputStream(contactsFile)) {
+                    final var uploadSpec = context.getDependencies().getMessageSender().getResumableUploadSpec();
                     var attachmentStream = SignalServiceAttachment.newStreamBuilder()
                             .withStream(contactsFileStream)
-                            .withContentType("application/octet-stream")
+                            .withContentType(MimeUtils.OCTET_STREAM)
                             .withLength(contactsFile.length())
+                            .withResumableUploadSpec(uploadSpec)
                             .build();
 
                     context.getSendHelper()
@@ -187,11 +210,26 @@ public class SyncHelper {
         }
     }
 
-    public void sendBlockedList() {
-        var addresses = new ArrayList<SignalServiceAddress>();
+    @NotNull
+    private DeviceContact getDeviceContact(final RecipientAddress address, final Contact contact) throws IOException {
+        return new DeviceContact(address.aci(),
+                address.number(),
+                Optional.ofNullable(contact == null ? null : contact.getName()),
+                createContactAvatarAttachment(address),
+                Optional.ofNullable(contact == null ? null : contact.messageExpirationTime()),
+                Optional.ofNullable(contact == null ? null : contact.messageExpirationTimeVersion()),
+                Optional.empty());
+    }
+
+    public SendMessageResult sendBlockedList() {
+        var addresses = new ArrayList<BlockedListMessage.Individual>();
         for (var record : account.getContactStore().getContacts()) {
             if (record.second().isBlocked()) {
-                addresses.add(context.getRecipientHelper().resolveSignalServiceAddress(record.first()));
+                final var address = account.getRecipientAddressResolver().resolveRecipientAddress(record.first());
+                if (address.aci().isPresent() || address.number().isPresent()) {
+                    addresses.add(new BlockedListMessage.Individual(address.aci().orElse(null),
+                            address.number().orElse(null)));
+                }
             }
         }
         var groupIds = new ArrayList<byte[]>();
@@ -200,41 +238,99 @@ public class SyncHelper {
                 groupIds.add(record.getGroupId().serialize());
             }
         }
-        context.getSendHelper()
+        return context.getSendHelper()
                 .sendSyncMessage(SignalServiceSyncMessage.forBlocked(new BlockedListMessage(addresses, groupIds)));
     }
 
-    public void sendVerifiedMessage(
-            SignalServiceAddress destination, IdentityKey identityKey, TrustLevel trustLevel
-    ) throws IOException {
+    public SendMessageResult sendVerifiedMessage(
+            SignalServiceAddress destination,
+            IdentityKey identityKey,
+            TrustLevel trustLevel
+    ) {
         var verifiedMessage = new VerifiedMessage(destination,
                 identityKey,
                 trustLevel.toVerifiedState(),
                 System.currentTimeMillis());
-        context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage));
+        return context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage));
     }
 
-    public void sendKeysMessage() {
-        var keysMessage = new KeysMessage(Optional.ofNullable(account.getStorageKey()));
-        context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forKeys(keysMessage));
+    public SendMessageResult sendKeysMessage() {
+        var keysMessage = new KeysMessage(account.getOrCreateStorageKey(),
+                account.getOrCreatePinMasterKey(),
+                account.getOrCreateAccountEntropyPool(),
+                account.getOrCreateMediaRootBackupKey());
+        return context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forKeys(keysMessage));
     }
 
-    public void sendConfigurationMessage() {
+    public SendMessageResult sendStickerOperationsMessage(
+            List<StickerPack> installStickers,
+            List<StickerPack> removeStickers
+    ) {
+        var installStickerMessages = installStickers.stream().map(s -> getStickerPackOperationMessage(s, true));
+        var removeStickerMessages = removeStickers.stream().map(s -> getStickerPackOperationMessage(s, false));
+        var stickerMessages = Stream.concat(installStickerMessages, removeStickerMessages).toList();
+        return context.getSendHelper()
+                .sendSyncMessage(SignalServiceSyncMessage.forStickerPackOperations(stickerMessages));
+    }
+
+    private static StickerPackOperationMessage getStickerPackOperationMessage(
+            final StickerPack s,
+            final boolean installed
+    ) {
+        return new StickerPackOperationMessage(s.packId().serialize(),
+                s.packKey(),
+                installed ? StickerPackOperationMessage.Type.INSTALL : StickerPackOperationMessage.Type.REMOVE);
+    }
+
+    public SendMessageResult sendConfigurationMessage() {
         final var config = account.getConfigurationStore();
         var configurationMessage = new ConfigurationMessage(Optional.ofNullable(config.getReadReceipts()),
                 Optional.ofNullable(config.getUnidentifiedDeliveryIndicators()),
                 Optional.ofNullable(config.getTypingIndicators()),
                 Optional.ofNullable(config.getLinkPreviews()));
-        context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forConfiguration(configurationMessage));
+        return context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forConfiguration(configurationMessage));
     }
 
-    public void sendPniIdentity() {
-        final var pniIdentityKeyPair = account.getPniIdentityKeyPair();
-        var pniIdentity = SignalServiceProtos.SyncMessage.PniIdentity.newBuilder()
-                .setPrivateKey(ByteString.copyFrom(pniIdentityKeyPair.getPrivateKey().serialize()))
-                .setPublicKey(ByteString.copyFrom(pniIdentityKeyPair.getPublicKey().serialize()))
-                .build();
-        context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forPniIdentity(pniIdentity));
+    public void handleSyncDeviceGroups(final InputStream input) {
+        final var s = new DeviceGroupsInputStream(input);
+        DeviceGroup g;
+        while (true) {
+            try {
+                g = s.read();
+            } catch (IOException e) {
+                logger.warn("Sync groups contained invalid group, ignoring: {}", e.getMessage());
+                continue;
+            }
+            if (g == null) {
+                break;
+            }
+            var syncGroup = account.getGroupStore().getOrCreateGroupV1(GroupId.v1(g.getId()));
+            if (syncGroup != null) {
+                if (g.getName().isPresent()) {
+                    syncGroup.name = g.getName().get();
+                }
+                syncGroup.addMembers(g.getMembers()
+                        .stream()
+                        .map(account.getRecipientResolver()::resolveRecipient)
+                        .collect(Collectors.toSet()));
+                if (!g.isActive()) {
+                    syncGroup.removeMember(account.getSelfRecipientId());
+                } else {
+                    // Add ourself to the member set as it's marked as active
+                    syncGroup.addMembers(List.of(account.getSelfRecipientId()));
+                }
+                syncGroup.blocked = g.isBlocked();
+                if (g.getColor().isPresent()) {
+                    syncGroup.color = g.getColor().get();
+                }
+
+                if (g.getAvatar().isPresent()) {
+                    context.getGroupHelper().downloadGroupAvatar(syncGroup.getGroupId(), g.getAvatar().get());
+                }
+                syncGroup.archived = g.isArchived();
+                account.getGroupStore().updateGroup(syncGroup);
+            }
+        }
     }
 
     public void handleSyncDeviceContacts(final InputStream input) throws IOException {
@@ -245,73 +341,108 @@ public class SyncHelper {
                 c = s.read();
             } catch (IOException e) {
                 if (e.getMessage() != null && e.getMessage().contains("Missing contact address!")) {
-                    logger.warn("Sync contacts contained invalid contact, ignoring: {}", e.getMessage());
+                    logger.debug("Sync contacts contained invalid contact, ignoring: {}", e.getMessage());
                     continue;
                 } else {
                     throw e;
                 }
             }
-            if (c == null) {
+            if (c == null || (c.getAci().isEmpty() && c.getE164().isEmpty())) {
                 break;
             }
-            if (c.getAddress().matches(account.getSelfAddress()) && c.getProfileKey().isPresent()) {
-                account.setProfileKey(c.getProfileKey().get());
-            }
-            final var recipientId = account.getRecipientTrustedResolver().resolveRecipientTrusted(c.getAddress());
+            final var address = new RecipientAddress(c.getAci(), Optional.empty(), c.getE164(), Optional.empty());
+            final var recipientId = account.getRecipientTrustedResolver().resolveRecipientTrusted(address);
             var contact = account.getContactStore().getContact(recipientId);
             final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
-            if (c.getName().isPresent()) {
+            if (c.getName().isPresent() && (
+                    contact == null || (
+                            contact.givenName() == null && contact.familyName() == null
+                    )
+            )) {
                 builder.withGivenName(c.getName().get());
-            }
-            if (c.getColor().isPresent()) {
-                builder.withColor(c.getColor().get());
-            }
-            if (c.getProfileKey().isPresent()) {
-                account.getProfileStore().storeProfileKey(recipientId, c.getProfileKey().get());
-            }
-            if (c.getVerified().isPresent()) {
-                final var verifiedMessage = c.getVerified().get();
-                account.getIdentityKeyStore()
-                        .setIdentityTrustLevel(account.getRecipientTrustedResolver()
-                                        .resolveRecipientTrusted(verifiedMessage.getDestination()),
-                                verifiedMessage.getIdentityKey(),
-                                TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));
+                builder.withFamilyName(null);
             }
             if (c.getExpirationTimer().isPresent()) {
-                builder.withMessageExpirationTime(c.getExpirationTimer().get());
+                if (c.getExpirationTimerVersion().isPresent() && (
+                        contact == null || c.getExpirationTimerVersion().get() > contact.messageExpirationTimeVersion()
+                )) {
+                    builder.withMessageExpirationTime(c.getExpirationTimer().get());
+                    builder.withMessageExpirationTimeVersion(c.getExpirationTimerVersion().get());
+                } else {
+                    logger.debug(
+                            "[ContactSync] {} was synced with an old expiration timer. Ignoring. Received: {} Current: {}",
+                            recipientId,
+                            c.getExpirationTimerVersion(),
+                            contact == null ? 1 : contact.messageExpirationTimeVersion());
+                }
             }
-            builder.withBlocked(c.isBlocked());
-            builder.withArchived(c.isArchived());
             account.getContactStore().storeContact(recipientId, builder.build());
 
             if (c.getAvatar().isPresent()) {
-                downloadContactAvatar(c.getAvatar().get(), new RecipientAddress(c.getAddress()));
+                storeContactAvatar(c.getAvatar().get(), address);
             }
         }
     }
 
-    private void requestSyncData(final SignalServiceProtos.SyncMessage.Request.Type type) {
-        var r = SignalServiceProtos.SyncMessage.Request.newBuilder().setType(type).build();
-        var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
-        context.getSendHelper().sendSyncMessage(message);
+    public SendMessageResult sendMessageRequestResponse(final MessageRequestResponse.Type type, final GroupId groupId) {
+        final var response = MessageRequestResponseMessage.forGroup(groupId.serialize(), localToRemoteType(type));
+        return context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forMessageRequestResponse(response));
     }
 
-    private Optional<SignalServiceAttachmentStream> createContactAvatarAttachment(RecipientAddress address) throws IOException {
+    public SendMessageResult sendMessageRequestResponse(
+            final MessageRequestResponse.Type type,
+            final RecipientId recipientId
+    ) {
+        final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
+        if (address.serviceId().isEmpty()) {
+            return null;
+        }
+        context.getContactHelper()
+                .setContactProfileSharing(recipientId,
+                        type == MessageRequestResponse.Type.ACCEPT
+                                || type == MessageRequestResponse.Type.UNBLOCK_AND_ACCEPT);
+        final var response = MessageRequestResponseMessage.forIndividual(address.serviceId().get(),
+                localToRemoteType(type));
+        return context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forMessageRequestResponse(response));
+    }
+
+    private SendMessageResult requestSyncData(final SyncMessage.Request.Type type) {
+        var r = new SyncMessage.Request.Builder().type(type).build();
+        var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
+        return context.getSendHelper().sendSyncMessage(message);
+    }
+
+    private Optional<DeviceContactAvatar> createContactAvatarAttachment(RecipientAddress address) throws IOException {
         final var streamDetails = context.getAvatarStore().retrieveContactAvatar(address);
         if (streamDetails == null) {
             return Optional.empty();
         }
 
-        return Optional.of(AttachmentUtils.createAttachmentStream(streamDetails, Optional.empty()));
+        return Optional.of(new DeviceContactAvatar(streamDetails.getStream(),
+                streamDetails.getLength(),
+                streamDetails.getContentType()));
     }
 
-    private void downloadContactAvatar(SignalServiceAttachment avatar, RecipientAddress address) {
+    private void storeContactAvatar(DeviceContactAvatar avatar, RecipientAddress address) {
         try {
             context.getAvatarStore()
                     .storeContactAvatar(address,
-                            outputStream -> context.getAttachmentHelper().retrieveAttachment(avatar, outputStream));
+                            outputStream -> IOUtils.copyStream(avatar.getInputStream(), outputStream));
         } catch (IOException e) {
             logger.warn("Failed to download avatar for contact {}, ignoring: {}", address, e.getMessage());
         }
     }
+
+    private MessageRequestResponseMessage.Type localToRemoteType(final MessageRequestResponse.Type type) {
+        return switch (type) {
+            case UNKNOWN -> MessageRequestResponseMessage.Type.UNKNOWN;
+            case ACCEPT -> MessageRequestResponseMessage.Type.ACCEPT;
+            case DELETE -> MessageRequestResponseMessage.Type.DELETE;
+            case BLOCK -> MessageRequestResponseMessage.Type.BLOCK;
+            case BLOCK_AND_DELETE -> MessageRequestResponseMessage.Type.BLOCK_AND_DELETE;
+            case UNBLOCK_AND_ACCEPT -> MessageRequestResponseMessage.Type.UNBLOCK_AND_ACCEPT;
+            case SPAM -> MessageRequestResponseMessage.Type.SPAM;
+            case BLOCK_AND_SPAM -> MessageRequestResponseMessage.Type.BLOCK_AND_SPAM;
+        };
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
index bdd6221b..cd2719a1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
@@ -1,27 +1,29 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.api.PhoneNumberSharingMode;
+import org.asamk.signal.manager.api.Profile;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
-import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
+import org.jetbrains.annotations.Nullable;
 import org.signal.libsignal.metadata.certificate.InvalidCertificateException;
 import org.signal.libsignal.metadata.certificate.SenderCertificate;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
+import static org.asamk.signal.manager.util.Utils.handleResponseException;
+
 public class UnidentifiedAccessHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(UnidentifiedAccessHelper.class);
-    private final static long CERTIFICATE_EXPIRATION_BUFFER = TimeUnit.DAYS.toMillis(1);
+    private static final Logger logger = LoggerFactory.getLogger(UnidentifiedAccessHelper.class);
+    private static final long CERTIFICATE_EXPIRATION_BUFFER = TimeUnit.DAYS.toMillis(1);
     private static final byte[] UNRESTRICTED_KEY = new byte[16];
 
     private final SignalAccount account;
@@ -42,55 +44,49 @@ public class UnidentifiedAccessHelper {
         senderCertificate = null;
     }
 
-    public List<Optional<UnidentifiedAccessPair>> getAccessFor(List<RecipientId> recipients) {
+    public List<SealedSenderAccess> getSealedSenderAccessFor(List<RecipientId> recipients) {
+        return recipients.stream().map(this::getAccessFor).map(SealedSenderAccess::forIndividual).toList();
+    }
+
+    public @Nullable SealedSenderAccess getSealedSenderAccessFor(RecipientId recipient) {
+        return getSealedSenderAccessFor(recipient, false);
+    }
+
+    public @Nullable SealedSenderAccess getSealedSenderAccessFor(RecipientId recipient, boolean noRefresh) {
+        return SealedSenderAccess.forIndividual(getAccessFor(recipient, noRefresh));
+    }
+
+    public List<UnidentifiedAccess> getAccessFor(List<RecipientId> recipients) {
         return recipients.stream().map(this::getAccessFor).toList();
     }
 
-    public Optional<UnidentifiedAccessPair> getAccessFor(RecipientId recipient) {
+    private @Nullable UnidentifiedAccess getAccessFor(RecipientId recipient) {
         return getAccessFor(recipient, false);
     }
 
-    public Optional<UnidentifiedAccessPair> getAccessFor(RecipientId recipientId, boolean noRefresh) {
+    private @Nullable UnidentifiedAccess getAccessFor(RecipientId recipientId, boolean noRefresh) {
         var recipientUnidentifiedAccessKey = getTargetUnidentifiedAccessKey(recipientId, noRefresh);
         if (recipientUnidentifiedAccessKey == null) {
             logger.trace("Unidentified access not available for {}", recipientId);
-            return Optional.empty();
+            return null;
         }
 
         var selfUnidentifiedAccessKey = getSelfUnidentifiedAccessKey(noRefresh);
         if (selfUnidentifiedAccessKey == null) {
             logger.trace("Unidentified access not available for self");
-            return Optional.empty();
+            return null;
         }
 
         var senderCertificate = getSenderCertificateFor(recipientId);
         if (senderCertificate == null) {
             logger.trace("Unidentified access not available due to missing sender certificate");
-            return Optional.empty();
+            return null;
         }
 
         try {
-            return Optional.of(new UnidentifiedAccessPair(new UnidentifiedAccess(recipientUnidentifiedAccessKey,
-                    senderCertificate), new UnidentifiedAccess(selfUnidentifiedAccessKey, senderCertificate)));
+            return new UnidentifiedAccess(recipientUnidentifiedAccessKey, senderCertificate, false);
         } catch (InvalidCertificateException e) {
-            return Optional.empty();
-        }
-    }
-
-    public Optional<UnidentifiedAccessPair> getAccessForSync() {
-        var selfUnidentifiedAccessKey = getSelfUnidentifiedAccessKey(false);
-        var selfUnidentifiedAccessCertificate = getSenderCertificate();
-
-        if (selfUnidentifiedAccessKey == null || selfUnidentifiedAccessCertificate == null) {
-            return Optional.empty();
-        }
-
-        try {
-            return Optional.of(new UnidentifiedAccessPair(new UnidentifiedAccess(selfUnidentifiedAccessKey,
-                    selfUnidentifiedAccessCertificate),
-                    new UnidentifiedAccess(selfUnidentifiedAccessKey, selfUnidentifiedAccessCertificate)));
-        } catch (InvalidCertificateException e) {
-            return Optional.empty();
+            return null;
         }
     }
 
@@ -115,11 +111,12 @@ public class UnidentifiedAccessHelper {
             return privacySenderCertificate.getSerialized();
         }
         try {
-            final var certificate = dependencies.getAccountManager().getSenderCertificateForPhoneNumberPrivacy();
+            final var certificate = handleResponseException(dependencies.getCertificateApi()
+                    .getSenderCertificateForPhoneNumberPrivacy());
             privacySenderCertificate = new SenderCertificate(certificate);
             return certificate;
         } catch (IOException | InvalidCertificateException e) {
-            logger.warn("Failed to get sender certificate, ignoring: {}", e.getMessage());
+            logger.warn("Failed to get sender certificate (pnp), ignoring: {}", e.getMessage());
             return null;
         }
     }
@@ -131,7 +128,7 @@ public class UnidentifiedAccessHelper {
             return senderCertificate.getSerialized();
         }
         try {
-            final var certificate = dependencies.getAccountManager().getSenderCertificate();
+            final var certificate = handleResponseException(dependencies.getCertificateApi().getSenderCertificate());
             this.senderCertificate = new SenderCertificate(certificate);
             return certificate;
         } catch (IOException | InvalidCertificateException e) {
@@ -164,20 +161,14 @@ public class UnidentifiedAccessHelper {
     }
 
     private static byte[] getTargetUnidentifiedAccessKey(
-            final Profile targetProfile, final ProfileKey theirProfileKey
+            final Profile targetProfile,
+            final ProfileKey theirProfileKey
     ) {
-        switch (targetProfile.getUnidentifiedAccessMode()) {
-            case ENABLED:
-                if (theirProfileKey == null) {
-                    return null;
-                }
-
-                return UnidentifiedAccess.deriveAccessKeyFrom(theirProfileKey);
-            case UNRESTRICTED:
-                return createUnrestrictedUnidentifiedAccess();
-            default:
-                return null;
-        }
+        return switch (targetProfile.getUnidentifiedAccessMode()) {
+            case ENABLED -> theirProfileKey == null ? null : UnidentifiedAccess.deriveAccessKeyFrom(theirProfileKey);
+            case UNRESTRICTED -> createUnrestrictedUnidentifiedAccess();
+            default -> null;
+        };
     }
 
     private static byte[] createUnrestrictedUnidentifiedAccess() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/AccountFileUpdaterImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/AccountFileUpdaterImpl.java
similarity index 79%
rename from lib/src/main/java/org/asamk/signal/manager/AccountFileUpdaterImpl.java
rename to lib/src/main/java/org/asamk/signal/manager/internal/AccountFileUpdaterImpl.java
index af0008c3..35564362 100644
--- a/lib/src/main/java/org/asamk/signal/manager/AccountFileUpdaterImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/AccountFileUpdaterImpl.java
@@ -1,10 +1,10 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.internal;
 
 import org.asamk.signal.manager.helper.AccountFileUpdater;
 import org.asamk.signal.manager.storage.accounts.AccountsStore;
-import org.whispersystems.signalservice.api.push.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 
-class AccountFileUpdaterImpl implements AccountFileUpdater {
+public class AccountFileUpdaterImpl implements AccountFileUpdater {
 
     private final AccountsStore accountsStore;
     private final String accountPath;
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/JobExecutor.java b/lib/src/main/java/org/asamk/signal/manager/internal/JobExecutor.java
new file mode 100644
index 00000000..a76924d8
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/JobExecutor.java
@@ -0,0 +1,89 @@
+package org.asamk.signal.manager.internal;
+
+import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.jobs.Job;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayDeque;
+import java.util.Queue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class JobExecutor implements AutoCloseable {
+
+    private static final Logger logger = LoggerFactory.getLogger(JobExecutor.class);
+    private final Context context;
+    private final ExecutorService executorService;
+    private Job running;
+    private final Queue<Job> queue = new ArrayDeque<>();
+
+    public JobExecutor(final Context context) {
+        this.context = context;
+        this.executorService = Executors.newCachedThreadPool();
+    }
+
+    public void enqueueJob(Job job) {
+        if (executorService.isShutdown()) {
+            logger.debug("Not enqueuing {} job, shutting down", job.getClass().getSimpleName());
+            return;
+        }
+
+        synchronized (queue) {
+            logger.trace("Enqueuing {} job", job.getClass().getSimpleName());
+            queue.add(job);
+        }
+
+        runNextJob();
+    }
+
+    private void runNextJob() {
+        Job job;
+        synchronized (queue) {
+            if (running != null) {
+                return;
+            }
+            job = queue.poll();
+            running = job;
+        }
+
+        if (job == null) {
+            synchronized (this) {
+                this.notifyAll();
+            }
+            return;
+        }
+        logger.debug("Running {} job", job.getClass().getSimpleName());
+        executorService.execute(() -> {
+            try {
+                job.run(context);
+            } catch (Throwable e) {
+                logger.warn("Job {} failed", job.getClass().getSimpleName(), e);
+            } finally {
+                synchronized (queue) {
+                    running = null;
+                }
+                runNextJob();
+            }
+        });
+    }
+
+    @Override
+    public void close() {
+        final boolean queueEmpty;
+        synchronized (queue) {
+            queueEmpty = queue.isEmpty();
+        }
+        if (queueEmpty) {
+            executorService.close();
+            return;
+        }
+        synchronized (this) {
+            try {
+                this.wait();
+            } catch (InterruptedException ignored) {
+            }
+        }
+        executorService.close();
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/LibSignalLogger.java b/lib/src/main/java/org/asamk/signal/manager/internal/LibSignalLogger.java
similarity index 87%
rename from lib/src/main/java/org/asamk/signal/manager/LibSignalLogger.java
rename to lib/src/main/java/org/asamk/signal/manager/internal/LibSignalLogger.java
index 7942c194..541ad099 100644
--- a/lib/src/main/java/org/asamk/signal/manager/LibSignalLogger.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/LibSignalLogger.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.internal;
 
 import org.signal.libsignal.protocol.logging.SignalProtocolLogger;
 import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider;
@@ -7,9 +7,9 @@ import org.slf4j.LoggerFactory;
 
 public class LibSignalLogger implements SignalProtocolLogger {
 
-    private final static Logger logger = LoggerFactory.getLogger("LibSignal");
+    private static final Logger logger = LoggerFactory.getLogger("LibSignal");
 
-    static void initLogger() {
+    public static void initLogger() {
         SignalProtocolLoggerProvider.setProvider(new LibSignalLogger());
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
similarity index 51%
rename from lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
rename to lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index dc7e743e..726d0aaf 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -14,71 +14,110 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.internal;
 
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.AlreadyReceivingException;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.CaptchaRejectedException;
+import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Device;
+import org.asamk.signal.manager.api.DeviceLimitExceededException;
+import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.Group;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.api.Identity;
+import org.asamk.signal.manager.api.IdentityVerificationCode;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
+import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
+import org.asamk.signal.manager.api.InvalidNumberException;
 import org.asamk.signal.manager.api.InvalidStickerException;
+import org.asamk.signal.manager.api.InvalidUsernameException;
+import org.asamk.signal.manager.api.LastGroupAdminException;
 import org.asamk.signal.manager.api.Message;
+import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.MessageEnvelope.Sync.MessageRequestResponse;
+import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.PendingAdminApprovalException;
+import org.asamk.signal.manager.api.PhoneNumberSharingMode;
+import org.asamk.signal.manager.api.PinLockMissingException;
+import org.asamk.signal.manager.api.PinLockedException;
+import org.asamk.signal.manager.api.Profile;
+import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.ReceiveConfig;
+import org.asamk.signal.manager.api.Recipient;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendGroupMessageResults;
 import org.asamk.signal.manager.api.SendMessageResult;
 import org.asamk.signal.manager.api.SendMessageResults;
-import org.asamk.signal.manager.api.StickerPack;
 import org.asamk.signal.manager.api.StickerPackId;
 import org.asamk.signal.manager.api.StickerPackInvalidException;
 import org.asamk.signal.manager.api.StickerPackUrl;
+import org.asamk.signal.manager.api.TextStyle;
 import org.asamk.signal.manager.api.TypingAction;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
+import org.asamk.signal.manager.api.UsernameLinkUrl;
+import org.asamk.signal.manager.api.UsernameStatus;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.LastGroupAdminException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.helper.AccountFileUpdater;
 import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.helper.RecipientHelper.RegisteredUser;
+import org.asamk.signal.manager.jobs.RefreshRecipientsJob;
+import org.asamk.signal.manager.jobs.SyncStorageJob;
+import org.asamk.signal.manager.storage.AttachmentStore;
+import org.asamk.signal.manager.storage.AvatarStore;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfo;
 import org.asamk.signal.manager.storage.identities.IdentityInfo;
-import org.asamk.signal.manager.storage.recipients.Profile;
-import org.asamk.signal.manager.storage.recipients.Recipient;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.stickerPacks.JsonStickerPack;
 import org.asamk.signal.manager.storage.stickerPacks.StickerPackStore;
-import org.asamk.signal.manager.storage.stickers.Sticker;
+import org.asamk.signal.manager.storage.stickers.StickerPack;
 import org.asamk.signal.manager.util.AttachmentUtils;
 import org.asamk.signal.manager.util.KeyUtils;
+import org.asamk.signal.manager.util.MimeUtils;
+import org.asamk.signal.manager.util.PhoneNumberFormatter;
 import org.asamk.signal.manager.util.StickerUtils;
+import org.signal.libsignal.protocol.InvalidMessageException;
+import org.signal.libsignal.usernames.BaseUsernameException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.SignalSessionLock;
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServicePreview;
 import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
-import org.whispersystems.signalservice.api.push.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
+import org.whispersystems.signalservice.api.push.ServiceIdType;
+import org.whispersystems.signalservice.api.push.exceptions.CdsiResourceExhaustedException;
+import org.whispersystems.signalservice.api.push.exceptions.UsernameMalformedException;
+import org.whispersystems.signalservice.api.push.exceptions.UsernameTakenException;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
-import org.whispersystems.signalservice.api.util.InvalidNumberException;
-import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
+import org.whispersystems.signalservice.api.util.StreamDetails;
 import org.whispersystems.signalservice.internal.util.Hex;
 import org.whispersystems.signalservice.internal.util.Util;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.net.URI;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -91,17 +130,24 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import okio.Utf8;
 
-class ManagerImpl implements Manager {
+import static org.asamk.signal.manager.config.ServiceConfig.MAX_MESSAGE_SIZE_BYTES;
+import static org.asamk.signal.manager.util.Utils.handleResponseException;
+import static org.signal.core.util.StringExtensionsKt.splitByByteLength;
 
-    private final static Logger logger = LoggerFactory.getLogger(ManagerImpl.class);
+public class ManagerImpl implements Manager {
+
+    private static final Logger logger = LoggerFactory.getLogger(ManagerImpl.class);
 
     private SignalAccount account;
     private final SignalDependencies dependencies;
@@ -116,8 +162,9 @@ class ManagerImpl implements Manager {
     private final List<Runnable> closedListeners = new ArrayList<>();
     private final List<Runnable> addressChangedListeners = new ArrayList<>();
     private final CompositeDisposable disposable = new CompositeDisposable();
+    private final AtomicLong lastMessageTimestamp = new AtomicLong();
 
-    ManagerImpl(
+    public ManagerImpl(
             SignalAccount account,
             PathConfig pathConfig,
             AccountFileUpdater accountFileUpdater,
@@ -126,15 +173,7 @@ class ManagerImpl implements Manager {
     ) {
         this.account = account;
 
-        final var sessionLock = new SignalSessionLock() {
-            private final ReentrantLock LEGACY_LOCK = new ReentrantLock();
-
-            @Override
-            public Lock acquire() {
-                LEGACY_LOCK.lock();
-                return LEGACY_LOCK::unlock;
-            }
-        };
+        final var sessionLock = new ReentrantSignalSessionLock();
         this.dependencies = new SignalDependencies(serviceEnvironmentConfig,
                 userAgent,
                 account.getCredentialsProvider(),
@@ -166,20 +205,25 @@ class ManagerImpl implements Manager {
                 this.notifyAll();
             }
         });
-        disposable.add(account.getIdentityKeyStore().getIdentityChanges().subscribe(recipientId -> {
-            logger.trace("Archiving old sessions for {}", recipientId);
-            account.getSessionStore().archiveSessions(recipientId);
-            account.getSenderKeyStore().deleteSharedWith(recipientId);
-            final var profile = account.getProfileStore().getProfile(recipientId);
-            if (profile != null) {
-                account.getProfileStore()
-                        .storeProfile(recipientId,
-                                Profile.newBuilder(profile)
-                                        .withUnidentifiedAccessMode(Profile.UnidentifiedAccessMode.UNKNOWN)
-                                        .withLastUpdateTimestamp(0)
-                                        .build());
-            }
-        }));
+        disposable.add(account.getIdentityKeyStore()
+                .getIdentityChanges()
+                .observeOn(Schedulers.from(executor))
+                .subscribe(serviceId -> {
+                    logger.trace("Archiving old sessions for {}", serviceId);
+                    account.getAccountData(ServiceIdType.ACI).getSessionStore().archiveSessions(serviceId);
+                    account.getAccountData(ServiceIdType.PNI).getSessionStore().archiveSessions(serviceId);
+                    account.getSenderKeyStore().deleteSharedWith(serviceId);
+                    final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
+                    final var profile = account.getProfileStore().getProfile(recipientId);
+                    if (profile != null) {
+                        account.getProfileStore()
+                                .storeProfile(recipientId,
+                                        Profile.newBuilder(profile)
+                                                .withUnidentifiedAccessMode(Profile.UnidentifiedAccessMode.UNKNOWN)
+                                                .withLastUpdateTimestamp(0)
+                                                .build());
+                    }
+                }));
     }
 
     @Override
@@ -187,12 +231,18 @@ class ManagerImpl implements Manager {
         return account.getNumber();
     }
 
-    void checkAccountState() throws IOException {
+    public void checkAccountState() throws IOException {
         context.getAccountHelper().checkAccountState();
+        final var lastRecipientsRefresh = account.getLastRecipientsRefresh();
+        if (lastRecipientsRefresh == null
+                || lastRecipientsRefresh < System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1)) {
+            context.getJobExecutor().enqueueJob(new RefreshRecipientsJob());
+            context.getAccountHelper().checkWhoAmiI();
+        }
     }
 
     @Override
-    public Map<String, UserStatus> getUserStatus(Set<String> numbers) throws IOException {
+    public Map<String, UserStatus> getUserStatus(Set<String> numbers) throws IOException, RateLimitException {
         final var canonicalizedNumbers = numbers.stream().collect(Collectors.toMap(n -> n, n -> {
             try {
                 final var canonicalizedNumber = PhoneNumberFormatter.formatNumber(n, account.getNumber());
@@ -210,28 +260,81 @@ class ManagerImpl implements Manager {
                 .stream()
                 .filter(s -> !s.isEmpty())
                 .collect(Collectors.toSet());
-        final var registeredUsers = context.getRecipientHelper().getRegisteredUsers(canonicalizedNumbersSet);
+
+        final Map<String, RegisteredUser> registeredUsers;
+        try {
+            registeredUsers = context.getRecipientHelper().getRegisteredUsers(canonicalizedNumbersSet);
+        } catch (CdsiResourceExhaustedException e) {
+            logger.debug("CDSI resource exhausted: {}", e.getMessage());
+            throw new RateLimitException(System.currentTimeMillis() + e.getRetryAfterSeconds() * 1000L);
+        }
 
         return numbers.stream().collect(Collectors.toMap(n -> n, n -> {
             final var number = canonicalizedNumbers.get(n);
-            final var aci = registeredUsers.get(number);
-            final var profile = aci == null
+            final var user = registeredUsers.get(number);
+            final var serviceId = user == null ? null : user.getServiceId();
+            final var profile = serviceId == null
                     ? null
                     : context.getProfileHelper()
-                            .getRecipientProfile(account.getRecipientResolver().resolveRecipient(aci));
+                            .getRecipientProfile(account.getRecipientResolver().resolveRecipient(serviceId));
             return new UserStatus(number.isEmpty() ? null : number,
-                    aci == null ? null : aci.uuid(),
+                    serviceId == null ? null : serviceId.getRawUuid(),
                     profile != null
                             && profile.getUnidentifiedAccessMode() == Profile.UnidentifiedAccessMode.UNRESTRICTED);
         }));
     }
 
     @Override
-    public void updateAccountAttributes(String deviceName) throws IOException {
+    public Map<String, UsernameStatus> getUsernameStatus(Set<String> usernames) throws IOException {
+        final var registeredUsers = new HashMap<String, RecipientAddress>();
+        for (final var username : usernames) {
+            try {
+                final var recipientId = context.getRecipientHelper().resolveRecipientByUsernameOrLink(username, true);
+                final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
+                registeredUsers.put(username, address);
+            } catch (UnregisteredRecipientException e) {
+                // ignore
+            }
+        }
+
+        return usernames.stream().collect(Collectors.toMap(n -> n, username -> {
+            final var user = registeredUsers.get(username);
+            final var serviceId = user == null ? null : user.serviceId().orElse(null);
+            final var profile = serviceId == null
+                    ? null
+                    : context.getProfileHelper()
+                            .getRecipientProfile(account.getRecipientResolver().resolveRecipient(serviceId));
+            return new UsernameStatus(username,
+                    serviceId == null ? null : serviceId.getRawUuid(),
+                    profile != null
+                            && profile.getUnidentifiedAccessMode() == Profile.UnidentifiedAccessMode.UNRESTRICTED);
+        }));
+    }
+
+    @Override
+    public void updateAccountAttributes(
+            String deviceName,
+            Boolean unrestrictedUnidentifiedSender,
+            final Boolean discoverableByNumber,
+            final Boolean numberSharing
+    ) throws IOException {
         if (deviceName != null) {
             context.getAccountHelper().setDeviceName(deviceName);
         }
+        if (unrestrictedUnidentifiedSender != null) {
+            account.setUnrestrictedUnidentifiedAccess(unrestrictedUnidentifiedSender);
+        }
+        if (discoverableByNumber != null) {
+            account.getConfigurationStore().setPhoneNumberUnlisted(!discoverableByNumber);
+        }
+        if (numberSharing != null) {
+            account.getConfigurationStore()
+                    .setPhoneNumberSharingMode(numberSharing
+                            ? PhoneNumberSharingMode.EVERYBODY
+                            : PhoneNumberSharingMode.NOBODY);
+        }
         context.getAccountHelper().updateAccountAttributes();
+        context.getAccountHelper().checkWhoAmiI();
     }
 
     @Override
@@ -241,13 +344,7 @@ class ManagerImpl implements Manager {
     }
 
     @Override
-    public void updateConfiguration(
-            Configuration configuration
-    ) throws NotPrimaryDeviceException {
-        if (!account.isPrimaryDevice()) {
-            throw new NotPrimaryDeviceException();
-        }
-
+    public void updateConfiguration(Configuration configuration) {
         final var configurationStore = account.getConfigurationStore();
         if (configuration.readReceipts().isPresent()) {
             configurationStore.setReadReceipts(configuration.readReceipts().get());
@@ -262,6 +359,7 @@ class ManagerImpl implements Manager {
             configurationStore.setLinkPreviews(configuration.linkPreviews().get());
         }
         context.getSyncHelper().sendConfigurationMessage();
+        syncRemoteStorage();
     }
 
     @Override
@@ -278,6 +376,66 @@ class ManagerImpl implements Manager {
         context.getSyncHelper().sendSyncFetchProfileMessage();
     }
 
+    void refreshCurrentUsername() throws IOException, BaseUsernameException {
+        context.getAccountHelper().refreshCurrentUsername();
+    }
+
+    @Override
+    public String getUsername() {
+        return account.getUsername();
+    }
+
+    @Override
+    public UsernameLinkUrl getUsernameLink() {
+        return new UsernameLinkUrl(account.getUsernameLink());
+    }
+
+    @Override
+    public void setUsername(final String username) throws IOException, InvalidUsernameException {
+        try {
+            if (username.contains(".")) {
+                context.getAccountHelper().reserveExactUsername(username);
+            } else {
+                context.getAccountHelper().reserveUsernameFromNickname(username);
+            }
+        } catch (UsernameMalformedException e) {
+            throw new InvalidUsernameException("Username is malformed", e);
+        } catch (UsernameTakenException e) {
+            throw new InvalidUsernameException("Username is already registered", e);
+        } catch (BaseUsernameException e) {
+            throw new InvalidUsernameException(e.getMessage() + " (" + e.getClass().getSimpleName() + ")", e);
+        }
+    }
+
+    @Override
+    public void deleteUsername() throws IOException {
+        context.getAccountHelper().deleteUsername();
+    }
+
+    @Override
+    public void startChangeNumber(
+            String newNumber,
+            boolean voiceVerification,
+            String captcha
+    ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, NotPrimaryDeviceException, VerificationMethodNotAvailableException {
+        if (!account.isPrimaryDevice()) {
+            throw new NotPrimaryDeviceException();
+        }
+        context.getAccountHelper().startChangeNumber(newNumber, voiceVerification, captcha);
+    }
+
+    @Override
+    public void finishChangeNumber(
+            String newNumber,
+            String verificationCode,
+            String pin
+    ) throws IncorrectPinException, PinLockedException, IOException, NotPrimaryDeviceException, PinLockMissingException {
+        if (!account.isPrimaryDevice()) {
+            throw new NotPrimaryDeviceException();
+        }
+        context.getAccountHelper().finishChangeNumber(newNumber, verificationCode, pin);
+    }
+
     @Override
     public void unregister() throws IOException {
         context.getAccountHelper().unregister();
@@ -289,15 +447,22 @@ class ManagerImpl implements Manager {
     }
 
     @Override
-    public void submitRateLimitRecaptchaChallenge(String challenge, String captcha) throws IOException {
-        captcha = captcha == null ? null : captcha.replace("signalcaptcha://", "");
+    public void submitRateLimitRecaptchaChallenge(
+            String challenge,
+            String captcha
+    ) throws IOException, CaptchaRejectedException {
+        captcha = captcha == null ? "" : captcha.replace("signalcaptcha://", "");
 
-        dependencies.getAccountManager().submitRateLimitRecaptchaChallenge(challenge, captcha);
+        try {
+            handleResponseException(dependencies.getRateLimitChallengeApi().submitCaptchaChallenge(challenge, captcha));
+        } catch (org.whispersystems.signalservice.internal.push.exceptions.CaptchaRejectedException ignored) {
+            throw new CaptchaRejectedException();
+        }
     }
 
     @Override
     public List<Device> getLinkedDevices() throws IOException {
-        var devices = dependencies.getAccountManager().getDevices();
+        var devices = handleResponseException(dependencies.getLinkDeviceApi().getDevices());
         account.setMultiDevice(devices.size() > 1);
         var identityKey = account.getAciIdentityKeyPair().getPrivateKey();
         return devices.stream().map(d -> {
@@ -318,14 +483,19 @@ class ManagerImpl implements Manager {
     }
 
     @Override
-    public void removeLinkedDevices(int deviceId) throws IOException {
+    public void removeLinkedDevices(int deviceId) throws IOException, NotPrimaryDeviceException {
+        if (!account.isPrimaryDevice()) {
+            throw new NotPrimaryDeviceException();
+        }
         context.getAccountHelper().removeLinkedDevices(deviceId);
     }
 
     @Override
-    public void addDeviceLink(URI linkUri) throws IOException, InvalidDeviceLinkException {
-        var deviceLinkInfo = DeviceLinkInfo.parseDeviceLinkUri(linkUri);
-        context.getAccountHelper().addDevice(deviceLinkInfo);
+    public void addDeviceLink(DeviceLinkUrl linkUrl) throws IOException, InvalidDeviceLinkException, NotPrimaryDeviceException, DeviceLimitExceededException {
+        if (!account.isPrimaryDevice()) {
+            throw new NotPrimaryDeviceException();
+        }
+        context.getAccountHelper().addDevice(linkUrl);
     }
 
     @Override
@@ -341,17 +511,12 @@ class ManagerImpl implements Manager {
     }
 
     void refreshPreKeys() throws IOException {
-        context.getPreKeyHelper().refreshPreKeys();
-    }
-
-    @Override
-    public Profile getRecipientProfile(RecipientIdentifier.Single recipient) throws UnregisteredRecipientException {
-        return context.getProfileHelper().getRecipientProfile(context.getRecipientHelper().resolveRecipient(recipient));
+        context.getPreKeyHelper().refreshPreKeysIfNecessary();
     }
 
     @Override
     public List<Group> getGroups() {
-        return account.getGroupStore().getGroups().stream().map(this::toGroup).toList();
+        return context.getGroupHelper().getGroups().stream().map(this::toGroup).toList();
     }
 
     private Group toGroup(final GroupInfo groupInfo) {
@@ -364,7 +529,8 @@ class ManagerImpl implements Manager {
 
     @Override
     public SendGroupMessageResults quitGroup(
-            GroupId groupId, Set<RecipientIdentifier.Single> groupAdmins
+            GroupId groupId,
+            Set<RecipientIdentifier.Single> groupAdmins
     ) throws GroupNotFoundException, IOException, NotAGroupMemberException, LastGroupAdminException, UnregisteredRecipientException {
         final var newAdmins = context.getRecipientHelper().resolveRecipients(groupAdmins);
         return context.getGroupHelper().quitGroup(groupId, newAdmins);
@@ -382,7 +548,9 @@ class ManagerImpl implements Manager {
 
     @Override
     public Pair<GroupId, SendGroupMessageResults> createGroup(
-            String name, Set<RecipientIdentifier.Single> members, File avatarFile
+            String name,
+            Set<RecipientIdentifier.Single> members,
+            String avatarFile
     ) throws IOException, AttachmentInvalidException, UnregisteredRecipientException {
         return context.getGroupHelper()
                 .createGroup(name,
@@ -392,7 +560,8 @@ class ManagerImpl implements Manager {
 
     @Override
     public SendGroupMessageResults updateGroup(
-            final GroupId groupId, final UpdateGroup updateGroup
+            final GroupId groupId,
+            final UpdateGroup updateGroup
     ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException, GroupSendingNotAllowedException, UnregisteredRecipientException {
         return context.getGroupHelper()
                 .updateGroup(groupId,
@@ -428,31 +597,68 @@ class ManagerImpl implements Manager {
     @Override
     public Pair<GroupId, SendGroupMessageResults> joinGroup(
             GroupInviteLinkUrl inviteLinkUrl
-    ) throws IOException, InactiveGroupLinkException {
+    ) throws IOException, InactiveGroupLinkException, PendingAdminApprovalException {
         return context.getGroupHelper().joinGroup(inviteLinkUrl);
     }
 
+    private long getNextMessageTimestamp() {
+        while (true) {
+            final var last = lastMessageTimestamp.get();
+            final var timestamp = System.currentTimeMillis();
+            if (last == timestamp) {
+                try {
+                    Thread.sleep(1);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
+                continue;
+            }
+            if (lastMessageTimestamp.compareAndSet(last, timestamp)) {
+                return timestamp;
+            }
+        }
+    }
+
     private SendMessageResults sendMessage(
-            SignalServiceDataMessage.Builder messageBuilder, Set<RecipientIdentifier> recipients
+            SignalServiceDataMessage.Builder messageBuilder,
+            Set<RecipientIdentifier> recipients,
+            boolean notifySelf
+    ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
+        return sendMessage(messageBuilder, recipients, notifySelf, Optional.empty());
+    }
+
+    private SendMessageResults sendMessage(
+            SignalServiceDataMessage.Builder messageBuilder,
+            Set<RecipientIdentifier> recipients,
+            boolean notifySelf,
+            Optional<Long> editTargetTimestamp
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         var results = new HashMap<RecipientIdentifier, List<SendMessageResult>>();
-        long timestamp = System.currentTimeMillis();
+        long timestamp = getNextMessageTimestamp();
         messageBuilder.withTimestamp(timestamp);
         for (final var recipient : recipients) {
-            if (recipient instanceof RecipientIdentifier.Single single) {
+            if (recipient instanceof RecipientIdentifier.NoteToSelf || (
+                    recipient instanceof RecipientIdentifier.Single single
+                            && new RecipientAddress(single.toPartialRecipientAddress()).matches(account.getSelfRecipientAddress())
+            )) {
+                final var result = notifySelf
+                        ? context.getSendHelper()
+                        .sendMessage(messageBuilder, account.getSelfRecipientId(), editTargetTimestamp)
+                        : context.getSendHelper().sendSelfMessage(messageBuilder, editTargetTimestamp);
+                results.put(recipient, List.of(toSendMessageResult(result)));
+            } else if (recipient instanceof RecipientIdentifier.Single single) {
                 try {
                     final var recipientId = context.getRecipientHelper().resolveRecipient(single);
-                    final var result = context.getSendHelper().sendMessage(messageBuilder, recipientId);
+                    final var result = context.getSendHelper()
+                            .sendMessage(messageBuilder, recipientId, editTargetTimestamp);
                     results.put(recipient, List.of(toSendMessageResult(result)));
                 } catch (UnregisteredRecipientException e) {
                     results.put(recipient,
                             List.of(SendMessageResult.unregisteredFailure(single.toPartialRecipientAddress())));
                 }
-            } else if (recipient instanceof RecipientIdentifier.NoteToSelf) {
-                final var result = context.getSendHelper().sendSelfMessage(messageBuilder);
-                results.put(recipient, List.of(toSendMessageResult(result)));
             } else if (recipient instanceof RecipientIdentifier.Group group) {
-                final var result = context.getSendHelper().sendAsGroupMessage(messageBuilder, group.groupId());
+                final var result = context.getSendHelper()
+                        .sendAsGroupMessage(messageBuilder, group.groupId(), notifySelf, editTargetTimestamp);
                 results.put(recipient, result.stream().map(this::toSendMessageResult).toList());
             }
         }
@@ -464,10 +670,11 @@ class ManagerImpl implements Manager {
     }
 
     private SendMessageResults sendTypingMessage(
-            SignalServiceTypingMessage.Action action, Set<RecipientIdentifier> recipients
+            SignalServiceTypingMessage.Action action,
+            Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         var results = new HashMap<RecipientIdentifier, List<SendMessageResult>>();
-        final var timestamp = System.currentTimeMillis();
+        final var timestamp = getNextMessageTimestamp();
         for (var recipient : recipients) {
             if (recipient instanceof RecipientIdentifier.Single single) {
                 final var message = new SignalServiceTypingMessage(action, timestamp, Optional.empty());
@@ -491,16 +698,15 @@ class ManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendTypingMessage(
-            TypingAction action, Set<RecipientIdentifier> recipients
+            TypingAction action,
+            Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return sendTypingMessage(action.toSignalService(), recipients);
     }
 
     @Override
-    public SendMessageResults sendReadReceipt(
-            RecipientIdentifier.Single sender, List<Long> messageIds
-    ) {
-        final var timestamp = System.currentTimeMillis();
+    public SendMessageResults sendReadReceipt(RecipientIdentifier.Single sender, List<Long> messageIds) {
+        final var timestamp = getNextMessageTimestamp();
         var receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.READ,
                 messageIds,
                 timestamp);
@@ -509,10 +715,8 @@ class ManagerImpl implements Manager {
     }
 
     @Override
-    public SendMessageResults sendViewedReceipt(
-            RecipientIdentifier.Single sender, List<Long> messageIds
-    ) {
-        final var timestamp = System.currentTimeMillis();
+    public SendMessageResults sendViewedReceipt(RecipientIdentifier.Single sender, List<Long> messageIds) {
+        final var timestamp = getNextMessageTimestamp();
         var receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.VIEWED,
                 messageIds,
                 timestamp);
@@ -526,8 +730,15 @@ class ManagerImpl implements Manager {
             final SignalServiceReceiptMessage receiptMessage
     ) {
         try {
-            final var result = context.getSendHelper()
-                    .sendReceiptMessage(receiptMessage, context.getRecipientHelper().resolveRecipient(sender));
+            final var recipientId = context.getRecipientHelper().resolveRecipient(sender);
+            final var result = context.getSendHelper().sendReceiptMessage(receiptMessage, recipientId);
+
+            final var serviceId = account.getRecipientAddressResolver()
+                    .resolveRecipientAddress(recipientId)
+                    .serviceId();
+            if (serviceId.isPresent()) {
+                context.getSyncHelper().sendSyncReceiptMessage(serviceId.get(), receiptMessage);
+            }
             return new SendMessageResults(timestamp, Map.of(sender, List.of(toSendMessageResult(result))));
         } catch (UnregisteredRecipientException e) {
             return new SendMessageResults(timestamp,
@@ -537,37 +748,93 @@ class ManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendMessage(
-            Message message, Set<RecipientIdentifier> recipients
+            Message message,
+            Set<RecipientIdentifier> recipients,
+            boolean notifySelf
     ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException {
         final var selfProfile = context.getProfileHelper().getSelfProfile();
         if (selfProfile == null || selfProfile.getDisplayName().isEmpty()) {
             logger.warn(
-                    "No profile name set. When sending a message it's recommended to set a profile name wit the updateProfile command. This may become mandatory in the future.");
+                    "No profile name set. When sending a message it's recommended to set a profile name with the updateProfile command. This may become mandatory in the future.");
         }
         final var messageBuilder = SignalServiceDataMessage.newBuilder();
         applyMessage(messageBuilder, message);
-        return sendMessage(messageBuilder, recipients);
+        return sendMessage(messageBuilder, recipients, notifySelf);
+    }
+
+    @Override
+    public SendMessageResults sendEditMessage(
+            Message message,
+            Set<RecipientIdentifier> recipients,
+            long editTargetTimestamp
+    ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException {
+        final var messageBuilder = SignalServiceDataMessage.newBuilder();
+        applyMessage(messageBuilder, message);
+        return sendMessage(messageBuilder, recipients, false, Optional.of(editTargetTimestamp));
     }
 
     private void applyMessage(
-            final SignalServiceDataMessage.Builder messageBuilder, final Message message
+            final SignalServiceDataMessage.Builder messageBuilder,
+            final Message message
     ) throws AttachmentInvalidException, IOException, UnregisteredRecipientException, InvalidStickerException {
-        messageBuilder.withBody(message.messageText());
-        if (message.attachments().size() > 0) {
-            messageBuilder.withAttachments(context.getAttachmentHelper().uploadAttachments(message.attachments()));
+        final var additionalAttachments = new ArrayList<SignalServiceAttachment>();
+        if (Utf8.size(message.messageText()) > MAX_MESSAGE_SIZE_BYTES) {
+            final var result = splitByByteLength(message.messageText(), MAX_MESSAGE_SIZE_BYTES);
+            final var trimmed = result.getFirst();
+            final var remainder = result.getSecond();
+            if (remainder != null) {
+                final var messageBytes = message.messageText().getBytes(StandardCharsets.UTF_8);
+                final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec();
+                final var streamDetails = new StreamDetails(new ByteArrayInputStream(messageBytes),
+                        MimeUtils.LONG_TEXT,
+                        messageBytes.length);
+                final var textAttachment = AttachmentUtils.createAttachmentStream(streamDetails,
+                        Optional.empty(),
+                        uploadSpec);
+                messageBuilder.withBody(trimmed);
+                additionalAttachments.add(context.getAttachmentHelper().uploadAttachment(textAttachment));
+            } else {
+                messageBuilder.withBody(message.messageText());
+            }
+        } else {
+            messageBuilder.withBody(message.messageText());
         }
-        if (message.mentions().size() > 0) {
+        if (!message.attachments().isEmpty()) {
+            final var uploadedAttachments = context.getAttachmentHelper().uploadAttachments(message.attachments());
+            if (!additionalAttachments.isEmpty()) {
+                additionalAttachments.addAll(uploadedAttachments);
+                messageBuilder.withAttachments(additionalAttachments);
+            } else {
+                messageBuilder.withAttachments(uploadedAttachments);
+            }
+        } else if (!additionalAttachments.isEmpty()) {
+            messageBuilder.withAttachments(additionalAttachments);
+        }
+        messageBuilder.withViewOnce(message.viewOnce());
+        if (!message.mentions().isEmpty()) {
             messageBuilder.withMentions(resolveMentions(message.mentions()));
         }
+        if (!message.textStyles().isEmpty()) {
+            messageBuilder.withBodyRanges(message.textStyles().stream().map(TextStyle::toBodyRange).toList());
+        }
         if (message.quote().isPresent()) {
             final var quote = message.quote().get();
+            final var quotedAttachments = new ArrayList<SignalServiceDataMessage.Quote.QuotedAttachment>();
+            for (final var a : quote.attachments()) {
+                final var quotedAttachment = new SignalServiceDataMessage.Quote.QuotedAttachment(a.contentType(),
+                        a.filename(),
+                        a.preview() == null ? null : context.getAttachmentHelper().uploadAttachment(a.preview()));
+                quotedAttachments.add(quotedAttachment);
+            }
             messageBuilder.withQuote(new SignalServiceDataMessage.Quote(quote.timestamp(),
                     context.getRecipientHelper()
-                            .resolveSignalServiceAddress(context.getRecipientHelper().resolveRecipient(quote.author())),
+                            .resolveSignalServiceAddress(context.getRecipientHelper().resolveRecipient(quote.author()))
+                            .getServiceId(),
                     quote.message(),
-                    List.of(),
+                    quotedAttachments,
                     resolveMentions(quote.mentions()),
-                    SignalServiceDataMessage.Quote.Type.NORMAL));
+                    SignalServiceDataMessage.Quote.Type.NORMAL,
+                    quote.textStyles().stream().map(TextStyle::toBodyRange).toList()));
         }
         if (message.sticker().isPresent()) {
             final var sticker = message.sticker().get();
@@ -578,7 +845,7 @@ class ManagerImpl implements Manager {
             if (stickerPack == null) {
                 throw new InvalidStickerException("Sticker pack not found");
             }
-            final var manifest = context.getStickerHelper().getOrRetrieveStickerPack(packId, stickerPack.getPackKey());
+            final var manifest = context.getStickerHelper().getOrRetrieveStickerPack(packId, stickerPack.packKey());
             if (manifest.stickers().size() <= stickerId) {
                 throw new InvalidStickerException("Sticker id not part of this pack");
             }
@@ -587,13 +854,17 @@ class ManagerImpl implements Manager {
             if (streamDetails == null) {
                 throw new InvalidStickerException("Missing local sticker file");
             }
+            final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec();
+            final var stickerAttachment = AttachmentUtils.createAttachmentStream(streamDetails,
+                    Optional.empty(),
+                    uploadSpec);
             messageBuilder.withSticker(new SignalServiceDataMessage.Sticker(packId.serialize(),
-                    stickerPack.getPackKey(),
+                    stickerPack.packKey(),
                     stickerId,
                     manifestSticker.emoji(),
-                    AttachmentUtils.createAttachmentStream(streamDetails, Optional.empty())));
+                    stickerAttachment));
         }
-        if (message.previews().size() > 0) {
+        if (!message.previews().isEmpty()) {
             final var previews = new ArrayList<SignalServicePreview>(message.previews().size());
             for (final var p : message.previews()) {
                 final var image = p.image().isPresent() ? context.getAttachmentHelper()
@@ -606,6 +877,14 @@ class ManagerImpl implements Manager {
             }
             messageBuilder.withPreviews(previews);
         }
+        if (message.storyReply().isPresent()) {
+            final var storyReply = message.storyReply().get();
+            final var authorServiceId = context.getRecipientHelper()
+                    .resolveSignalServiceAddress(context.getRecipientHelper().resolveRecipient(storyReply.author()))
+                    .getServiceId();
+            messageBuilder.withStoryContext(new SignalServiceDataMessage.StoryContext(authorServiceId,
+                    storyReply.timestamp()));
+        }
     }
 
     private ArrayList<SignalServiceDataMessage.Mention> resolveMentions(final List<Message.Mention> mentionList) throws UnregisteredRecipientException {
@@ -621,22 +900,33 @@ class ManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendRemoteDeleteMessage(
-            long targetSentTimestamp, Set<RecipientIdentifier> recipients
+            long targetSentTimestamp,
+            Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         var delete = new SignalServiceDataMessage.RemoteDelete(targetSentTimestamp);
         final var messageBuilder = SignalServiceDataMessage.newBuilder().withRemoteDelete(delete);
         for (final var recipient : recipients) {
-            if (recipient instanceof RecipientIdentifier.Single r) {
+            if (recipient instanceof RecipientIdentifier.Uuid u) {
+                account.getMessageSendLogStore()
+                        .deleteEntryForRecipientNonGroup(targetSentTimestamp, ACI.from(u.uuid()));
+            } else if (recipient instanceof RecipientIdentifier.Pni pni) {
+                account.getMessageSendLogStore()
+                        .deleteEntryForRecipientNonGroup(targetSentTimestamp, PNI.from(pni.pni()));
+            } else if (recipient instanceof RecipientIdentifier.Single r) {
                 try {
                     final var recipientId = context.getRecipientHelper().resolveRecipient(r);
-                    account.getMessageSendLogStore().deleteEntryForRecipientNonGroup(targetSentTimestamp, recipientId);
+                    final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
+                    if (address.serviceId().isPresent()) {
+                        account.getMessageSendLogStore()
+                                .deleteEntryForRecipientNonGroup(targetSentTimestamp, address.serviceId().get());
+                    }
                 } catch (UnregisteredRecipientException ignored) {
                 }
             } else if (recipient instanceof RecipientIdentifier.Group r) {
                 account.getMessageSendLogStore().deleteEntryForGroup(targetSentTimestamp, r.groupId());
             }
         }
-        return sendMessage(messageBuilder, recipients);
+        return sendMessage(messageBuilder, recipients, false);
     }
 
     @Override
@@ -645,26 +935,33 @@ class ManagerImpl implements Manager {
             boolean remove,
             RecipientIdentifier.Single targetAuthor,
             long targetSentTimestamp,
-            Set<RecipientIdentifier> recipients
+            Set<RecipientIdentifier> recipients,
+            final boolean isStory
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException {
         var targetAuthorRecipientId = context.getRecipientHelper().resolveRecipient(targetAuthor);
-        var reaction = new SignalServiceDataMessage.Reaction(emoji,
-                remove,
-                context.getRecipientHelper().resolveSignalServiceAddress(targetAuthorRecipientId),
-                targetSentTimestamp);
+        final var authorServiceId = context.getRecipientHelper()
+                .resolveSignalServiceAddress(targetAuthorRecipientId)
+                .getServiceId();
+        var reaction = new SignalServiceDataMessage.Reaction(emoji, remove, authorServiceId, targetSentTimestamp);
         final var messageBuilder = SignalServiceDataMessage.newBuilder().withReaction(reaction);
-        return sendMessage(messageBuilder, recipients);
+        if (isStory) {
+            messageBuilder.withStoryContext(new SignalServiceDataMessage.StoryContext(authorServiceId,
+                    targetSentTimestamp));
+        }
+        return sendMessage(messageBuilder, recipients, false);
     }
 
     @Override
     public SendMessageResults sendPaymentNotificationMessage(
-            byte[] receipt, String note, RecipientIdentifier.Single recipient
+            byte[] receipt,
+            String note,
+            RecipientIdentifier.Single recipient
     ) throws IOException {
         final var paymentNotification = new SignalServiceDataMessage.PaymentNotification(receipt, note);
-        final var payment = new SignalServiceDataMessage.Payment(paymentNotification);
+        final var payment = new SignalServiceDataMessage.Payment(paymentNotification, null);
         final var messageBuilder = SignalServiceDataMessage.newBuilder().withPayment(payment);
         try {
-            return sendMessage(messageBuilder, Set.of(recipient));
+            return sendMessage(messageBuilder, Set.of(recipient), false);
         } catch (NotAGroupMemberException | GroupNotFoundException | GroupSendingNotAllowedException e) {
             throw new AssertionError(e);
         }
@@ -676,7 +973,8 @@ class ManagerImpl implements Manager {
 
         try {
             return sendMessage(messageBuilder,
-                    recipients.stream().map(RecipientIdentifier.class::cast).collect(Collectors.toSet()));
+                    recipients.stream().map(RecipientIdentifier.class::cast).collect(Collectors.toSet()),
+                    false);
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
             throw new AssertionError(e);
         } finally {
@@ -687,41 +985,109 @@ class ManagerImpl implements Manager {
                 } catch (UnregisteredRecipientException e) {
                     continue;
                 }
-                account.getSessionStore().deleteAllSessions(recipientId);
+                final var serviceId = context.getAccount()
+                        .getRecipientAddressResolver()
+                        .resolveRecipientAddress(recipientId)
+                        .serviceId();
+                if (serviceId.isPresent()) {
+                    account.getAccountData(ServiceIdType.ACI).getSessionStore().deleteAllSessions(serviceId.get());
+                }
             }
         }
     }
 
+    @Override
+    public SendMessageResults sendMessageRequestResponse(
+            final MessageRequestResponse.Type type,
+            final Set<RecipientIdentifier> recipients
+    ) {
+        var results = new HashMap<RecipientIdentifier, List<SendMessageResult>>();
+        for (final var recipient : recipients) {
+            if (recipient instanceof RecipientIdentifier.NoteToSelf || (
+                    recipient instanceof RecipientIdentifier.Single single
+                            && new RecipientAddress(single.toPartialRecipientAddress()).matches(account.getSelfRecipientAddress())
+            )) {
+                final var result = context.getSyncHelper()
+                        .sendMessageRequestResponse(type, account.getSelfRecipientId());
+                if (result != null) {
+                    results.put(recipient, List.of(toSendMessageResult(result)));
+                }
+                results.put(recipient, List.of(toSendMessageResult(result)));
+            } else if (recipient instanceof RecipientIdentifier.Single single) {
+                try {
+                    final var recipientId = context.getRecipientHelper().resolveRecipient(single);
+                    final var result = context.getSyncHelper().sendMessageRequestResponse(type, recipientId);
+                    if (result != null) {
+                        results.put(recipient, List.of(toSendMessageResult(result)));
+                    }
+                } catch (UnregisteredRecipientException e) {
+                    results.put(recipient,
+                            List.of(SendMessageResult.unregisteredFailure(single.toPartialRecipientAddress())));
+                }
+            } else if (recipient instanceof RecipientIdentifier.Group group) {
+                final var result = context.getSyncHelper().sendMessageRequestResponse(type, group.groupId());
+                results.put(recipient, List.of(toSendMessageResult(result)));
+            }
+        }
+        return new SendMessageResults(0, results);
+    }
+
+    @Override
+    public void hideRecipient(final RecipientIdentifier.Single recipient) {
+        final var recipientIdOptional = context.getRecipientHelper().resolveRecipientOptional(recipient);
+        if (recipientIdOptional.isPresent()) {
+            context.getContactHelper().setContactHidden(recipientIdOptional.get(), true);
+            account.removeRecipient(recipientIdOptional.get());
+            syncRemoteStorage();
+        }
+    }
+
     @Override
     public void deleteRecipient(final RecipientIdentifier.Single recipient) {
-        account.removeRecipient(account.getRecipientResolver().resolveRecipient(recipient.toPartialRecipientAddress()));
+        final var recipientIdOptional = context.getRecipientHelper().resolveRecipientOptional(recipient);
+        if (recipientIdOptional.isPresent()) {
+            account.removeRecipient(recipientIdOptional.get());
+            syncRemoteStorage();
+        }
     }
 
     @Override
     public void deleteContact(final RecipientIdentifier.Single recipient) {
-        account.getContactStore()
-                .deleteContact(account.getRecipientResolver().resolveRecipient(recipient.toPartialRecipientAddress()));
+        final var recipientIdOptional = context.getRecipientHelper().resolveRecipientOptional(recipient);
+        if (recipientIdOptional.isPresent()) {
+            account.getContactStore().deleteContact(recipientIdOptional.get());
+            syncRemoteStorage();
+        }
     }
 
     @Override
     public void setContactName(
-            RecipientIdentifier.Single recipient, String givenName, final String familyName
+            final RecipientIdentifier.Single recipient,
+            final String givenName,
+            final String familyName,
+            final String nickGivenName,
+            final String nickFamilyName,
+            final String note
     ) throws NotPrimaryDeviceException, UnregisteredRecipientException {
         if (!account.isPrimaryDevice()) {
             throw new NotPrimaryDeviceException();
         }
         context.getContactHelper()
-                .setContactName(context.getRecipientHelper().resolveRecipient(recipient), givenName, familyName);
+                .setContactName(context.getRecipientHelper().resolveRecipient(recipient),
+                        givenName,
+                        familyName,
+                        nickGivenName,
+                        nickFamilyName,
+                        note);
+        syncRemoteStorage();
     }
 
     @Override
     public void setContactsBlocked(
-            Collection<RecipientIdentifier.Single> recipients, boolean blocked
-    ) throws NotPrimaryDeviceException, IOException, UnregisteredRecipientException {
-        if (!account.isPrimaryDevice()) {
-            throw new NotPrimaryDeviceException();
-        }
-        if (recipients.size() == 0) {
+            Collection<RecipientIdentifier.Single> recipients,
+            boolean blocked
+    ) throws IOException, UnregisteredRecipientException {
+        if (recipients.isEmpty()) {
             return;
         }
         final var recipientIds = context.getRecipientHelper().resolveRecipients(recipients);
@@ -732,6 +1098,10 @@ class ManagerImpl implements Manager {
                 continue;
             }
             context.getContactHelper().setContactBlocked(recipientId, blocked);
+            context.getSyncHelper()
+                    .sendMessageRequestResponse(blocked
+                            ? MessageRequestResponse.Type.BLOCK
+                            : MessageRequestResponse.Type.UNBLOCK_AND_ACCEPT, recipientId);
             // if we don't have a common group with the blocked contact we need to rotate the profile key
             shouldRotateProfileKey = blocked && (
                     shouldRotateProfileKey || account.getGroupStore()
@@ -744,16 +1114,15 @@ class ManagerImpl implements Manager {
             context.getProfileHelper().rotateProfileKey();
         }
         context.getSyncHelper().sendBlockedList();
+        syncRemoteStorage();
     }
 
     @Override
     public void setGroupsBlocked(
-            final Collection<GroupId> groupIds, final boolean blocked
-    ) throws GroupNotFoundException, NotPrimaryDeviceException, IOException {
-        if (!account.isPrimaryDevice()) {
-            throw new NotPrimaryDeviceException();
-        }
-        if (groupIds.size() == 0) {
+            final Collection<GroupId> groupIds,
+            final boolean blocked
+    ) throws GroupNotFoundException, IOException {
+        if (groupIds.isEmpty()) {
             return;
         }
         boolean shouldRotateProfileKey = false;
@@ -762,26 +1131,33 @@ class ManagerImpl implements Manager {
                 continue;
             }
             context.getGroupHelper().setGroupBlocked(groupId, blocked);
+            context.getSyncHelper()
+                    .sendMessageRequestResponse(blocked
+                            ? MessageRequestResponse.Type.BLOCK
+                            : MessageRequestResponse.Type.UNBLOCK_AND_ACCEPT, groupId);
             shouldRotateProfileKey = blocked;
         }
         if (shouldRotateProfileKey) {
             context.getProfileHelper().rotateProfileKey();
         }
         context.getSyncHelper().sendBlockedList();
+        syncRemoteStorage();
     }
 
     @Override
     public void setExpirationTimer(
-            RecipientIdentifier.Single recipient, int messageExpirationTimer
+            RecipientIdentifier.Single recipient,
+            int messageExpirationTimer
     ) throws IOException, UnregisteredRecipientException {
         var recipientId = context.getRecipientHelper().resolveRecipient(recipient);
         context.getContactHelper().setExpirationTimer(recipientId, messageExpirationTimer);
         final var messageBuilder = SignalServiceDataMessage.newBuilder().asExpirationUpdate();
         try {
-            sendMessage(messageBuilder, Set.of(recipient));
+            sendMessage(messageBuilder, Set.of(recipient), false);
         } catch (NotAGroupMemberException | GroupNotFoundException | GroupSendingNotAllowedException e) {
             throw new AssertionError(e);
         }
+        syncRemoteStorage();
     }
 
     @Override
@@ -794,21 +1170,36 @@ class ManagerImpl implements Manager {
         var packIdString = messageSender.uploadStickerManifest(manifest, packKey);
         var packId = StickerPackId.deserialize(Hex.fromStringCondensed(packIdString));
 
-        var sticker = new Sticker(packId, packKey);
-        account.getStickerStore().updateSticker(sticker);
+        var sticker = new StickerPack(packId, packKey);
+        account.getStickerStore().addStickerPack(sticker);
+        context.getSyncHelper().sendStickerOperationsMessage(List.of(sticker), List.of());
 
         return new StickerPackUrl(packId, packKey);
     }
 
     @Override
-    public List<StickerPack> getStickerPacks() {
+    public void installStickerPack(StickerPackUrl url) throws IOException {
+        final var packId = url.packId();
+        final var packKey = url.packKey();
+        try {
+            context.getStickerHelper().retrieveStickerPack(packId, packKey);
+        } catch (InvalidMessageException e) {
+            throw new IOException(e);
+        }
+
+        final var sticker = context.getStickerHelper().addOrUpdateStickerPack(packId, packKey, true);
+        context.getSyncHelper().sendStickerOperationsMessage(List.of(sticker), List.of());
+    }
+
+    @Override
+    public List<org.asamk.signal.manager.api.StickerPack> getStickerPacks() {
         final var stickerPackStore = context.getStickerPackStore();
         return account.getStickerStore().getStickerPacks().stream().map(pack -> {
-            if (stickerPackStore.existsStickerPack(pack.getPackId())) {
+            if (stickerPackStore.existsStickerPack(pack.packId())) {
                 try {
-                    final var manifest = stickerPackStore.retrieveManifest(pack.getPackId());
-                    return new StickerPack(pack.getPackId(),
-                            new StickerPackUrl(pack.getPackId(), pack.getPackKey()),
+                    final var manifest = stickerPackStore.retrieveManifest(pack.packId());
+                    return new org.asamk.signal.manager.api.StickerPack(pack.packId(),
+                            new StickerPackUrl(pack.packId(), pack.packKey()),
                             pack.isInstalled(),
                             manifest.title(),
                             manifest.author(),
@@ -819,27 +1210,22 @@ class ManagerImpl implements Manager {
                 }
             }
 
-            return new StickerPack(pack.getPackId(), pack.getPackKey(), pack.isInstalled());
+            return new org.asamk.signal.manager.api.StickerPack(pack.packId(), pack.packKey(), pack.isInstalled());
         }).toList();
     }
 
     @Override
-    public void requestAllSyncData() throws IOException {
+    public void requestAllSyncData() {
         context.getSyncHelper().requestAllSyncData();
-        retrieveRemoteStorage();
+        syncRemoteStorage();
     }
 
-    void retrieveRemoteStorage() throws IOException {
-        if (account.getStorageKey() != null) {
-            context.getStorageHelper().readDataFromStorage();
-        }
+    void syncRemoteStorage() {
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
     }
 
     @Override
     public void addReceiveHandler(final ReceiveMessageHandler handler, final boolean isWeakListener) {
-        if (isReceivingSynchronous) {
-            throw new IllegalStateException("Already receiving message synchronously.");
-        }
         synchronized (messageHandlers) {
             if (isWeakListener) {
                 weakHandlers.add(handler);
@@ -853,22 +1239,12 @@ class ManagerImpl implements Manager {
     private static final AtomicInteger threadNumber = new AtomicInteger(0);
 
     private void startReceiveThreadIfRequired() {
-        if (receiveThread != null) {
+        if (receiveThread != null || isReceivingSynchronous) {
             return;
         }
-        receiveThread = new Thread(() -> {
+        receiveThread = Thread.ofPlatform().name("receive-" + threadNumber.getAndIncrement()).start(() -> {
             logger.debug("Starting receiving messages");
-            context.getReceiveHelper().receiveMessagesContinuously((envelope, e) -> {
-                synchronized (messageHandlers) {
-                    Stream.concat(messageHandlers.stream(), weakHandlers.stream()).forEach(h -> {
-                        try {
-                            h.handleMessage(envelope, e);
-                        } catch (Throwable ex) {
-                            logger.warn("Message handler failed, ignoring", ex);
-                        }
-                    });
-                }
-            });
+            context.getReceiveHelper().receiveMessagesContinuously(this::passReceivedMessageToHandlers);
             logger.debug("Finished receiving messages");
             synchronized (messageHandlers) {
                 receiveThread = null;
@@ -880,9 +1256,18 @@ class ManagerImpl implements Manager {
                 }
             }
         });
-        receiveThread.setName("receive-" + threadNumber.getAndIncrement());
+    }
 
-        receiveThread.start();
+    private void passReceivedMessageToHandlers(MessageEnvelope envelope, Throwable e) {
+        synchronized (messageHandlers) {
+            Stream.concat(messageHandlers.stream(), weakHandlers.stream()).forEach(h -> {
+                try {
+                    h.handleMessage(envelope, e);
+                } catch (Throwable ex) {
+                    logger.warn("Message handler failed, ignoring", ex);
+                }
+            });
+        }
     }
 
     @Override
@@ -918,33 +1303,59 @@ class ManagerImpl implements Manager {
             return true;
         }
         synchronized (messageHandlers) {
-            return messageHandlers.size() > 0;
+            return !messageHandlers.isEmpty();
         }
     }
 
     @Override
-    public void receiveMessages(Duration timeout, ReceiveMessageHandler handler) throws IOException {
-        receiveMessages(timeout, true, handler);
+    public void receiveMessages(
+            Optional<Duration> timeout,
+            Optional<Integer> maxMessages,
+            ReceiveMessageHandler handler
+    ) throws IOException, AlreadyReceivingException {
+        receiveMessages(timeout.orElse(Duration.ofMinutes(1)), timeout.isPresent(), maxMessages.orElse(null), handler);
     }
 
     @Override
-    public void receiveMessages(ReceiveMessageHandler handler) throws IOException {
-        receiveMessages(Duration.ofMinutes(1), false, handler);
+    public void stopReceiveMessages() {
+        Thread thread = null;
+        synchronized (messageHandlers) {
+            if (isReceivingSynchronous) {
+                thread = receiveThread;
+                receiveThread = null;
+            }
+        }
+        if (thread != null) {
+            stopReceiveThread(thread);
+        }
     }
 
     private void receiveMessages(
-            Duration timeout, boolean returnOnTimeout, ReceiveMessageHandler handler
-    ) throws IOException {
-        if (isReceiving()) {
-            throw new IllegalStateException("Already receiving message.");
+            Duration timeout,
+            boolean returnOnTimeout,
+            Integer maxMessages,
+            ReceiveMessageHandler handler
+    ) throws IOException, AlreadyReceivingException {
+        synchronized (messageHandlers) {
+            if (isReceiving()) {
+                throw new AlreadyReceivingException("Already receiving message.");
+            }
+            isReceivingSynchronous = true;
+            receiveThread = Thread.currentThread();
         }
-        isReceivingSynchronous = true;
-        receiveThread = Thread.currentThread();
         try {
-            context.getReceiveHelper().receiveMessages(timeout, returnOnTimeout, handler);
+            context.getReceiveHelper().receiveMessages(timeout, returnOnTimeout, maxMessages, (envelope, e) -> {
+                passReceivedMessageToHandlers(envelope, e);
+                handler.handleMessage(envelope, e);
+            });
         } finally {
-            receiveThread = null;
-            isReceivingSynchronous = false;
+            synchronized (messageHandlers) {
+                receiveThread = null;
+                isReceivingSynchronous = false;
+                if (!messageHandlers.isEmpty()) {
+                    startReceiveThreadIfRequired();
+                }
+            }
         }
     }
 
@@ -953,11 +1364,6 @@ class ManagerImpl implements Manager {
         context.getReceiveHelper().setReceiveConfig(receiveConfig);
     }
 
-    @Override
-    public boolean hasCaughtUpWithOldMessages() {
-        return context.getReceiveHelper().hasCaughtUpWithOldMessages();
-    }
-
     @Override
     public boolean isContactBlocked(final RecipientIdentifier.Single recipient) {
         final RecipientId recipientId;
@@ -988,9 +1394,22 @@ class ManagerImpl implements Manager {
                 return null;
             }
         }).filter(Objects::nonNull).collect(Collectors.toSet());
+        if (!recipients.isEmpty() && recipientIds.isEmpty()) {
+            return List.of();
+        }
         // refresh profiles of explicitly given recipients
         context.getProfileHelper().refreshRecipientProfiles(recipientIds);
-        return account.getRecipientStore().getRecipients(onlyContacts, blocked, recipientIds, name);
+        return account.getRecipientStore()
+                .getRecipients(onlyContacts, blocked, recipientIds, name)
+                .stream()
+                .map(s -> new Recipient(s.getRecipientId(),
+                        s.getAddress().toApiRecipientAddress(),
+                        s.getContact(),
+                        s.getProfileKey(),
+                        s.getExpiringProfileKeyCredential(),
+                        s.getProfile(),
+                        s.getDiscoverable()))
+                .toList();
     }
 
     @Override
@@ -1022,7 +1441,12 @@ class ManagerImpl implements Manager {
 
     @Override
     public List<Identity> getIdentities() {
-        return account.getIdentityKeyStore().getIdentities().stream().map(this::toIdentity).toList();
+        return account.getIdentityKeyStore()
+                .getIdentities()
+                .stream()
+                .map(this::toIdentity)
+                .filter(Objects::nonNull)
+                .toList();
     }
 
     private Identity toIdentity(final IdentityInfo identityInfo) {
@@ -1031,51 +1455,53 @@ class ManagerImpl implements Manager {
         }
 
         final var address = account.getRecipientAddressResolver()
-                .resolveRecipientAddress(identityInfo.getRecipientId());
+                .resolveRecipientAddress(account.getRecipientResolver().resolveRecipient(identityInfo.getServiceId()));
+        if (address.serviceId().isPresent() && !Objects.equals(address.serviceId().get(),
+                identityInfo.getServiceId())) {
+            return null;
+        }
         final var scannableFingerprint = context.getIdentityHelper()
-                .computeSafetyNumberForScanning(identityInfo.getRecipientId(), identityInfo.getIdentityKey());
-        return new Identity(address,
-                identityInfo.getIdentityKey(),
+                .computeSafetyNumberForScanning(identityInfo.getServiceId(), identityInfo.getIdentityKey());
+        return new Identity(address.toApiRecipientAddress(),
+                identityInfo.getIdentityKey().getPublicKey().serialize(),
                 context.getIdentityHelper()
-                        .computeSafetyNumber(identityInfo.getRecipientId(), identityInfo.getIdentityKey()),
+                        .computeSafetyNumber(identityInfo.getServiceId(), identityInfo.getIdentityKey()),
                 scannableFingerprint == null ? null : scannableFingerprint.getSerialized(),
                 identityInfo.getTrustLevel(),
-                identityInfo.getDateAdded());
+                identityInfo.getDateAddedTimestamp());
     }
 
     @Override
     public List<Identity> getIdentities(RecipientIdentifier.Single recipient) {
-        IdentityInfo identity;
+        ServiceId serviceId;
         try {
-            identity = account.getIdentityKeyStore()
-                    .getIdentity(context.getRecipientHelper().resolveRecipient(recipient));
+            final var address = account.getRecipientAddressResolver()
+                    .resolveRecipientAddress(context.getRecipientHelper().resolveRecipient(recipient));
+            if (address.serviceId().isEmpty()) {
+                return List.of();
+            }
+            serviceId = address.serviceId().get();
         } catch (UnregisteredRecipientException e) {
-            identity = null;
+            return List.of();
         }
+        final var identity = account.getIdentityKeyStore().getIdentityInfo(serviceId);
         return identity == null ? List.of() : List.of(toIdentity(identity));
     }
 
     @Override
     public boolean trustIdentityVerified(
-            RecipientIdentifier.Single recipient, byte[] fingerprint
+            RecipientIdentifier.Single recipient,
+            IdentityVerificationCode verificationCode
     ) throws UnregisteredRecipientException {
-        return trustIdentity(recipient, r -> context.getIdentityHelper().trustIdentityVerified(r, fingerprint));
-    }
-
-    @Override
-    public boolean trustIdentityVerifiedSafetyNumber(
-            RecipientIdentifier.Single recipient, String safetyNumber
-    ) throws UnregisteredRecipientException {
-        return trustIdentity(recipient,
-                r -> context.getIdentityHelper().trustIdentityVerifiedSafetyNumber(r, safetyNumber));
-    }
-
-    @Override
-    public boolean trustIdentityVerifiedSafetyNumber(
-            RecipientIdentifier.Single recipient, byte[] safetyNumber
-    ) throws UnregisteredRecipientException {
-        return trustIdentity(recipient,
-                r -> context.getIdentityHelper().trustIdentityVerifiedSafetyNumber(r, safetyNumber));
+        return switch (verificationCode) {
+            case IdentityVerificationCode.Fingerprint fingerprint -> trustIdentity(recipient,
+                    r -> context.getIdentityHelper().trustIdentityVerified(r, fingerprint.fingerprint()));
+            case IdentityVerificationCode.SafetyNumber safetyNumber -> trustIdentity(recipient,
+                    r -> context.getIdentityHelper().trustIdentityVerifiedSafetyNumber(r, safetyNumber.safetyNumber()));
+            case IdentityVerificationCode.ScannableSafetyNumber safetyNumber -> trustIdentity(recipient,
+                    r -> context.getIdentityHelper().trustIdentityVerifiedSafetyNumber(r, safetyNumber.safetyNumber()));
+            case null -> throw new AssertionError("Invalid verification code type");
+        };
     }
 
     @Override
@@ -1084,12 +1510,13 @@ class ManagerImpl implements Manager {
     }
 
     private boolean trustIdentity(
-            RecipientIdentifier.Single recipient, Function<RecipientId, Boolean> trustMethod
+            RecipientIdentifier.Single recipient,
+            Function<RecipientId, Boolean> trustMethod
     ) throws UnregisteredRecipientException {
         final var recipientId = context.getRecipientHelper().resolveRecipient(recipient);
         final var updated = trustMethod.apply(recipientId);
         if (updated && this.isReceiving()) {
-            context.getReceiveHelper().setNeedsToRetryFailedMessages(true);
+            account.setNeedsToRetryFailedMessages(true);
         }
         return updated;
     }
@@ -1108,6 +1535,63 @@ class ManagerImpl implements Manager {
         }
     }
 
+    @Override
+    public InputStream retrieveAttachment(final String id) throws IOException {
+        return context.getAttachmentHelper().retrieveAttachment(id).getStream();
+    }
+
+    @Override
+    public InputStream retrieveContactAvatar(final RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException {
+        final var recipientId = context.getRecipientHelper().resolveRecipient(recipient);
+        final var address = account.getRecipientStore().resolveRecipientAddress(recipientId);
+        final var streamDetails = context.getAvatarStore().retrieveContactAvatar(address);
+        if (streamDetails == null) {
+            throw new FileNotFoundException();
+        }
+        return streamDetails.getStream();
+    }
+
+    @Override
+    public InputStream retrieveProfileAvatar(final RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException {
+        final var recipientId = context.getRecipientHelper().resolveRecipient(recipient);
+        context.getProfileHelper().getRecipientProfile(recipientId);
+        final var address = account.getRecipientStore().resolveRecipientAddress(recipientId);
+        final var streamDetails = context.getAvatarStore().retrieveProfileAvatar(address);
+        if (streamDetails == null) {
+            throw new FileNotFoundException();
+        }
+        return streamDetails.getStream();
+    }
+
+    @Override
+    public InputStream retrieveGroupAvatar(final GroupId groupId) throws IOException {
+        final var streamDetails = context.getAvatarStore().retrieveGroupAvatar(groupId);
+        context.getGroupHelper().getGroup(groupId);
+        if (streamDetails == null) {
+            throw new FileNotFoundException();
+        }
+        return streamDetails.getStream();
+    }
+
+    @Override
+    public InputStream retrieveSticker(final StickerPackId stickerPackId, final int stickerId) throws IOException {
+        var streamDetails = context.getStickerPackStore().retrieveSticker(stickerPackId, stickerId);
+        if (streamDetails == null) {
+            final var pack = account.getStickerStore().getStickerPack(stickerPackId);
+            if (pack != null) {
+                try {
+                    context.getStickerHelper().retrieveStickerPack(stickerPackId, pack.packKey());
+                } catch (InvalidMessageException e) {
+                    logger.warn("Failed to download sticker pack");
+                }
+            }
+        }
+        if (streamDetails == null) {
+            throw new FileNotFoundException();
+        }
+        return streamDetails.getStream();
+    }
+
     @Override
     public void close() {
         Thread thread;
@@ -1120,9 +1604,12 @@ class ManagerImpl implements Manager {
         if (thread != null) {
             stopReceiveThread(thread);
         }
-        executor.shutdown();
+        context.close();
+        executor.close();
 
-        dependencies.getSignalWebSocket().disconnect();
+        dependencies.getAuthenticatedSignalWebSocket().disconnect();
+        dependencies.getUnauthenticatedSignalWebSocket().disconnect();
+        dependencies.getPushServiceSocket().close();
         disposable.dispose();
 
         if (account != null) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/MultiAccountManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java
similarity index 89%
rename from lib/src/main/java/org/asamk/signal/manager/MultiAccountManagerImpl.java
rename to lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java
index 072e965b..478e761b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/MultiAccountManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java
@@ -1,5 +1,10 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.internal;
 
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.MultiAccountManager;
+import org.asamk.signal.manager.ProvisioningManager;
+import org.asamk.signal.manager.RegistrationManager;
+import org.asamk.signal.manager.SignalAccountFiles;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -15,9 +20,9 @@ import java.util.Set;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
-class MultiAccountManagerImpl implements MultiAccountManager {
+public class MultiAccountManagerImpl implements MultiAccountManager {
 
-    private final static Logger logger = LoggerFactory.getLogger(MultiAccountManagerImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(MultiAccountManagerImpl.class);
 
     private final Set<Consumer<Manager>> onManagerAddedHandlers = new HashSet<>();
     private final Set<Consumer<Manager>> onManagerRemovedHandlers = new HashSet<>();
@@ -120,11 +125,7 @@ class MultiAccountManagerImpl implements MultiAccountManager {
     public void close() {
         synchronized (managers) {
             for (var m : new ArrayList<>(managers)) {
-                try {
-                    m.close();
-                } catch (IOException e) {
-                    logger.warn("Cleanup failed", e);
-                }
+                m.close();
             }
             managers.clear();
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/PathConfig.java b/lib/src/main/java/org/asamk/signal/manager/internal/PathConfig.java
similarity index 71%
rename from lib/src/main/java/org/asamk/signal/manager/PathConfig.java
rename to lib/src/main/java/org/asamk/signal/manager/internal/PathConfig.java
index f3bacdc3..1c7a80f3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/PathConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/PathConfig.java
@@ -1,12 +1,12 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.internal;
 
 import java.io.File;
 
-record PathConfig(
+public record PathConfig(
         File dataPath, File attachmentsPath, File avatarsPath, File stickerPacksPath
 ) {
 
-    static PathConfig createDefault(final File settingsPath) {
+    public static PathConfig createDefault(final File settingsPath) {
         return new PathConfig(new File(settingsPath, "data"),
                 new File(settingsPath, "attachments"),
                 new File(settingsPath, "avatars"),
diff --git a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
similarity index 68%
rename from lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
rename to lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
index 0c617646..eeca842a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
@@ -14,25 +14,28 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.internal;
 
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.ProvisioningManager;
+import org.asamk.signal.manager.Settings;
+import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.UserAlreadyExistsException;
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.accounts.AccountsStore;
-import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.libsignal.protocol.IdentityKeyPair;
-import org.signal.libsignal.protocol.util.KeyHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
-import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
-import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
+import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
+import org.whispersystems.signalservice.api.registration.ProvisioningApi;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
+import org.whispersystems.signalservice.internal.push.ProvisioningSocket;
+import org.whispersystems.signalservice.internal.push.PushServiceSocket;
 import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
 
 import java.io.IOException;
@@ -41,9 +44,11 @@ import java.nio.channels.OverlappingFileLockException;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
-class ProvisioningManagerImpl implements ProvisioningManager {
+import static org.asamk.signal.manager.util.KeyUtils.generatePreKeysForType;
 
-    private final static Logger logger = LoggerFactory.getLogger(ProvisioningManagerImpl.class);
+public class ProvisioningManagerImpl implements ProvisioningManager {
+
+    private static final Logger logger = LoggerFactory.getLogger(ProvisioningManagerImpl.class);
 
     private final PathConfig pathConfig;
     private final ServiceEnvironmentConfig serviceEnvironmentConfig;
@@ -51,12 +56,11 @@ class ProvisioningManagerImpl implements ProvisioningManager {
     private final Consumer<Manager> newManagerListener;
     private final AccountsStore accountsStore;
 
-    private final SignalServiceAccountManager accountManager;
+    private final ProvisioningApi provisioningApi;
     private final IdentityKeyPair tempIdentityKey;
-    private final int registrationId;
     private final String password;
 
-    ProvisioningManagerImpl(
+    public ProvisioningManagerImpl(
             PathConfig pathConfig,
             ServiceEnvironmentConfig serviceEnvironmentConfig,
             String userAgent,
@@ -70,32 +74,31 @@ class ProvisioningManagerImpl implements ProvisioningManager {
         this.accountsStore = accountsStore;
 
         tempIdentityKey = KeyUtils.generateIdentityKeyPair();
-        registrationId = KeyHelper.generateRegistrationId(false);
         password = KeyUtils.createPassword();
-        GroupsV2Operations groupsV2Operations;
-        try {
-            groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()),
-                    ServiceConfig.GROUP_MAX_SIZE);
-        } catch (Throwable ignored) {
-            groupsV2Operations = null;
-        }
-        accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.getSignalServiceConfiguration(),
-                new DynamicCredentialsProvider(null, null, null, password, SignalServiceAddress.DEFAULT_DEVICE_ID),
+        final var credentialsProvider = new DynamicCredentialsProvider(null,
+                null,
+                null,
+                password,
+                SignalServiceAddress.DEFAULT_DEVICE_ID);
+        final var pushServiceSocket = new PushServiceSocket(serviceEnvironmentConfig.signalServiceConfiguration(),
+                credentialsProvider,
                 userAgent,
-                groupsV2Operations,
                 ServiceConfig.AUTOMATIC_NETWORK_RETRY);
+        final var provisioningSocket = new ProvisioningSocket(serviceEnvironmentConfig.signalServiceConfiguration(),
+                userAgent);
+        this.provisioningApi = new ProvisioningApi(pushServiceSocket, provisioningSocket, credentialsProvider);
     }
 
     @Override
     public URI getDeviceLinkUri() throws TimeoutException, IOException {
-        var deviceUuid = accountManager.getNewDeviceUuid();
+        var deviceUuid = provisioningApi.getNewDeviceUuid();
 
-        return new DeviceLinkInfo(deviceUuid, tempIdentityKey.getPublicKey().getPublicKey()).createDeviceLinkUri();
+        return new DeviceLinkUrl(deviceUuid, tempIdentityKey.getPublicKey().getPublicKey()).createDeviceLinkUri();
     }
 
     @Override
     public String finishDeviceLink(String deviceName) throws IOException, TimeoutException, UserAlreadyExistsException {
-        var ret = accountManager.getNewDeviceRegistration(tempIdentityKey);
+        var ret = provisioningApi.getNewDeviceRegistration(tempIdentityKey);
         var number = ret.getNumber();
         var aci = ret.getAci();
         var pni = ret.getPni();
@@ -106,9 +109,9 @@ class ProvisioningManagerImpl implements ProvisioningManager {
         if (accountPath == null) {
             accountPath = accountsStore.getPathByNumber(number);
         }
-        if (accountPath != null
-                && SignalAccount.accountFileExists(pathConfig.dataPath(), accountPath)
-                && !canRelinkExistingAccount(accountPath)) {
+        final var accountExists = accountPath != null && SignalAccount.accountFileExists(pathConfig.dataPath(),
+                accountPath);
+        if (accountExists && !canRelinkExistingAccount(accountPath)) {
             throw new UserAlreadyExistsException(number, SignalAccount.getFileName(pathConfig.dataPath(), accountPath));
         }
         if (accountPath == null) {
@@ -120,33 +123,44 @@ class ProvisioningManagerImpl implements ProvisioningManager {
         var encryptedDeviceName = deviceName == null
                 ? null
                 : DeviceNameUtil.encryptDeviceName(deviceName, ret.getAciIdentity().getPrivateKey());
-
-        logger.debug("Finishing new device registration");
-        var deviceId = accountManager.finishNewDeviceRegistration(ret.getProvisioningCode(),
-                false,
-                true,
-                registrationId,
-                encryptedDeviceName);
-
         // Create new account with the synced identity
         var profileKey = ret.getProfileKey() == null ? KeyUtils.createProfileKey() : ret.getProfileKey();
 
         SignalAccount account = null;
         try {
-            account = SignalAccount.createOrUpdateLinkedAccount(pathConfig.dataPath(),
-                    accountPath,
-                    number,
-                    serviceEnvironmentConfig.getType(),
+            if (!accountExists) {
+                account = SignalAccount.createLinkedAccount(pathConfig.dataPath(),
+                        accountPath,
+                        serviceEnvironmentConfig.type(),
+                        Settings.DEFAULT);
+            } else {
+                account = SignalAccount.load(pathConfig.dataPath(), accountPath, true, Settings.DEFAULT);
+            }
+
+            account.setProvisioningData(number,
                     aci,
                     pni,
                     password,
                     encryptedDeviceName,
-                    deviceId,
                     ret.getAciIdentity(),
                     ret.getPniIdentity(),
-                    registrationId,
                     profileKey,
-                    TrustNewIdentity.ON_FIRST_USE);
+                    ret.getMasterKey(),
+                    ret.getAccountEntropyPool(),
+                    ret.getMediaRootBackupKey());
+
+            account.getConfigurationStore().setReadReceipts(ret.isReadReceipts());
+
+            final var aciPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.ACI));
+            final var pniPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.PNI));
+
+            logger.debug("Finishing new device registration");
+            var deviceId = provisioningApi.finishNewDeviceRegistration(ret.getProvisioningCode(),
+                    account.getAccountAttributes(null),
+                    aciPreKeys,
+                    pniPreKeys);
+
+            account.finishLinking(deviceId, aciPreKeys, pniPreKeys);
 
             ManagerImpl m = null;
             try {
@@ -161,7 +175,7 @@ class ProvisioningManagerImpl implements ProvisioningManager {
                 try {
                     m.refreshPreKeys();
                 } catch (Exception e) {
-                    logger.error("Failed to refresh pre keys.");
+                    logger.error("Failed to refresh pre keys.", e);
                 }
 
                 logger.debug("Requesting sync data");
@@ -169,7 +183,8 @@ class ProvisioningManagerImpl implements ProvisioningManager {
                     m.requestAllSyncData();
                 } catch (Exception e) {
                     logger.error(
-                            "Failed to request sync messages from linked device, data can be requested again with `sendSyncRequest`.");
+                            "Failed to request sync messages from linked device, data can be requested again with `sendSyncRequest`.",
+                            e);
                 }
 
                 if (newManagerListener != null) {
@@ -192,10 +207,7 @@ class ProvisioningManagerImpl implements ProvisioningManager {
     private boolean canRelinkExistingAccount(final String accountPath) throws IOException {
         final SignalAccount signalAccount;
         try {
-            signalAccount = SignalAccount.load(pathConfig.dataPath(),
-                    accountPath,
-                    false,
-                    TrustNewIdentity.ON_FIRST_USE);
+            signalAccount = SignalAccount.load(pathConfig.dataPath(), accountPath, false, Settings.DEFAULT);
         } catch (IOException e) {
             logger.debug("Account in use or failed to load.", e);
             return false;
@@ -211,7 +223,7 @@ class ProvisioningManagerImpl implements ProvisioningManager {
             }
             if (signalAccount.isRegistered()
                     && signalAccount.getServiceEnvironment() != null
-                    && signalAccount.getServiceEnvironment() != serviceEnvironmentConfig.getType()) {
+                    && signalAccount.getServiceEnvironment() != serviceEnvironmentConfig.type()) {
                 logger.debug("Account is registered in another environment: {}.",
                         signalAccount.getServiceEnvironment());
                 return false;
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ReentrantSignalSessionLock.java b/lib/src/main/java/org/asamk/signal/manager/internal/ReentrantSignalSessionLock.java
new file mode 100644
index 00000000..78304469
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ReentrantSignalSessionLock.java
@@ -0,0 +1,16 @@
+package org.asamk.signal.manager.internal;
+
+import org.whispersystems.signalservice.api.SignalSessionLock;
+
+import java.util.concurrent.locks.ReentrantLock;
+
+class ReentrantSignalSessionLock implements SignalSessionLock {
+
+    private final ReentrantLock LEGACY_LOCK = new ReentrantLock();
+
+    @Override
+    public Lock acquire() {
+        LEGACY_LOCK.lock();
+        return LEGACY_LOCK::unlock;
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
new file mode 100644
index 00000000..72c4b63f
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -0,0 +1,326 @@
+/*
+  Copyright (C) 2015-2022 AsamK and contributors
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.asamk.signal.manager.internal;
+
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.RegistrationManager;
+import org.asamk.signal.manager.api.CaptchaRequiredException;
+import org.asamk.signal.manager.api.IncorrectPinException;
+import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.PinLockMissingException;
+import org.asamk.signal.manager.api.PinLockedException;
+import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.UpdateProfile;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
+import org.asamk.signal.manager.config.ServiceConfig;
+import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
+import org.asamk.signal.manager.helper.AccountFileUpdater;
+import org.asamk.signal.manager.helper.PinHelper;
+import org.asamk.signal.manager.storage.SignalAccount;
+import org.asamk.signal.manager.util.KeyUtils;
+import org.asamk.signal.manager.util.NumberVerificationUtils;
+import org.signal.libsignal.usernames.BaseUsernameException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.SignalServiceAccountManager;
+import org.whispersystems.signalservice.api.account.PreKeyCollection;
+import org.whispersystems.signalservice.api.kbs.MasterKey;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
+import org.whispersystems.signalservice.api.push.ServiceIdType;
+import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
+import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
+import org.whispersystems.signalservice.api.svr.SecureValueRecovery;
+import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
+
+import java.io.IOException;
+import java.util.function.Consumer;
+
+import static org.asamk.signal.manager.util.KeyUtils.generatePreKeysForType;
+import static org.asamk.signal.manager.util.Utils.handleResponseException;
+
+public class RegistrationManagerImpl implements RegistrationManager {
+
+    private static final Logger logger = LoggerFactory.getLogger(RegistrationManagerImpl.class);
+
+    private SignalAccount account;
+    private final PathConfig pathConfig;
+    private final ServiceEnvironmentConfig serviceEnvironmentConfig;
+    private final String userAgent;
+    private final Consumer<Manager> newManagerListener;
+
+    private final SignalServiceAccountManager unauthenticatedAccountManager;
+    private final PinHelper pinHelper;
+    private final AccountFileUpdater accountFileUpdater;
+
+    public RegistrationManagerImpl(
+            SignalAccount account,
+            PathConfig pathConfig,
+            ServiceEnvironmentConfig serviceEnvironmentConfig,
+            String userAgent,
+            Consumer<Manager> newManagerListener,
+            AccountFileUpdater accountFileUpdater
+    ) {
+        this.account = account;
+        this.pathConfig = pathConfig;
+        this.accountFileUpdater = accountFileUpdater;
+        this.serviceEnvironmentConfig = serviceEnvironmentConfig;
+        this.userAgent = userAgent;
+        this.newManagerListener = newManagerListener;
+
+        this.unauthenticatedAccountManager = SignalServiceAccountManager.createWithStaticCredentials(
+                serviceEnvironmentConfig.signalServiceConfiguration(),
+                // Using empty UUID, because registering doesn't work otherwise
+                null,
+                null,
+                account.getNumber(),
+                SignalServiceAddress.DEFAULT_DEVICE_ID,
+                account.getPassword(),
+                userAgent,
+                ServiceConfig.AUTOMATIC_NETWORK_RETRY,
+                ServiceConfig.GROUP_MAX_SIZE);
+        final var secureValueRecovery = serviceEnvironmentConfig.svr2Mrenclaves()
+                .stream()
+                .map(mr -> (SecureValueRecovery) this.unauthenticatedAccountManager.getSecureValueRecoveryV2(mr))
+                .toList();
+        this.pinHelper = new PinHelper(secureValueRecovery);
+    }
+
+    @Override
+    public void register(
+            boolean voiceVerification,
+            String captcha,
+            final boolean forceRegister
+    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethodNotAvailableException {
+        if (account.isRegistered()
+                && account.getServiceEnvironment() != null
+                && account.getServiceEnvironment() != serviceEnvironmentConfig.type()) {
+            throw new IOException("Account is registered in another environment: " + account.getServiceEnvironment());
+        }
+
+        try {
+            if (!forceRegister) {
+                if (account.isRegistered()) {
+                    throw new IOException("Account is already registered");
+                }
+
+                if (account.getAci() != null && attemptReactivateAccount()) {
+                    return;
+                }
+            }
+
+            final var recoveryPassword = account.getRecoveryPassword();
+            if (recoveryPassword != null && account.isPrimaryDevice() && attemptReregisterAccount(recoveryPassword)) {
+                return;
+            }
+
+            final var registrationApi = unauthenticatedAccountManager.getRegistrationApi();
+            logger.trace("Creating verification session");
+            String sessionId = NumberVerificationUtils.handleVerificationSession(registrationApi,
+                    account.getSessionId(account.getNumber()),
+                    id -> account.setSessionId(account.getNumber(), id),
+                    voiceVerification,
+                    captcha);
+            logger.trace("Requesting verification code");
+            NumberVerificationUtils.requestVerificationCode(registrationApi, sessionId, voiceVerification);
+            logger.debug("Successfully requested verification code");
+            account.setRegistered(false);
+        } catch (DeprecatedVersionException e) {
+            logger.debug("Signal-Server returned deprecated version exception", e);
+            throw e;
+        }
+    }
+
+    @Override
+    public void verifyAccount(
+            String verificationCode,
+            String pin
+    ) throws IOException, PinLockedException, IncorrectPinException, PinLockMissingException {
+        if (account.isRegistered()) {
+            throw new IOException("Account is already registered");
+        }
+
+        if (account.getPniIdentityKeyPair() == null) {
+            account.setPniIdentityKeyPair(KeyUtils.generateIdentityKeyPair());
+        }
+
+        final var aciPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.ACI));
+        final var pniPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.PNI));
+        final var result = NumberVerificationUtils.verifyNumber(account.getSessionId(account.getNumber()),
+                verificationCode,
+                pin,
+                pinHelper,
+                (sessionId1, verificationCode1, registrationLock) -> verifyAccountWithCode(sessionId1,
+                        verificationCode1,
+                        registrationLock,
+                        aciPreKeys,
+                        pniPreKeys));
+        final var response = result.first();
+        final var masterKey = result.second();
+        if (masterKey == null) {
+            pin = null;
+        }
+
+        finishAccountRegistration(response, pin, masterKey, aciPreKeys, pniPreKeys);
+    }
+
+    @Override
+    public void deleteLocalAccountData() throws IOException {
+        account.deleteAccountData();
+        accountFileUpdater.removeAccount();
+        account = null;
+    }
+
+    @Override
+    public boolean isRegistered() {
+        return account.isRegistered();
+    }
+
+    private boolean attemptReregisterAccount(final String recoveryPassword) {
+        try {
+            if (account.getPniIdentityKeyPair() == null) {
+                account.setPniIdentityKeyPair(KeyUtils.generateIdentityKeyPair());
+            }
+
+            final var aciPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.ACI));
+            final var pniPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.PNI));
+            final var registrationApi = unauthenticatedAccountManager.getRegistrationApi();
+            final var response = handleResponseException(registrationApi.registerAccount(null,
+                    recoveryPassword,
+                    account.getAccountAttributes(null),
+                    aciPreKeys,
+                    pniPreKeys,
+                    null,
+                    true));
+            finishAccountRegistration(response,
+                    account.getRegistrationLockPin(),
+                    account.getPinBackedMasterKey(),
+                    aciPreKeys,
+                    pniPreKeys);
+            logger.info("Reregistered existing account, verify is not necessary.");
+            return true;
+        } catch (IOException e) {
+            logger.debug("Failed to reregister account with recovery password", e);
+        }
+        return false;
+    }
+
+    private boolean attemptReactivateAccount() {
+        try {
+            final var dependencies = new SignalDependencies(serviceEnvironmentConfig,
+                    userAgent,
+                    account.getCredentialsProvider(),
+                    account.getSignalServiceDataStore(),
+                    null,
+                    new ReentrantSignalSessionLock());
+            handleResponseException(dependencies.getAccountApi()
+                    .setAccountAttributes(account.getAccountAttributes(null)));
+            account.setRegistered(true);
+            logger.info("Reactivated existing account, verify is not necessary.");
+            if (newManagerListener != null) {
+                final var m = new ManagerImpl(account,
+                        pathConfig,
+                        accountFileUpdater,
+                        serviceEnvironmentConfig,
+                        userAgent);
+                account = null;
+                newManagerListener.accept(m);
+            }
+            return true;
+        } catch (IOException e) {
+            logger.debug("Failed to reactivate account");
+        }
+        return false;
+    }
+
+    private VerifyAccountResponse verifyAccountWithCode(
+            final String sessionId,
+            final String verificationCode,
+            final String registrationLock,
+            final PreKeyCollection aciPreKeys,
+            final PreKeyCollection pniPreKeys
+    ) throws IOException {
+        final var registrationApi = unauthenticatedAccountManager.getRegistrationApi();
+        try {
+            handleResponseException(registrationApi.verifyAccount(sessionId, verificationCode));
+        } catch (AlreadyVerifiedException e) {
+            // Already verified so can continue registering
+        }
+        return handleResponseException(registrationApi.registerAccount(sessionId,
+                null,
+                account.getAccountAttributes(registrationLock),
+                aciPreKeys,
+                pniPreKeys,
+                null,
+                true));
+    }
+
+    private void finishAccountRegistration(
+            final VerifyAccountResponse response,
+            final String pin,
+            final MasterKey masterKey,
+            final PreKeyCollection aciPreKeys,
+            final PreKeyCollection pniPreKeys
+    ) throws IOException {
+        //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
+        final var aci = ACI.parseOrThrow(response.getUuid());
+        final var pni = PNI.parseOrThrow(response.getPni());
+        account.finishRegistration(aci, pni, masterKey, pin, aciPreKeys, pniPreKeys);
+        accountFileUpdater.updateAccountIdentifiers(account.getNumber(), aci);
+
+        ManagerImpl m = null;
+        try {
+            m = new ManagerImpl(account, pathConfig, accountFileUpdater, serviceEnvironmentConfig, userAgent);
+            account = null;
+
+            m.refreshPreKeys();
+            if (response.isStorageCapable()) {
+                m.syncRemoteStorage();
+            }
+            // Set an initial empty profile so user can be added to groups
+            try {
+                m.updateProfile(UpdateProfile.newBuilder().build());
+            } catch (NoClassDefFoundError e) {
+                logger.warn("Failed to set default profile: {}", e.getMessage());
+            }
+
+            try {
+                m.refreshCurrentUsername();
+            } catch (IOException | BaseUsernameException e) {
+                logger.warn("Failed to refresh current username", e);
+            }
+
+            if (newManagerListener != null) {
+                newManagerListener.accept(m);
+                m = null;
+            }
+        } finally {
+            if (m != null) {
+                m.close();
+            }
+        }
+    }
+
+    @Override
+    public void close() {
+        if (account != null) {
+            account.close();
+            account = null;
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
new file mode 100644
index 00000000..0bc895cb
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -0,0 +1,388 @@
+package org.asamk.signal.manager.internal;
+
+import org.asamk.signal.manager.config.ServiceConfig;
+import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
+import org.asamk.signal.manager.util.Utils;
+import org.signal.libsignal.metadata.certificate.CertificateValidator;
+import org.signal.libsignal.net.Network;
+import org.signal.libsignal.protocol.UsePqRatchet;
+import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.SignalServiceAccountManager;
+import org.whispersystems.signalservice.api.SignalServiceDataStore;
+import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
+import org.whispersystems.signalservice.api.SignalServiceMessageSender;
+import org.whispersystems.signalservice.api.SignalSessionLock;
+import org.whispersystems.signalservice.api.account.AccountApi;
+import org.whispersystems.signalservice.api.attachment.AttachmentApi;
+import org.whispersystems.signalservice.api.cds.CdsApi;
+import org.whispersystems.signalservice.api.certificate.CertificateApi;
+import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;
+import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
+import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api;
+import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
+import org.whispersystems.signalservice.api.keys.KeysApi;
+import org.whispersystems.signalservice.api.link.LinkDeviceApi;
+import org.whispersystems.signalservice.api.message.MessageApi;
+import org.whispersystems.signalservice.api.profiles.ProfileApi;
+import org.whispersystems.signalservice.api.push.ServiceIdType;
+import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.ratelimit.RateLimitChallengeApi;
+import org.whispersystems.signalservice.api.registration.RegistrationApi;
+import org.whispersystems.signalservice.api.services.ProfileService;
+import org.whispersystems.signalservice.api.storage.StorageServiceApi;
+import org.whispersystems.signalservice.api.storage.StorageServiceRepository;
+import org.whispersystems.signalservice.api.svr.SecureValueRecovery;
+import org.whispersystems.signalservice.api.username.UsernameApi;
+import org.whispersystems.signalservice.api.util.CredentialsProvider;
+import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
+import org.whispersystems.signalservice.api.websocket.SignalWebSocket;
+import org.whispersystems.signalservice.internal.push.PushServiceSocket;
+import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+
+public class SignalDependencies {
+
+    private static final Logger logger = LoggerFactory.getLogger(SignalDependencies.class);
+
+    private final Object LOCK = new Object();
+
+    private final ServiceEnvironmentConfig serviceEnvironmentConfig;
+    private final String userAgent;
+    private final CredentialsProvider credentialsProvider;
+    private final SignalServiceDataStore dataStore;
+    private final ExecutorService executor;
+    private final SignalSessionLock sessionLock;
+
+    private boolean allowStories = true;
+
+    private SignalServiceAccountManager accountManager;
+    private AccountApi accountApi;
+    private RateLimitChallengeApi rateLimitChallengeApi;
+    private CdsApi cdsApi;
+    private UsernameApi usernameApi;
+    private GroupsV2Api groupsV2Api;
+    private RegistrationApi registrationApi;
+    private LinkDeviceApi linkDeviceApi;
+    private StorageServiceApi storageServiceApi;
+    private CertificateApi certificateApi;
+    private AttachmentApi attachmentApi;
+    private MessageApi messageApi;
+    private KeysApi keysApi;
+    private GroupsV2Operations groupsV2Operations;
+    private ClientZkOperations clientZkOperations;
+
+    private PushServiceSocket pushServiceSocket;
+    private Network libSignalNetwork;
+    private SignalWebSocket.AuthenticatedWebSocket authenticatedSignalWebSocket;
+    private SignalWebSocket.UnauthenticatedWebSocket unauthenticatedSignalWebSocket;
+    private SignalServiceMessageReceiver messageReceiver;
+    private SignalServiceMessageSender messageSender;
+
+    private List<SecureValueRecovery> secureValueRecovery;
+    private ProfileService profileService;
+    private ProfileApi profileApi;
+
+    SignalDependencies(
+            final ServiceEnvironmentConfig serviceEnvironmentConfig,
+            final String userAgent,
+            final CredentialsProvider credentialsProvider,
+            final SignalServiceDataStore dataStore,
+            final ExecutorService executor,
+            final SignalSessionLock sessionLock
+    ) {
+        this.serviceEnvironmentConfig = serviceEnvironmentConfig;
+        this.userAgent = userAgent;
+        this.credentialsProvider = credentialsProvider;
+        this.dataStore = dataStore;
+        this.executor = executor;
+        this.sessionLock = sessionLock;
+    }
+
+    public void resetAfterAddressChange() {
+        if (this.pushServiceSocket != null) {
+            this.pushServiceSocket.close();
+            this.pushServiceSocket = null;
+            this.accountManager = null;
+            this.messageReceiver = null;
+            this.messageSender = null;
+            this.profileService = null;
+            this.groupsV2Api = null;
+            this.registrationApi = null;
+            this.secureValueRecovery = null;
+        }
+        if (this.authenticatedSignalWebSocket != null) {
+            this.authenticatedSignalWebSocket.forceNewWebSocket();
+        }
+        if (this.unauthenticatedSignalWebSocket != null) {
+            this.unauthenticatedSignalWebSocket.forceNewWebSocket();
+        }
+    }
+
+    /**
+     * This method needs to be called before the first websocket is created
+     */
+    public void setAllowStories(final boolean allowStories) {
+        this.allowStories = allowStories;
+    }
+
+    public ServiceEnvironmentConfig getServiceEnvironmentConfig() {
+        return serviceEnvironmentConfig;
+    }
+
+    public SignalSessionLock getSessionLock() {
+        return sessionLock;
+    }
+
+    public PushServiceSocket getPushServiceSocket() {
+        return getOrCreate(() -> pushServiceSocket,
+                () -> pushServiceSocket = new PushServiceSocket(serviceEnvironmentConfig.signalServiceConfiguration(),
+                        credentialsProvider,
+                        userAgent,
+                        ServiceConfig.AUTOMATIC_NETWORK_RETRY));
+    }
+
+    public Network getLibSignalNetwork() {
+        return getOrCreate(() -> libSignalNetwork, () -> {
+            libSignalNetwork = new Network(serviceEnvironmentConfig.netEnvironment(), userAgent);
+            setSignalNetworkProxy(libSignalNetwork);
+        });
+    }
+
+    private void setSignalNetworkProxy(Network libSignalNetwork) {
+        final var proxy = Utils.getHttpsProxy();
+        if (proxy.address() instanceof InetSocketAddress addr) {
+            switch (proxy.type()) {
+                case Proxy.Type.DIRECT -> {
+                }
+                case Proxy.Type.HTTP -> {
+                    try {
+                        libSignalNetwork.setProxy("http", addr.getHostName(), addr.getPort(), null, null);
+                    } catch (IOException e) {
+                        logger.warn("Failed to set http proxy", e);
+                    }
+                }
+                case Proxy.Type.SOCKS -> {
+                    try {
+                        libSignalNetwork.setProxy("socks", addr.getHostName(), addr.getPort(), null, null);
+                    } catch (IOException e) {
+                        logger.warn("Failed to set socks proxy", e);
+                    }
+                }
+            }
+        }
+    }
+
+    public SignalServiceAccountManager getAccountManager() {
+        return getOrCreate(() -> accountManager,
+                () -> accountManager = new SignalServiceAccountManager(getAuthenticatedSignalWebSocket(),
+                        getAccountApi(),
+                        getPushServiceSocket(),
+                        getGroupsV2Operations()));
+    }
+
+    public SignalServiceAccountManager createUnauthenticatedAccountManager(String number, String password) {
+        return SignalServiceAccountManager.createWithStaticCredentials(getServiceEnvironmentConfig().signalServiceConfiguration(),
+                null,
+                null,
+                number,
+                SignalServiceAddress.DEFAULT_DEVICE_ID,
+                password,
+                userAgent,
+                ServiceConfig.AUTOMATIC_NETWORK_RETRY,
+                ServiceConfig.GROUP_MAX_SIZE);
+    }
+
+    public AccountApi getAccountApi() {
+        return getOrCreate(() -> accountApi, () -> accountApi = new AccountApi(getAuthenticatedSignalWebSocket()));
+    }
+
+    public RateLimitChallengeApi getRateLimitChallengeApi() {
+        return getOrCreate(() -> rateLimitChallengeApi,
+                () -> rateLimitChallengeApi = new RateLimitChallengeApi(getAuthenticatedSignalWebSocket()));
+    }
+
+    public CdsApi getCdsApi() {
+        return getOrCreate(() -> cdsApi, () -> cdsApi = new CdsApi(getAuthenticatedSignalWebSocket()));
+    }
+
+    public UsernameApi getUsernameApi() {
+        return getOrCreate(() -> usernameApi, () -> usernameApi = new UsernameApi(getUnauthenticatedSignalWebSocket()));
+    }
+
+    public GroupsV2Api getGroupsV2Api() {
+        return getOrCreate(() -> groupsV2Api, () -> groupsV2Api = getAccountManager().getGroupsV2Api());
+    }
+
+    public RegistrationApi getRegistrationApi() {
+        return getOrCreate(() -> registrationApi, () -> registrationApi = getAccountManager().getRegistrationApi());
+    }
+
+    public LinkDeviceApi getLinkDeviceApi() {
+        return getOrCreate(() -> linkDeviceApi,
+                () -> linkDeviceApi = new LinkDeviceApi(getAuthenticatedSignalWebSocket()));
+    }
+
+    private StorageServiceApi getStorageServiceApi() {
+        return getOrCreate(() -> storageServiceApi,
+                () -> storageServiceApi = new StorageServiceApi(getAuthenticatedSignalWebSocket(),
+                        getPushServiceSocket()));
+    }
+
+    public StorageServiceRepository getStorageServiceRepository() {
+        return new StorageServiceRepository(getStorageServiceApi());
+    }
+
+    public CertificateApi getCertificateApi() {
+        return getOrCreate(() -> certificateApi,
+                () -> certificateApi = new CertificateApi(getAuthenticatedSignalWebSocket()));
+    }
+
+    public AttachmentApi getAttachmentApi() {
+        return getOrCreate(() -> attachmentApi,
+                () -> attachmentApi = new AttachmentApi(getAuthenticatedSignalWebSocket(), getPushServiceSocket()));
+    }
+
+    public MessageApi getMessageApi() {
+        return getOrCreate(() -> messageApi,
+                () -> messageApi = new MessageApi(getAuthenticatedSignalWebSocket(),
+                        getUnauthenticatedSignalWebSocket()));
+    }
+
+    public KeysApi getKeysApi() {
+        return getOrCreate(() -> keysApi,
+                () -> keysApi = new KeysApi(getAuthenticatedSignalWebSocket(), getUnauthenticatedSignalWebSocket()));
+    }
+
+    public GroupsV2Operations getGroupsV2Operations() {
+        return getOrCreate(() -> groupsV2Operations,
+                () -> groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration()),
+                        ServiceConfig.GROUP_MAX_SIZE));
+    }
+
+    private ClientZkOperations getClientZkOperations() {
+        return getOrCreate(() -> clientZkOperations,
+                () -> clientZkOperations = ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration()));
+    }
+
+    private ClientZkProfileOperations getClientZkProfileOperations() {
+        final var clientZkOperations = getClientZkOperations();
+        return clientZkOperations.getProfileOperations();
+    }
+
+    public SignalWebSocket.AuthenticatedWebSocket getAuthenticatedSignalWebSocket() {
+        return getOrCreate(() -> authenticatedSignalWebSocket, () -> {
+            final var timer = new UptimeSleepTimer();
+            final var healthMonitor = new SignalWebSocketHealthMonitor(timer);
+
+            authenticatedSignalWebSocket = new SignalWebSocket.AuthenticatedWebSocket(() -> new OkHttpWebSocketConnection(
+                    "normal",
+                    serviceEnvironmentConfig.signalServiceConfiguration(),
+                    Optional.of(credentialsProvider),
+                    userAgent,
+                    healthMonitor,
+                    allowStories), () -> true, timer, TimeUnit.SECONDS.toMillis(10));
+            healthMonitor.monitor(authenticatedSignalWebSocket);
+        });
+    }
+
+    public SignalWebSocket.UnauthenticatedWebSocket getUnauthenticatedSignalWebSocket() {
+        return getOrCreate(() -> unauthenticatedSignalWebSocket, () -> {
+            final var timer = new UptimeSleepTimer();
+            final var healthMonitor = new SignalWebSocketHealthMonitor(timer);
+
+            unauthenticatedSignalWebSocket = new SignalWebSocket.UnauthenticatedWebSocket(() -> new OkHttpWebSocketConnection(
+                    "unidentified",
+                    serviceEnvironmentConfig.signalServiceConfiguration(),
+                    Optional.empty(),
+                    userAgent,
+                    healthMonitor,
+                    allowStories), () -> true, timer, TimeUnit.SECONDS.toMillis(10));
+            healthMonitor.monitor(unauthenticatedSignalWebSocket);
+        });
+    }
+
+    public SignalServiceMessageReceiver getMessageReceiver() {
+        return getOrCreate(() -> messageReceiver,
+                () -> messageReceiver = new SignalServiceMessageReceiver(getPushServiceSocket()));
+    }
+
+    public SignalServiceMessageSender getMessageSender() {
+        return getOrCreate(() -> messageSender,
+                () -> messageSender = new SignalServiceMessageSender(getPushServiceSocket(),
+                        dataStore,
+                        sessionLock,
+                        getAttachmentApi(),
+                        getMessageApi(),
+                        getKeysApi(),
+                        Optional.empty(),
+                        executor,
+                        ServiceConfig.MAX_ENVELOPE_SIZE,
+                        () -> true,
+                        UsePqRatchet.NO));
+    }
+
+    public List<SecureValueRecovery> getSecureValueRecovery() {
+        return getOrCreate(() -> secureValueRecovery,
+                () -> secureValueRecovery = serviceEnvironmentConfig.svr2Mrenclaves()
+                        .stream()
+                        .map(mr -> (SecureValueRecovery) getAccountManager().getSecureValueRecoveryV2(mr))
+                        .toList());
+    }
+
+    public ProfileApi getProfileApi() {
+        return getOrCreate(() -> profileApi,
+                () -> profileApi = new ProfileApi(getAuthenticatedSignalWebSocket(),
+                        getUnauthenticatedSignalWebSocket(),
+                        getPushServiceSocket(),
+                        getClientZkProfileOperations()));
+    }
+
+    public ProfileService getProfileService() {
+        return getOrCreate(() -> profileService,
+                () -> profileService = new ProfileService(getClientZkProfileOperations(),
+                        getAuthenticatedSignalWebSocket(),
+                        getUnauthenticatedSignalWebSocket()));
+    }
+
+    public SignalServiceCipher getCipher(ServiceIdType serviceIdType) {
+        final var certificateValidator = new CertificateValidator(serviceEnvironmentConfig.unidentifiedSenderTrustRoot());
+        final var address = new SignalServiceAddress(credentialsProvider.getAci(), credentialsProvider.getE164());
+        final var deviceId = credentialsProvider.getDeviceId();
+        return new SignalServiceCipher(address,
+                deviceId,
+                serviceIdType == ServiceIdType.ACI ? dataStore.aci() : dataStore.pni(),
+                sessionLock,
+                certificateValidator);
+    }
+
+    private <T> T getOrCreate(Supplier<T> supplier, Callable creator) {
+        var value = supplier.get();
+        if (value != null) {
+            return value;
+        }
+
+        synchronized (LOCK) {
+            value = supplier.get();
+            if (value != null) {
+                return value;
+            }
+            creator.call();
+            return supplier.get();
+        }
+    }
+
+    private interface Callable {
+
+        void call();
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
new file mode 100644
index 00000000..7d927ddd
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
@@ -0,0 +1,158 @@
+package org.asamk.signal.manager.internal;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.util.Preconditions;
+import org.whispersystems.signalservice.api.util.SleepTimer;
+import org.whispersystems.signalservice.api.websocket.HealthMonitor;
+import org.whispersystems.signalservice.api.websocket.SignalWebSocket;
+import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState;
+import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import kotlin.Unit;
+
+final class SignalWebSocketHealthMonitor implements HealthMonitor {
+
+    private static final Logger logger = LoggerFactory.getLogger(SignalWebSocketHealthMonitor.class);
+
+    /**
+     * This is the amount of time in between sent keep alives. Must be greater than [KEEP_ALIVE_TIMEOUT]
+     */
+    private static final long KEEP_ALIVE_SEND_CADENCE = TimeUnit.SECONDS.toMillis(OkHttpWebSocketConnection.KEEPALIVE_FREQUENCY_SECONDS);
+
+    /**
+     * This is the amount of time we will wait for a response to the keep alive before we consider the websockets dead.
+     * It is required that this value be less than [KEEP_ALIVE_SEND_CADENCE]
+     */
+    private static final long KEEP_ALIVE_TIMEOUT = TimeUnit.SECONDS.toMillis(20);
+
+    private final Executor executor = Executors.newSingleThreadExecutor();
+    private final SleepTimer sleepTimer;
+    private SignalWebSocket webSocket = null;
+    private volatile KeepAliveSender keepAliveSender = null;
+    private boolean needsKeepAlive = false;
+    private long lastKeepAliveReceived = 0;
+
+    public SignalWebSocketHealthMonitor(SleepTimer sleepTimer) {
+        this.sleepTimer = sleepTimer;
+    }
+
+    void monitor(SignalWebSocket webSocket) {
+        Preconditions.checkNotNull(webSocket);
+        Preconditions.checkArgument(this.webSocket == null, "monitor can only be called once");
+
+        executor.execute(() -> {
+
+            this.webSocket = webSocket;
+
+            webSocket.getState()
+                    .subscribeOn(Schedulers.computation())
+                    .observeOn(Schedulers.computation())
+                    .distinctUntilChanged()
+                    .subscribe(this::onStateChanged);
+
+            webSocket.addKeepAliveChangeListener(() -> {
+                executor.execute(this::updateKeepAliveSenderStatus);
+                return Unit.INSTANCE;
+            });
+        });
+    }
+
+    private void onStateChanged(WebSocketConnectionState connectionState) {
+        executor.execute(() -> {
+            needsKeepAlive = connectionState == WebSocketConnectionState.CONNECTED;
+
+            updateKeepAliveSenderStatus();
+        });
+    }
+
+    @Override
+    public void onKeepAliveResponse(long sentTimestamp, boolean isIdentifiedWebSocket) {
+        final var keepAliveTime = System.currentTimeMillis();
+        executor.execute(() -> lastKeepAliveReceived = keepAliveTime);
+    }
+
+    @Override
+    public void onMessageError(int status, boolean isIdentifiedWebSocket) {
+    }
+
+    private void updateKeepAliveSenderStatus() {
+        if (keepAliveSender == null && sendKeepAlives()) {
+            keepAliveSender = new KeepAliveSender();
+            keepAliveSender.start();
+        } else if (keepAliveSender != null && !sendKeepAlives()) {
+            keepAliveSender.shutdown();
+            keepAliveSender = null;
+        }
+    }
+
+    private boolean sendKeepAlives() {
+        return needsKeepAlive && webSocket != null && webSocket.shouldSendKeepAlives();
+    }
+
+    /**
+     * Sends periodic heartbeats/keep-alives over the WebSocket to prevent connection timeouts. If
+     * the WebSocket fails to get a return heartbeat after [KEEP_ALIVE_TIMEOUT] seconds, it is forced to be recreated.
+     */
+    private final class KeepAliveSender extends Thread {
+
+        private volatile boolean shouldKeepRunning = true;
+
+        @Override
+        public void run() {
+            logger.debug("[KeepAliveSender({})] started", this.threadId());
+            lastKeepAliveReceived = System.currentTimeMillis();
+
+            var keepAliveSendTime = System.currentTimeMillis();
+            while (shouldKeepRunning && sendKeepAlives()) {
+                try {
+                    final var nextKeepAliveSendTime = keepAliveSendTime + KEEP_ALIVE_SEND_CADENCE;
+                    sleepUntil(nextKeepAliveSendTime);
+
+                    if (shouldKeepRunning && sendKeepAlives()) {
+                        keepAliveSendTime = System.currentTimeMillis();
+                        webSocket.sendKeepAlive();
+                    }
+
+                    final var responseRequiredTime = keepAliveSendTime + KEEP_ALIVE_TIMEOUT;
+                    sleepUntil(responseRequiredTime);
+
+                    if (shouldKeepRunning && sendKeepAlives()) {
+                        if (lastKeepAliveReceived < keepAliveSendTime) {
+                            logger.debug("Missed keep alive, last: {} needed by: {}",
+                                    lastKeepAliveReceived,
+                                    responseRequiredTime);
+                            webSocket.forceNewWebSocket();
+                        }
+                    }
+                } catch (Throwable e) {
+                    logger.warn("Keep alive sender failed", e);
+                }
+            }
+            logger.debug("[KeepAliveSender({})] ended", threadId());
+        }
+
+        void sleepUntil(long timeMillis) {
+            while (System.currentTimeMillis() < timeMillis) {
+                final var waitTime = timeMillis - System.currentTimeMillis();
+                if (waitTime > 0) {
+                    try {
+                        sleepTimer.sleep(waitTime);
+                    } catch (InterruptedException e) {
+                        logger.warn("WebSocket health monitor interrupted", e);
+                    }
+                }
+            }
+        }
+
+        void shutdown() {
+            shouldKeepRunning = false;
+        }
+    }
+}
+
diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/CheckWhoAmIJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/CheckWhoAmIJob.java
new file mode 100644
index 00000000..165bf70e
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/CheckWhoAmIJob.java
@@ -0,0 +1,22 @@
+package org.asamk.signal.manager.jobs;
+
+import org.asamk.signal.manager.helper.Context;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+
+public class CheckWhoAmIJob implements Job {
+
+    private static final Logger logger = LoggerFactory.getLogger(CheckWhoAmIJob.class);
+
+    @Override
+    public void run(Context context) {
+        logger.trace("Checking whoAmI");
+        try {
+            context.getAccountHelper().checkWhoAmiI();
+        } catch (IOException e) {
+            logger.warn("Failed to check whoAmI", e);
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/CleanOldPreKeysJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/CleanOldPreKeysJob.java
new file mode 100644
index 00000000..d933fb0f
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/CleanOldPreKeysJob.java
@@ -0,0 +1,16 @@
+package org.asamk.signal.manager.jobs;
+
+import org.asamk.signal.manager.helper.Context;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CleanOldPreKeysJob implements Job {
+
+    private static final Logger logger = LoggerFactory.getLogger(CleanOldPreKeysJob.class);
+
+    @Override
+    public void run(Context context) {
+        logger.trace("Cleaning old prekeys");
+        context.getPreKeyHelper().cleanOldPreKeys();
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/DownloadProfileAvatarJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/DownloadProfileAvatarJob.java
new file mode 100644
index 00000000..f46bac0c
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/DownloadProfileAvatarJob.java
@@ -0,0 +1,23 @@
+package org.asamk.signal.manager.jobs;
+
+import org.asamk.signal.manager.helper.Context;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DownloadProfileAvatarJob implements Job {
+
+    private static final Logger logger = LoggerFactory.getLogger(DownloadProfileAvatarJob.class);
+    private final String avatarPath;
+
+    public DownloadProfileAvatarJob(final String avatarPath) {
+        this.avatarPath = avatarPath;
+    }
+
+    @Override
+    public void run(Context context) {
+        logger.trace("Downloading profile avatar {}", avatarPath);
+        final var account = context.getAccount();
+        context.getProfileHelper()
+                .downloadProfileAvatar(account.getSelfRecipientId(), avatarPath, account.getProfileKey());
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/DownloadProfileJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/DownloadProfileJob.java
new file mode 100644
index 00000000..22796864
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/DownloadProfileJob.java
@@ -0,0 +1,24 @@
+package org.asamk.signal.manager.jobs;
+
+import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DownloadProfileJob implements Job {
+
+    private static final Logger logger = LoggerFactory.getLogger(DownloadProfileJob.class);
+    private final RecipientAddress address;
+
+    public DownloadProfileJob(RecipientAddress address) {
+        this.address = address;
+    }
+
+    @Override
+    public void run(Context context) {
+        logger.trace("Refreshing profile for {}", address);
+        final var account = context.getAccount();
+        final var recipientId = account.getRecipientStore().resolveRecipient(address);
+        context.getProfileHelper().refreshRecipientProfile(recipientId);
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/RefreshRecipientsJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/RefreshRecipientsJob.java
new file mode 100644
index 00000000..472bbac1
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/RefreshRecipientsJob.java
@@ -0,0 +1,23 @@
+package org.asamk.signal.manager.jobs;
+
+import org.asamk.signal.manager.helper.Context;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RefreshRecipientsJob implements Job {
+
+    private static final Logger logger = LoggerFactory.getLogger(RefreshRecipientsJob.class);
+
+    @Override
+    public void run(Context context) {
+        logger.trace("Full CDSI recipients refresh");
+        try {
+            context.getRecipientHelper().refreshUsers();
+        } catch (Exception e) {
+            logger.warn("Full CDSI recipients refresh failed, ignoring: {} ({})",
+                    e.getMessage(),
+                    e.getClass().getSimpleName());
+            logger.debug("Full CDSI refresh failed", e);
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
index 54c0390b..1eeed9dc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
@@ -11,7 +11,7 @@ import java.io.IOException;
 
 public class RetrieveStickerPackJob implements Job {
 
-    private final static Logger logger = LoggerFactory.getLogger(RetrieveStickerPackJob.class);
+    private static final Logger logger = LoggerFactory.getLogger(RetrieveStickerPackJob.class);
 
     private final StickerPackId packId;
     private final byte[] packKey;
@@ -23,10 +23,7 @@ public class RetrieveStickerPackJob implements Job {
 
     @Override
     public void run(Context context) {
-        if (context.getStickerPackStore().existsStickerPack(packId)) {
-            logger.debug("Sticker pack {} already downloaded.", Hex.toStringCondensed(packId.serialize()));
-            return;
-        }
+        logger.trace("Downloading sticker pack {}", packId);
         try {
             context.getStickerHelper().retrieveStickerPack(packId, packKey);
         } catch (IOException e) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/SyncStorageJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/SyncStorageJob.java
new file mode 100644
index 00000000..d695c7b1
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/SyncStorageJob.java
@@ -0,0 +1,36 @@
+package org.asamk.signal.manager.jobs;
+
+import org.asamk.signal.manager.helper.Context;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+
+public class SyncStorageJob implements Job {
+
+    private final boolean forcePush;
+
+    private static final Logger logger = LoggerFactory.getLogger(SyncStorageJob.class);
+
+    public SyncStorageJob() {
+        this.forcePush = false;
+    }
+
+    public SyncStorageJob(final boolean forcePush) {
+        this.forcePush = forcePush;
+    }
+
+    @Override
+    public void run(Context context) {
+        logger.trace("Running storage sync job");
+        try {
+            if (forcePush) {
+                context.getStorageHelper().forcePushToStorage();
+            } else {
+                context.getStorageHelper().syncDataWithStorage();
+            }
+        } catch (IOException e) {
+            logger.warn("Failed to sync storage data", e);
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index b4315940..9e1c6303 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -2,18 +2,38 @@ package org.asamk.signal.manager.storage;
 
 import com.zaxxer.hikari.HikariDataSource;
 
+import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.storage.groups.GroupStore;
+import org.asamk.signal.manager.storage.identities.IdentityKeyStore;
+import org.asamk.signal.manager.storage.keyValue.KeyValueStore;
+import org.asamk.signal.manager.storage.prekeys.KyberPreKeyStore;
+import org.asamk.signal.manager.storage.prekeys.PreKeyStore;
+import org.asamk.signal.manager.storage.prekeys.SignedPreKeyStore;
+import org.asamk.signal.manager.storage.recipients.CdsiStore;
+import org.asamk.signal.manager.storage.recipients.RecipientStore;
 import org.asamk.signal.manager.storage.sendLog.MessageSendLogStore;
+import org.asamk.signal.manager.storage.senderKeys.SenderKeyRecordStore;
+import org.asamk.signal.manager.storage.senderKeys.SenderKeySharedStore;
+import org.asamk.signal.manager.storage.sessions.SessionStore;
+import org.asamk.signal.manager.storage.stickers.StickerStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.io.File;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.Optional;
+import java.util.UUID;
 
 public class AccountDatabase extends Database {
 
-    private final static Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
-    private static final long DATABASE_VERSION = 1;
+    private static final Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
+    private static final long DATABASE_VERSION = 27;
 
     private AccountDatabase(final HikariDataSource dataSource) {
         super(logger, DATABASE_VERSION, dataSource);
@@ -23,11 +43,632 @@ public class AccountDatabase extends Database {
         return initDatabase(databaseFile, AccountDatabase::new);
     }
 
+    @Override
+    protected void createDatabase(final Connection connection) throws SQLException {
+        RecipientStore.createSql(connection);
+        MessageSendLogStore.createSql(connection);
+        StickerStore.createSql(connection);
+        PreKeyStore.createSql(connection);
+        SignedPreKeyStore.createSql(connection);
+        KyberPreKeyStore.createSql(connection);
+        GroupStore.createSql(connection);
+        SessionStore.createSql(connection);
+        IdentityKeyStore.createSql(connection);
+        SenderKeyRecordStore.createSql(connection);
+        SenderKeySharedStore.createSql(connection);
+        KeyValueStore.createSql(connection);
+        CdsiStore.createSql(connection);
+        UnknownStorageIdStore.createSql(connection);
+    }
+
     @Override
     protected void upgradeDatabase(final Connection connection, final long oldVersion) throws SQLException {
-        if (oldVersion < 1) {
-            logger.debug("Updating database: Creating message send log tables");
-            MessageSendLogStore.createSql(connection);
+        if (oldVersion < 2) {
+            logger.debug("Updating database: Creating recipient table");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        CREATE TABLE recipient (
+                                          _id INTEGER PRIMARY KEY AUTOINCREMENT,
+                                          number TEXT UNIQUE,
+                                          uuid BLOB UNIQUE,
+                                          profile_key BLOB,
+                                          profile_key_credential BLOB,
+                                        
+                                          given_name TEXT,
+                                          family_name TEXT,
+                                          color TEXT,
+                                        
+                                          expiration_time INTEGER NOT NULL DEFAULT 0,
+                                          blocked INTEGER NOT NULL DEFAULT FALSE,
+                                          archived INTEGER NOT NULL DEFAULT FALSE,
+                                          profile_sharing INTEGER NOT NULL DEFAULT FALSE,
+                                        
+                                          profile_last_update_timestamp INTEGER NOT NULL DEFAULT 0,
+                                          profile_given_name TEXT,
+                                          profile_family_name TEXT,
+                                          profile_about TEXT,
+                                          profile_about_emoji TEXT,
+                                          profile_avatar_url_path TEXT,
+                                          profile_mobile_coin_address BLOB,
+                                          profile_unidentified_access_mode TEXT,
+                                          profile_capabilities TEXT
+                                        ) STRICT;
+                                        """);
+            }
+        }
+        if (oldVersion < 3) {
+            logger.debug("Updating database: Creating sticker table");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        CREATE TABLE sticker (
+                                          _id INTEGER PRIMARY KEY,
+                                          pack_id BLOB UNIQUE NOT NULL,
+                                          pack_key BLOB NOT NULL,
+                                          installed INTEGER NOT NULL DEFAULT FALSE
+                                        ) STRICT;
+                                        """);
+            }
+        }
+        if (oldVersion < 4) {
+            logger.debug("Updating database: Creating pre key tables");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        CREATE TABLE signed_pre_key (
+                                          _id INTEGER PRIMARY KEY,
+                                          account_id_type INTEGER NOT NULL,
+                                          key_id INTEGER NOT NULL,
+                                          public_key BLOB NOT NULL,
+                                          private_key BLOB NOT NULL,
+                                          signature BLOB NOT NULL,
+                                          timestamp INTEGER DEFAULT 0,
+                                          UNIQUE(account_id_type, key_id)
+                                        ) STRICT;
+                                        CREATE TABLE pre_key (
+                                          _id INTEGER PRIMARY KEY,
+                                          account_id_type INTEGER NOT NULL,
+                                          key_id INTEGER NOT NULL,
+                                          public_key BLOB NOT NULL,
+                                          private_key BLOB NOT NULL,
+                                          UNIQUE(account_id_type, key_id)
+                                        ) STRICT;
+                                        """);
+            }
+        }
+        if (oldVersion < 5) {
+            logger.debug("Updating database: Creating group tables");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        CREATE TABLE group_v2 (
+                                          _id INTEGER PRIMARY KEY,
+                                          group_id BLOB UNIQUE NOT NULL,
+                                          master_key BLOB NOT NULL,
+                                          group_data BLOB,
+                                          distribution_id BLOB UNIQUE NOT NULL,
+                                          blocked INTEGER NOT NULL DEFAULT FALSE,
+                                          permission_denied INTEGER NOT NULL DEFAULT FALSE
+                                        ) STRICT;
+                                        CREATE TABLE group_v1 (
+                                          _id INTEGER PRIMARY KEY,
+                                          group_id BLOB UNIQUE NOT NULL,
+                                          group_id_v2 BLOB UNIQUE,
+                                          name TEXT,
+                                          color TEXT,
+                                          expiration_time INTEGER NOT NULL DEFAULT 0,
+                                          blocked INTEGER NOT NULL DEFAULT FALSE,
+                                          archived INTEGER NOT NULL DEFAULT FALSE
+                                        ) STRICT;
+                                        CREATE TABLE group_v1_member (
+                                          _id INTEGER PRIMARY KEY,
+                                          group_id INTEGER NOT NULL REFERENCES group_v1 (_id) ON DELETE CASCADE,
+                                          recipient_id INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,
+                                          UNIQUE(group_id, recipient_id)
+                                        ) STRICT;
+                                        """);
+            }
+        }
+        if (oldVersion < 6) {
+            logger.debug("Updating database: Creating session tables");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        CREATE TABLE session (
+                                          _id INTEGER PRIMARY KEY,
+                                          account_id_type INTEGER NOT NULL,
+                                          recipient_id INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,
+                                          device_id INTEGER NOT NULL,
+                                          record BLOB NOT NULL,
+                                          UNIQUE(account_id_type, recipient_id, device_id)
+                                        ) STRICT;
+                                        """);
+            }
+        }
+        if (oldVersion < 7) {
+            logger.debug("Updating database: Creating identity table");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        CREATE TABLE identity (
+                                          _id INTEGER PRIMARY KEY,
+                                          recipient_id INTEGER UNIQUE NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,
+                                          identity_key BLOB NOT NULL,
+                                          added_timestamp INTEGER NOT NULL,
+                                          trust_level INTEGER NOT NULL
+                                        ) STRICT;
+                                        """);
+            }
+        }
+        if (oldVersion < 8) {
+            logger.debug("Updating database: Creating sender key tables");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        CREATE TABLE sender_key (
+                                          _id INTEGER PRIMARY KEY,
+                                          recipient_id INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,
+                                          device_id INTEGER NOT NULL,
+                                          distribution_id BLOB NOT NULL,
+                                          record BLOB NOT NULL,
+                                          created_timestamp INTEGER NOT NULL,
+                                          UNIQUE(recipient_id, device_id, distribution_id)
+                                        ) STRICT;
+                                        CREATE TABLE sender_key_shared (
+                                          _id INTEGER PRIMARY KEY,
+                                          recipient_id INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,
+                                          device_id INTEGER NOT NULL,
+                                          distribution_id BLOB NOT NULL,
+                                          timestamp INTEGER NOT NULL,
+                                          UNIQUE(recipient_id, device_id, distribution_id)
+                                        ) STRICT;
+                                        """);
+            }
+        }
+        if (oldVersion < 9) {
+            logger.debug("Updating database: Adding urgent field");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE message_send_log_content ADD COLUMN urgent INTEGER NOT NULL DEFAULT TRUE;
+                                        """);
+            }
+        }
+        if (oldVersion < 10) {
+            logger.debug("Updating database: Key tables on serviceId instead of recipientId");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        CREATE TABLE identity2 (
+                                          _id INTEGER PRIMARY KEY,
+                                          uuid BLOB UNIQUE NOT NULL,
+                                          identity_key BLOB NOT NULL,
+                                          added_timestamp INTEGER NOT NULL,
+                                          trust_level INTEGER NOT NULL
+                                        ) STRICT;
+                                        INSERT INTO identity2 (_id, uuid, identity_key, added_timestamp, trust_level)
+                                          SELECT i._id, r.uuid, i.identity_key, i.added_timestamp, i.trust_level
+                                          FROM identity i LEFT JOIN recipient r ON i.recipient_id = r._id
+                                          WHERE uuid IS NOT NULL;
+                                        DROP TABLE identity;
+                                        ALTER TABLE identity2 RENAME TO identity;
+                                        
+                                        DROP INDEX msl_recipient_index;
+                                        ALTER TABLE message_send_log ADD COLUMN uuid BLOB;
+                                        UPDATE message_send_log
+                                          SET uuid = r.uuid
+                                          FROM message_send_log i, (SELECT _id, uuid FROM recipient) AS r
+                                          WHERE i.recipient_id = r._id;
+                                        DELETE FROM message_send_log WHERE uuid IS NULL;
+                                        ALTER TABLE message_send_log DROP COLUMN recipient_id;
+                                        CREATE INDEX msl_recipient_index ON message_send_log (uuid, device_id, content_id);
+                                        
+                                        CREATE TABLE sender_key2 (
+                                          _id INTEGER PRIMARY KEY,
+                                          uuid BLOB NOT NULL,
+                                          device_id INTEGER NOT NULL,
+                                          distribution_id BLOB NOT NULL,
+                                          record BLOB NOT NULL,
+                                          created_timestamp INTEGER NOT NULL,
+                                          UNIQUE(uuid, device_id, distribution_id)
+                                        ) STRICT;
+                                        INSERT INTO sender_key2 (_id, uuid, device_id, distribution_id, record, created_timestamp)
+                                          SELECT s._id, r.uuid, s.device_id, s.distribution_id, s.record, s.created_timestamp
+                                          FROM sender_key s LEFT JOIN recipient r ON s.recipient_id = r._id
+                                          WHERE uuid IS NOT NULL;
+                                        DROP TABLE sender_key;
+                                        ALTER TABLE sender_key2 RENAME TO sender_key;
+                                        
+                                        CREATE TABLE sender_key_shared2 (
+                                          _id INTEGER PRIMARY KEY,
+                                          uuid BLOB NOT NULL,
+                                          device_id INTEGER NOT NULL,
+                                          distribution_id BLOB NOT NULL,
+                                          timestamp INTEGER NOT NULL,
+                                          UNIQUE(uuid, device_id, distribution_id)
+                                        ) STRICT;
+                                        INSERT INTO sender_key_shared2 (_id, uuid, device_id, distribution_id, timestamp)
+                                          SELECT s._id, r.uuid, s.device_id, s.distribution_id, s.timestamp
+                                          FROM sender_key_shared s LEFT JOIN recipient r ON s.recipient_id = r._id
+                                          WHERE uuid IS NOT NULL;
+                                        DROP TABLE sender_key_shared;
+                                        ALTER TABLE sender_key_shared2 RENAME TO sender_key_shared;
+                                        
+                                        CREATE TABLE session2 (
+                                          _id INTEGER PRIMARY KEY,
+                                          account_id_type INTEGER NOT NULL,
+                                          uuid BLOB NOT NULL,
+                                          device_id INTEGER NOT NULL,
+                                          record BLOB NOT NULL,
+                                          UNIQUE(account_id_type, uuid, device_id)
+                                        ) STRICT;
+                                        INSERT INTO session2 (_id, account_id_type, uuid, device_id, record)
+                                          SELECT s._id, s.account_id_type, r.uuid, s.device_id, s.record
+                                          FROM session s LEFT JOIN recipient r ON s.recipient_id = r._id
+                                          WHERE uuid IS NOT NULL;
+                                        DROP TABLE session;
+                                        ALTER TABLE session2 RENAME TO session;
+                                        """);
+            }
+        }
+        if (oldVersion < 11) {
+            logger.debug("Updating database: Adding pni field");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE recipient ADD COLUMN pni BLOB;
+                                        """);
+            }
+        }
+        if (oldVersion < 12) {
+            logger.debug("Updating database: Adding username field");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE recipient ADD COLUMN username TEXT;
+                                        """);
+            }
+        }
+        if (oldVersion < 13) {
+            logger.debug("Updating database: Cleanup unknown service ids");
+            {
+                final var sql = """
+                                DELETE FROM identity AS i
+                                WHERE i.uuid = ?
+                                """;
+                try (final var statement = connection.prepareStatement(sql)) {
+                    statement.setBytes(1, ACI.UNKNOWN.toByteArray());
+                    statement.executeUpdate();
+                }
+            }
+            {
+                final var sql = """
+                                DELETE FROM sender_key_shared AS i
+                                WHERE i.uuid = ?
+                                """;
+                try (final var statement = connection.prepareStatement(sql)) {
+                    statement.setBytes(1, ACI.UNKNOWN.toByteArray());
+                    statement.executeUpdate();
+                }
+            }
+        }
+        if (oldVersion < 14) {
+            logger.debug("Updating database: Creating kyber_pre_key table");
+            {
+                try (final var statement = connection.createStatement()) {
+                    statement.executeUpdate("""
+                                            CREATE TABLE kyber_pre_key (
+                                                    _id INTEGER PRIMARY KEY,
+                                                    account_id_type INTEGER NOT NULL,
+                                                    key_id INTEGER NOT NULL,
+                                                    serialized BLOB NOT NULL,
+                                                    is_last_resort INTEGER NOT NULL,
+                                                    UNIQUE(account_id_type, key_id)
+                                            ) STRICT;
+                                            """);
+                }
+            }
+        }
+        if (oldVersion < 15) {
+            logger.debug("Updating database: Store serviceId as TEXT");
+            try (final var statement = connection.createStatement()) {
+                createUuidMappingTable(connection, statement);
+
+                statement.executeUpdate("""
+                                        CREATE TABLE identity2 (
+                                          _id INTEGER PRIMARY KEY,
+                                          address TEXT UNIQUE NOT NULL,
+                                          identity_key BLOB NOT NULL,
+                                          added_timestamp INTEGER NOT NULL,
+                                          trust_level INTEGER NOT NULL
+                                        ) STRICT;
+                                        INSERT INTO identity2 (_id, address, identity_key, added_timestamp, trust_level)
+                                          SELECT i._id, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = i.uuid) address, i.identity_key, i.added_timestamp, i.trust_level
+                                          FROM identity i
+                                          WHERE address IS NOT NULL;
+                                        DROP TABLE identity;
+                                        ALTER TABLE identity2 RENAME TO identity;
+                                        
+                                        CREATE TABLE message_send_log2 (
+                                          _id INTEGER PRIMARY KEY,
+                                          content_id INTEGER NOT NULL REFERENCES message_send_log_content (_id) ON DELETE CASCADE,
+                                          address TEXT NOT NULL,
+                                          device_id INTEGER NOT NULL
+                                        ) STRICT;
+                                        INSERT INTO message_send_log2 (_id, content_id, address, device_id)
+                                          SELECT m._id, m.content_id, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = m.uuid) address, m.device_id
+                                          FROM message_send_log m
+                                          WHERE address IS NOT NULL;
+                                        DROP INDEX msl_recipient_index;
+                                        DROP INDEX msl_content_index;
+                                        DROP TABLE message_send_log;
+                                        ALTER TABLE message_send_log2 RENAME TO message_send_log;
+                                        CREATE INDEX msl_recipient_index ON message_send_log (address, device_id, content_id);
+                                        CREATE INDEX msl_content_index ON message_send_log (content_id);
+                                        
+                                        CREATE TABLE sender_key2 (
+                                          _id INTEGER PRIMARY KEY,
+                                          address TEXT NOT NULL,
+                                          device_id INTEGER NOT NULL,
+                                          distribution_id BLOB NOT NULL,
+                                          record BLOB NOT NULL,
+                                          created_timestamp INTEGER NOT NULL,
+                                          UNIQUE(address, device_id, distribution_id)
+                                        ) STRICT;
+                                        INSERT INTO sender_key2 (_id, address, device_id, distribution_id, record, created_timestamp)
+                                          SELECT s._id, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = s.uuid) address, s.device_id, s.distribution_id, s.record, s.created_timestamp
+                                          FROM sender_key s
+                                          WHERE address IS NOT NULL;
+                                        DROP TABLE sender_key;
+                                        ALTER TABLE sender_key2 RENAME TO sender_key;
+                                        
+                                        CREATE TABLE sender_key_shared2 (
+                                          _id INTEGER PRIMARY KEY,
+                                          address TEXT NOT NULL,
+                                          device_id INTEGER NOT NULL,
+                                          distribution_id BLOB NOT NULL,
+                                          timestamp INTEGER NOT NULL,
+                                          UNIQUE(address, device_id, distribution_id)
+                                        ) STRICT;
+                                        INSERT INTO sender_key_shared2 (_id, address, device_id, distribution_id, timestamp)
+                                          SELECT s._id, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = s.uuid) address, s.device_id, s.distribution_id, s.timestamp
+                                          FROM sender_key_shared s
+                                          WHERE address IS NOT NULL;
+                                        DROP TABLE sender_key_shared;
+                                        ALTER TABLE sender_key_shared2 RENAME TO sender_key_shared;
+                                        
+                                        CREATE TABLE session2 (
+                                          _id INTEGER PRIMARY KEY,
+                                          account_id_type INTEGER NOT NULL,
+                                          address TEXT NOT NULL,
+                                          device_id INTEGER NOT NULL,
+                                          record BLOB NOT NULL,
+                                          UNIQUE(account_id_type, address, device_id)
+                                        ) STRICT;
+                                        INSERT INTO session2 (_id, account_id_type, address, device_id, record)
+                                          SELECT s._id, s.account_id_type, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = s.uuid) address, s.device_id, s.record
+                                          FROM session s
+                                          WHERE address IS NOT NULL;
+                                        DROP TABLE session;
+                                        ALTER TABLE session2 RENAME TO session;
+                                        
+                                        DROP TABLE tmp_mapping_table;
+                                        """);
+            }
+        }
+        if (oldVersion < 16) {
+            logger.debug("Updating database: Adding stale_timestamp prekey field");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE pre_key ADD COLUMN stale_timestamp INTEGER;
+                                        ALTER TABLE kyber_pre_key ADD COLUMN stale_timestamp INTEGER;
+                                        ALTER TABLE kyber_pre_key ADD COLUMN timestamp INTEGER DEFAULT 0;
+                                        """);
+            }
+        }
+        if (oldVersion < 17) {
+            logger.debug("Updating database: Adding key_value table");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        CREATE TABLE key_value (
+                                                _id INTEGER PRIMARY KEY,
+                                                key TEXT UNIQUE NOT NULL,
+                                                value ANY
+                                        ) STRICT;
+                                        """);
+            }
+        }
+        if (oldVersion < 18) {
+            logger.debug("Updating database: Adding cdsi table");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        CREATE TABLE cdsi (
+                                          _id INTEGER PRIMARY KEY,
+                                          number TEXT NOT NULL UNIQUE,
+                                          last_seen_at INTEGER NOT NULL
+                                        ) STRICT;
+                                        """);
+            }
+        }
+        if (oldVersion < 19) {
+            logger.debug("Updating database: Adding contact hidden column");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE recipient ADD COLUMN hidden INTEGER NOT NULL DEFAULT FALSE;
+                                        """);
+            }
+        }
+        if (oldVersion < 20) {
+            logger.debug("Updating database: Creating storage id tables and columns");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        CREATE TABLE storage_id (
+                                          _id INTEGER PRIMARY KEY,
+                                          type INTEGER NOT NULL,
+                                          storage_id BLOB UNIQUE NOT NULL
+                                        ) STRICT;
+                                        ALTER TABLE group_v1 ADD COLUMN storage_id BLOB;
+                                        ALTER TABLE group_v1 ADD COLUMN storage_record BLOB;
+                                        ALTER TABLE group_v2 ADD COLUMN storage_id BLOB;
+                                        ALTER TABLE group_v2 ADD COLUMN storage_record BLOB;
+                                        ALTER TABLE recipient ADD COLUMN storage_id BLOB;
+                                        ALTER TABLE recipient ADD COLUMN storage_record BLOB;
+                                        """);
+            }
+        }
+        if (oldVersion < 21) {
+            logger.debug("Updating database: Create unregistered column");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE recipient ADD unregistered_timestamp INTEGER;
+                                        """);
+            }
+        }
+        if (oldVersion < 22) {
+            logger.debug("Updating database: Store recipient aci/pni as TEXT");
+            try (final var statement = connection.createStatement()) {
+                createUuidMappingTable(connection, statement);
+
+                statement.executeUpdate("""
+                                        CREATE TABLE recipient2 (
+                                          _id INTEGER PRIMARY KEY AUTOINCREMENT,
+                                          storage_id BLOB UNIQUE,
+                                          storage_record BLOB,
+                                          number TEXT UNIQUE,
+                                          username TEXT UNIQUE,
+                                          aci TEXT UNIQUE,
+                                          pni TEXT UNIQUE,
+                                          unregistered_timestamp INTEGER,
+                                          profile_key BLOB,
+                                          profile_key_credential BLOB,
+                                        
+                                          given_name TEXT,
+                                          family_name TEXT,
+                                          nick_name TEXT,
+                                          color TEXT,
+                                        
+                                          expiration_time INTEGER NOT NULL DEFAULT 0,
+                                          mute_until INTEGER NOT NULL DEFAULT 0,
+                                          blocked INTEGER NOT NULL DEFAULT FALSE,
+                                          archived INTEGER NOT NULL DEFAULT FALSE,
+                                          profile_sharing INTEGER NOT NULL DEFAULT FALSE,
+                                          hide_story INTEGER NOT NULL DEFAULT FALSE,
+                                          hidden INTEGER NOT NULL DEFAULT FALSE,
+                                        
+                                          profile_last_update_timestamp INTEGER NOT NULL DEFAULT 0,
+                                          profile_given_name TEXT,
+                                          profile_family_name TEXT,
+                                          profile_about TEXT,
+                                          profile_about_emoji TEXT,
+                                          profile_avatar_url_path TEXT,
+                                          profile_mobile_coin_address BLOB,
+                                          profile_unidentified_access_mode TEXT,
+                                          profile_capabilities TEXT
+                                        ) STRICT;
+                                        INSERT INTO recipient2 (_id, aci, pni, storage_id, storage_record, number, username, unregistered_timestamp, profile_key, profile_key_credential, given_name, family_name, color, expiration_time, blocked, archived, profile_sharing, hidden, profile_last_update_timestamp, profile_given_name, profile_family_name, profile_about, profile_about_emoji, profile_avatar_url_path, profile_mobile_coin_address, profile_unidentified_access_mode, profile_capabilities)
+                                          SELECT r._id, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = r.uuid AND t.address not like 'PNI:%') aci, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = r.pni AND t.address like 'PNI:%' AND (SELECT COUNT(pni) FROM recipient WHERE pni = r.pni) = 1) pni, storage_id, storage_record, number, username, unregistered_timestamp, profile_key, profile_key_credential, given_name, family_name, color, expiration_time, blocked, archived, profile_sharing, hidden, profile_last_update_timestamp, profile_given_name, profile_family_name, profile_about, profile_about_emoji, profile_avatar_url_path, profile_mobile_coin_address, profile_unidentified_access_mode, profile_capabilities
+                                          FROM recipient r;
+                                        DROP TABLE recipient;
+                                        ALTER TABLE recipient2 RENAME TO recipient;
+                                        
+                                        DROP TABLE tmp_mapping_table;
+                                        """);
+            }
+        }
+        if (oldVersion < 23) {
+            logger.debug("Updating database: Create group profile sharing column");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE group_v2 ADD profile_sharing INTEGER NOT NULL DEFAULT TRUE;
+                                        """);
+            }
+        }
+        if (oldVersion < 24) {
+            logger.debug("Updating database: Create needs_pni_signature column");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE recipient ADD needs_pni_signature INTEGER NOT NULL DEFAULT FALSE;
+                                        """);
+            }
+        }
+        if (oldVersion < 25) {
+            logger.debug("Updating database: Create nick_name and note columns");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE recipient ADD nick_name_given_name TEXT;
+                                        ALTER TABLE recipient ADD nick_name_family_name TEXT;
+                                        ALTER TABLE recipient ADD note TEXT;
+                                        """);
+            }
+        }
+        if (oldVersion < 26) {
+            logger.debug("Updating database: Create discoverable and profile_phone_number_sharing columns");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE recipient ADD discoverable INTEGER;
+                                        ALTER TABLE recipient ADD profile_phone_number_sharing TEXT;
+                                        """);
+            }
+        }
+        if (oldVersion < 27) {
+            logger.debug("Updating database: Create expiration_time_version column");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE recipient ADD expiration_time_version INTEGER DEFAULT 1 NOT NULL;
+                                        """);
+            }
+        }
+    }
+
+    private static void createUuidMappingTable(
+            final Connection connection,
+            final Statement statement
+    ) throws SQLException {
+        statement.executeUpdate("""
+                                CREATE TABLE tmp_mapping_table (
+                                  uuid BLOB NOT NULL,
+                                  address TEXT NOT NULL
+                                ) STRICT;
+                                """);
+
+        final var sql = (
+                """
+                SELECT r.uuid, r.pni
+                FROM recipient r
+                """
+        );
+        final var uuidAddressMapping = new HashMap<UUID, ServiceId>();
+        try (final var preparedStatement = connection.prepareStatement(sql)) {
+            try (var result = Utils.executeQueryForStream(preparedStatement, (resultSet) -> {
+                final var pni = Optional.ofNullable(resultSet.getBytes("pni"))
+                        .map(UuidUtil::parseOrNull)
+                        .map(ServiceId.PNI::from);
+                final var serviceIdUuid = Optional.ofNullable(resultSet.getBytes("uuid")).map(UuidUtil::parseOrNull);
+                final var serviceId = serviceIdUuid.isPresent() && pni.isPresent() && serviceIdUuid.get()
+                        .equals(pni.get().getRawUuid())
+                        ? pni.<ServiceId>map(p -> p)
+                        : serviceIdUuid.<ServiceId>map(ACI::from);
+
+                return new Pair<>(serviceId, pni);
+            })) {
+                result.forEach(p -> {
+                    final var serviceId = p.first();
+                    final var pni = p.second();
+                    if (serviceId.isPresent()) {
+                        final var rawUuid = serviceId.get().getRawUuid();
+                        if (!uuidAddressMapping.containsKey(rawUuid)) {
+                            uuidAddressMapping.put(rawUuid, serviceId.get());
+                        }
+                    }
+                    if (pni.isPresent()) {
+                        uuidAddressMapping.put(pni.get().getRawUuid(), pni.get());
+                    }
+                });
+            }
+        }
+
+        final var insertSql = """
+                              INSERT INTO tmp_mapping_table (uuid, address)
+                              VALUES (?,?)
+                              """;
+        try (final var insertStatement = connection.prepareStatement(insertSql)) {
+            for (final var entry : uuidAddressMapping.entrySet()) {
+                final var uuid = entry.getKey();
+                final var serviceId = entry.getValue();
+                insertStatement.setBytes(1, UuidUtil.toByteArray(uuid));
+                insertStatement.setString(2, serviceId.toString());
+                insertStatement.execute();
+            }
         }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java
new file mode 100644
index 00000000..d25f1a72
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java
@@ -0,0 +1,93 @@
+package org.asamk.signal.manager.storage;
+
+import org.asamk.signal.manager.util.IOUtils;
+import org.asamk.signal.manager.util.MimeUtils;
+import org.asamk.signal.manager.util.Utils;
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId;
+import org.whispersystems.signalservice.api.util.StreamDetails;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Optional;
+
+public class AttachmentStore {
+
+    private final File attachmentsPath;
+
+    public AttachmentStore(final File attachmentsPath) {
+        this.attachmentsPath = attachmentsPath;
+    }
+
+    public void storeAttachmentPreview(
+            final SignalServiceAttachmentPointer pointer,
+            final AttachmentStorer storer
+    ) throws IOException {
+        storeAttachment(getAttachmentPreviewFile(pointer.getRemoteId(),
+                pointer.getFileName(),
+                Optional.ofNullable(pointer.getContentType())), storer);
+    }
+
+    public void storeAttachment(
+            final SignalServiceAttachmentPointer pointer,
+            final AttachmentStorer storer
+    ) throws IOException {
+        storeAttachment(getAttachmentFile(pointer), storer);
+    }
+
+    public File getAttachmentFile(final SignalServiceAttachmentPointer pointer) {
+        return getAttachmentFile(pointer.getRemoteId(),
+                pointer.getFileName(),
+                Optional.ofNullable(pointer.getContentType()));
+    }
+
+    public StreamDetails retrieveAttachment(final String id) throws IOException {
+        final var attachmentFile = new File(attachmentsPath, id);
+        return Utils.createStreamDetailsFromFile(attachmentFile);
+    }
+
+    private void storeAttachment(final File attachmentFile, final AttachmentStorer storer) throws IOException {
+        createAttachmentsDir();
+        try (OutputStream output = new FileOutputStream(attachmentFile)) {
+            storer.store(output);
+        }
+    }
+
+    private File getAttachmentPreviewFile(
+            SignalServiceAttachmentRemoteId attachmentId,
+            Optional<String> filename,
+            Optional<String> contentType
+    ) {
+        final var extension = getAttachmentExtension(filename, contentType);
+        return new File(attachmentsPath, attachmentId.toString() + extension + ".preview");
+    }
+
+    private File getAttachmentFile(
+            SignalServiceAttachmentRemoteId attachmentId,
+            Optional<String> filename,
+            Optional<String> contentType
+    ) {
+        final var extension = getAttachmentExtension(filename, contentType);
+        return new File(attachmentsPath, attachmentId.toString() + extension);
+    }
+
+    private static String getAttachmentExtension(final Optional<String> filename, final Optional<String> contentType) {
+        return filename.filter(f -> f.contains("."))
+                .map(f -> f.substring(f.lastIndexOf(".") + 1))
+                .or(() -> contentType.flatMap(MimeUtils::guessExtensionFromMimeType))
+                .map(ext -> "." + ext)
+                .orElse("");
+    }
+
+    private void createAttachmentsDir() throws IOException {
+        IOUtils.createPrivateDirectories(attachmentsPath);
+    }
+
+    @FunctionalInterface
+    public interface AttachmentStorer {
+
+        void store(OutputStream outputStream) throws IOException;
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/AvatarStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/AvatarStore.java
similarity index 97%
rename from lib/src/main/java/org/asamk/signal/manager/AvatarStore.java
rename to lib/src/main/java/org/asamk/signal/manager/storage/AvatarStore.java
index b4bd188c..e4475b6e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/AvatarStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AvatarStore.java
@@ -1,6 +1,6 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.storage;
 
-import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.util.IOUtils;
 import org.asamk.signal.manager.util.Utils;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/Database.java b/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
index 88d34421..1d84daef 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
@@ -24,7 +24,8 @@ public abstract class Database implements AutoCloseable {
     }
 
     public static <T extends Database> T initDatabase(
-            File databaseFile, Function<HikariDataSource, T> newDatabase
+            File databaseFile,
+            Function<HikariDataSource, T> newDatabase
     ) throws SQLException {
         HikariDataSource dataSource = null;
 
@@ -47,25 +48,32 @@ public abstract class Database implements AutoCloseable {
     }
 
     @Override
-    public void close() throws SQLException {
+    public void close() {
         dataSource.close();
     }
 
     protected final void initDb() throws SQLException {
         try (final var connection = dataSource.getConnection()) {
+            connection.setAutoCommit(false);
             final var userVersion = getUserVersion(connection);
             logger.trace("Current database version: {} Program database version: {}", userVersion, databaseVersion);
 
-            if (userVersion > databaseVersion) {
+            if (userVersion == 0) {
+                createDatabase(connection);
+                setUserVersion(connection, databaseVersion);
+            } else if (userVersion > databaseVersion) {
                 logger.error("Database has been updated by a newer signal-cli version");
                 throw new SQLException("Database has been updated by a newer signal-cli version");
             } else if (userVersion < databaseVersion) {
                 upgradeDatabase(connection, userVersion);
                 setUserVersion(connection, databaseVersion);
             }
+            connection.commit();
         }
     }
 
+    protected abstract void createDatabase(final Connection connection) throws SQLException;
+
     protected abstract void upgradeDatabase(final Connection connection, long oldVersion) throws SQLException;
 
     private static long getUserVersion(final Connection connection) throws SQLException {
@@ -83,14 +91,16 @@ public abstract class Database implements AutoCloseable {
 
     private static HikariDataSource getHikariDataSource(final String databaseFile) {
         final var sqliteConfig = new SQLiteConfig();
-        sqliteConfig.setBusyTimeout(10_000);
+        sqliteConfig.setBusyTimeout(60_000);
         sqliteConfig.setTransactionMode(SQLiteConfig.TransactionMode.IMMEDIATE);
 
         HikariConfig config = new HikariConfig();
-        config.setJdbcUrl("jdbc:sqlite:" + databaseFile);
+        config.setJdbcUrl("jdbc:sqlite:" + databaseFile + "?foreign_keys=ON&journal_mode=wal");
         config.setDataSourceProperties(sqliteConfig.toProperties());
         config.setMinimumIdle(1);
-        config.setConnectionInitSql("PRAGMA foreign_keys=ON");
+        config.setConnectionTimeout(90_000);
+        config.setMaximumPoolSize(50);
+        config.setMaxLifetime(0);
         return new HikariDataSource(config);
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index f66d3e4a..83040906 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -3,37 +3,52 @@ package org.asamk.signal.manager.storage;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import org.asamk.signal.manager.Settings;
+import org.asamk.signal.manager.api.Contact;
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.Profile;
+import org.asamk.signal.manager.api.ServiceEnvironment;
 import org.asamk.signal.manager.api.TrustLevel;
-import org.asamk.signal.manager.config.ServiceEnvironment;
-import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.helper.RecipientAddressResolver;
 import org.asamk.signal.manager.storage.configuration.ConfigurationStore;
+import org.asamk.signal.manager.storage.configuration.LegacyConfigurationStore;
 import org.asamk.signal.manager.storage.contacts.ContactsStore;
 import org.asamk.signal.manager.storage.contacts.LegacyJsonContactsStore;
 import org.asamk.signal.manager.storage.groups.GroupInfoV1;
-import org.asamk.signal.manager.storage.groups.GroupInfoV2;
 import org.asamk.signal.manager.storage.groups.GroupStore;
+import org.asamk.signal.manager.storage.groups.LegacyGroupStore;
 import org.asamk.signal.manager.storage.identities.IdentityKeyStore;
-import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
+import org.asamk.signal.manager.storage.identities.LegacyIdentityKeyStore;
+import org.asamk.signal.manager.storage.identities.SignalIdentityKeyStore;
+import org.asamk.signal.manager.storage.keyValue.KeyValueEntry;
+import org.asamk.signal.manager.storage.keyValue.KeyValueStore;
 import org.asamk.signal.manager.storage.messageCache.MessageCache;
+import org.asamk.signal.manager.storage.prekeys.KyberPreKeyStore;
+import org.asamk.signal.manager.storage.prekeys.LegacyPreKeyStore;
+import org.asamk.signal.manager.storage.prekeys.LegacySignedPreKeyStore;
 import org.asamk.signal.manager.storage.prekeys.PreKeyStore;
 import org.asamk.signal.manager.storage.prekeys.SignedPreKeyStore;
 import org.asamk.signal.manager.storage.profiles.LegacyProfileStore;
 import org.asamk.signal.manager.storage.profiles.ProfileStore;
 import org.asamk.signal.manager.storage.protocol.LegacyJsonSignalProtocolStore;
 import org.asamk.signal.manager.storage.protocol.SignalProtocolStore;
-import org.asamk.signal.manager.storage.recipients.Contact;
+import org.asamk.signal.manager.storage.recipients.CdsiStore;
 import org.asamk.signal.manager.storage.recipients.LegacyRecipientStore;
-import org.asamk.signal.manager.storage.recipients.Profile;
+import org.asamk.signal.manager.storage.recipients.LegacyRecipientStore2;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
+import org.asamk.signal.manager.storage.recipients.RecipientIdCreator;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
 import org.asamk.signal.manager.storage.recipients.RecipientStore;
 import org.asamk.signal.manager.storage.recipients.RecipientTrustedResolver;
 import org.asamk.signal.manager.storage.sendLog.MessageSendLogStore;
+import org.asamk.signal.manager.storage.senderKeys.LegacySenderKeyRecordStore;
+import org.asamk.signal.manager.storage.senderKeys.LegacySenderKeySharedStore;
 import org.asamk.signal.manager.storage.senderKeys.SenderKeyStore;
+import org.asamk.signal.manager.storage.sessions.LegacySessionStore;
 import org.asamk.signal.manager.storage.sessions.SessionStore;
+import org.asamk.signal.manager.storage.stickers.LegacyStickerStore;
 import org.asamk.signal.manager.storage.stickers.StickerStore;
 import org.asamk.signal.manager.storage.threads.LegacyJsonThreadStore;
 import org.asamk.signal.manager.util.IOUtils;
@@ -41,24 +56,29 @@ import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidMessageException;
 import org.signal.libsignal.protocol.SignalProtocolAddress;
+import org.signal.libsignal.protocol.state.KyberPreKeyRecord;
 import org.signal.libsignal.protocol.state.PreKeyRecord;
 import org.signal.libsignal.protocol.state.SessionRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
-import org.signal.libsignal.protocol.util.Medium;
+import org.signal.libsignal.protocol.util.KeyHelper;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.AccountEntropyPool;
 import org.whispersystems.signalservice.api.SignalServiceAccountDataStore;
 import org.whispersystems.signalservice.api.SignalServiceDataStore;
+import org.whispersystems.signalservice.api.account.AccountAttributes;
+import org.whispersystems.signalservice.api.account.PreKeyCollection;
+import org.whispersystems.signalservice.api.backup.MediaRootBackupKey;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
-import org.whispersystems.signalservice.api.push.ACI;
-import org.whispersystems.signalservice.api.push.DistributionId;
-import org.whispersystems.signalservice.api.push.PNI;
 import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.push.UsernameLinkComponents;
 import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
 import org.whispersystems.signalservice.api.storage.StorageKey;
 import org.whispersystems.signalservice.api.util.CredentialsProvider;
@@ -77,22 +97,26 @@ import java.nio.channels.ClosedChannelException;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 import java.nio.file.Files;
-import java.security.SecureRandom;
+import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Base64;
 import java.util.Comparator;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
+import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_MAXIMUM_ID;
+import static org.asamk.signal.manager.config.ServiceConfig.getCapabilities;
+
 public class SignalAccount implements Closeable {
 
-    private final static Logger logger = LoggerFactory.getLogger(SignalAccount.class);
+    private static final Logger logger = LoggerFactory.getLogger(SignalAccount.class);
 
     private static final int MINIMUM_STORAGE_VERSION = 1;
-    private static final int CURRENT_STORAGE_VERSION = 3;
+    private static final int CURRENT_STORAGE_VERSION = 10;
 
     private final Object LOCK = new Object();
 
@@ -105,51 +129,63 @@ public class SignalAccount implements Closeable {
 
     private File dataPath;
     private String accountPath;
+
     private ServiceEnvironment serviceEnvironment;
     private String number;
-    private ACI aci;
-    private PNI pni;
+    private String username;
+    private UsernameLinkComponents usernameLink;
     private String encryptedDeviceName;
-    private int deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
-    private boolean isMultiDevice = false;
+    private int deviceId = 0;
     private String password;
     private String registrationLockPin;
     private MasterKey pinMasterKey;
     private StorageKey storageKey;
-    private long storageManifestVersion = -1;
+    private AccountEntropyPool accountEntropyPool;
+    private MediaRootBackupKey mediaRootBackupKey;
     private ProfileKey profileKey;
-    private int aciPreKeyIdOffset = 1;
-    private int aciNextSignedPreKeyId = 1;
-    private int pniPreKeyIdOffset = 1;
-    private int pniNextSignedPreKeyId = 1;
-    private IdentityKeyPair aciIdentityKeyPair;
-    private IdentityKeyPair pniIdentityKeyPair;
-    private int localRegistrationId;
-    private TrustNewIdentity trustNewIdentity;
-    private long lastReceiveTimestamp = 0;
 
+    private Settings settings;
+
+    private final KeyValueEntry<String> verificationSessionId = new KeyValueEntry<>("verification-session-id",
+            String.class);
+    private final KeyValueEntry<String> verificationSessionNumber = new KeyValueEntry<>("verification-session-number",
+            String.class);
+    private final KeyValueEntry<Long> lastReceiveTimestamp = new KeyValueEntry<>("last-receive-timestamp",
+            long.class,
+            0L);
+    private final KeyValueEntry<Boolean> needsToRetryFailedMessages = new KeyValueEntry<>("retry-failed-messages",
+            Boolean.class,
+            true);
+    private final KeyValueEntry<byte[]> cdsiToken = new KeyValueEntry<>("cdsi-token", byte[].class);
+    private final KeyValueEntry<Long> lastRecipientsRefresh = new KeyValueEntry<>("last-recipients-refresh",
+            long.class);
+    private final KeyValueEntry<Long> storageManifestVersion = new KeyValueEntry<>("storage-manifest-version",
+            long.class,
+            -1L);
+    private final KeyValueEntry<Boolean> unrestrictedUnidentifiedAccess = new KeyValueEntry<>(
+            "unrestricted-unidentified-access",
+            Boolean.class,
+            false);
+    private boolean isMultiDevice = false;
     private boolean registered = false;
 
-    private SignalProtocolStore signalProtocolStore;
-    private PreKeyStore aciPreKeyStore;
-    private SignedPreKeyStore aciSignedPreKeyStore;
-    private PreKeyStore pniPreKeyStore;
-    private SignedPreKeyStore pniSignedPreKeyStore;
-    private SessionStore sessionStore;
+    private final AccountData<ACI> aciAccountData = new AccountData<>(ServiceIdType.ACI);
+    private final AccountData<PNI> pniAccountData = new AccountData<>(ServiceIdType.PNI);
     private IdentityKeyStore identityKeyStore;
     private SenderKeyStore senderKeyStore;
     private GroupStore groupStore;
-    private GroupStore.Storage groupStoreStorage;
     private RecipientStore recipientStore;
     private StickerStore stickerStore;
-    private StickerStore.Storage stickerStoreStorage;
+    private UnknownStorageIdStore unknownStorageIdStore;
     private ConfigurationStore configurationStore;
-    private ConfigurationStore.Storage configurationStoreStorage;
+    private KeyValueStore keyValueStore;
+    private CdsiStore cdsiStore;
 
     private MessageCache messageCache;
     private MessageSendLogStore messageSendLogStore;
 
     private AccountDatabase accountDatabase;
+    private RecipientId selfRecipientId;
 
     private SignalAccount(final FileChannel fileChannel, final FileLock lock) {
         this.fileChannel = fileChannel;
@@ -157,17 +193,19 @@ public class SignalAccount implements Closeable {
     }
 
     public static SignalAccount load(
-            File dataPath, String accountPath, boolean waitForLock, final TrustNewIdentity trustNewIdentity
+            File dataPath,
+            String accountPath,
+            boolean waitForLock,
+            final Settings settings
     ) throws IOException {
         logger.trace("Opening account file");
         final var fileName = getFileName(dataPath, accountPath);
         final var pair = openFileChannel(fileName, waitForLock);
         try {
             var signalAccount = new SignalAccount(pair.first(), pair.second());
-            logger.trace("Loading account file");
-            signalAccount.load(dataPath, accountPath, trustNewIdentity);
-            logger.trace("Migrating legacy parts of account file");
+            signalAccount.load(dataPath, accountPath, settings);
             signalAccount.migrateLegacyConfigs();
+            signalAccount.init();
 
             return signalAccount;
         } catch (Throwable e) {
@@ -184,9 +222,8 @@ public class SignalAccount implements Closeable {
             ServiceEnvironment serviceEnvironment,
             IdentityKeyPair aciIdentityKey,
             IdentityKeyPair pniIdentityKey,
-            int registrationId,
             ProfileKey profileKey,
-            final TrustNewIdentity trustNewIdentity
+            final Settings settings
     ) throws IOException {
         IOUtils.createPrivateDirectories(dataPath);
         var fileName = getFileName(dataPath, accountPath);
@@ -201,216 +238,191 @@ public class SignalAccount implements Closeable {
         signalAccount.number = number;
         signalAccount.serviceEnvironment = serviceEnvironment;
         signalAccount.profileKey = profileKey;
+        signalAccount.password = KeyUtils.createPassword();
+        signalAccount.deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
 
         signalAccount.dataPath = dataPath;
-        signalAccount.aciIdentityKeyPair = aciIdentityKey;
-        signalAccount.pniIdentityKeyPair = pniIdentityKey;
-        signalAccount.localRegistrationId = registrationId;
-        signalAccount.trustNewIdentity = trustNewIdentity;
-        signalAccount.groupStore = new GroupStore(getGroupCachePath(dataPath, accountPath),
-                signalAccount.getRecipientResolver(),
-                signalAccount::saveGroupStore);
-        signalAccount.stickerStore = new StickerStore(signalAccount::saveStickerStore);
-        signalAccount.configurationStore = new ConfigurationStore(signalAccount::saveConfigurationStore);
+        signalAccount.aciAccountData.setIdentityKeyPair(aciIdentityKey);
+        signalAccount.pniAccountData.setIdentityKeyPair(pniIdentityKey);
+        signalAccount.aciAccountData.setLocalRegistrationId(KeyHelper.generateRegistrationId(false));
+        signalAccount.pniAccountData.setLocalRegistrationId(KeyHelper.generateRegistrationId(false));
+        signalAccount.initAllPreKeyIds();
+        signalAccount.settings = settings;
 
         signalAccount.registered = false;
 
         signalAccount.previousStorageVersion = CURRENT_STORAGE_VERSION;
-        signalAccount.migrateLegacyConfigs();
+        signalAccount.init();
         signalAccount.save();
 
         return signalAccount;
     }
 
-    public static SignalAccount createOrUpdateLinkedAccount(
-            File dataPath,
-            String accountPath,
-            String number,
-            ServiceEnvironment serviceEnvironment,
-            ACI aci,
-            PNI pni,
-            String password,
-            String encryptedDeviceName,
-            int deviceId,
-            IdentityKeyPair aciIdentityKey,
-            IdentityKeyPair pniIdentityKey,
-            int registrationId,
-            ProfileKey profileKey,
-            final TrustNewIdentity trustNewIdentity
+    public static SignalAccount createLinkedAccount(
+            final File dataPath,
+            final String accountPath,
+            final ServiceEnvironment serviceEnvironment,
+            final Settings settings
     ) throws IOException {
         IOUtils.createPrivateDirectories(dataPath);
         var fileName = getFileName(dataPath, accountPath);
-        if (!fileName.exists()) {
-            return createLinkedAccount(dataPath,
-                    accountPath,
-                    number,
-                    serviceEnvironment,
-                    aci,
-                    pni,
-                    password,
-                    encryptedDeviceName,
-                    deviceId,
-                    aciIdentityKey,
-                    pniIdentityKey,
-                    registrationId,
-                    profileKey,
-                    trustNewIdentity);
-        }
+        IOUtils.createPrivateFile(fileName);
+
+        final var pair = openFileChannel(fileName, true);
+        final var signalAccount = new SignalAccount(pair.first(), pair.second());
+
+        signalAccount.dataPath = dataPath;
+        signalAccount.accountPath = accountPath;
+        signalAccount.serviceEnvironment = serviceEnvironment;
+        signalAccount.aciAccountData.setLocalRegistrationId(KeyHelper.generateRegistrationId(false));
+        signalAccount.pniAccountData.setLocalRegistrationId(KeyHelper.generateRegistrationId(false));
+        signalAccount.settings = settings;
+
+        signalAccount.previousStorageVersion = CURRENT_STORAGE_VERSION;
 
-        final var signalAccount = load(dataPath, accountPath, true, trustNewIdentity);
-        signalAccount.setProvisioningData(number,
-                aci,
-                pni,
-                password,
-                encryptedDeviceName,
-                deviceId,
-                aciIdentityKey,
-                pniIdentityKey,
-                profileKey);
-        signalAccount.getRecipientTrustedResolver()
-                .resolveSelfRecipientTrusted(signalAccount.getSelfRecipientAddress());
-        signalAccount.getSessionStore().archiveAllSessions();
-        signalAccount.getSenderKeyStore().deleteAll();
-        signalAccount.clearAllPreKeys();
         return signalAccount;
     }
 
+    public void setProvisioningData(
+            final String number,
+            final ACI aci,
+            final PNI pni,
+            final String password,
+            final String encryptedDeviceName,
+            final IdentityKeyPair aciIdentity,
+            final IdentityKeyPair pniIdentity,
+            final ProfileKey profileKey,
+            final MasterKey masterKey,
+            final AccountEntropyPool accountEntropyPool,
+            final MediaRootBackupKey mediaRootBackupKey
+    ) {
+        this.deviceId = 0;
+        this.number = number;
+        this.aciAccountData.setServiceId(aci);
+        this.pniAccountData.setServiceId(pni);
+        this.init();
+        getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
+        this.password = password;
+        this.profileKey = profileKey;
+        this.encryptedDeviceName = encryptedDeviceName;
+        this.aciAccountData.setIdentityKeyPair(aciIdentity);
+        this.pniAccountData.setIdentityKeyPair(pniIdentity);
+        this.registered = false;
+        this.isMultiDevice = true;
+        setLastReceiveTimestamp(0L);
+        if (accountEntropyPool != null) {
+            this.pinMasterKey = null;
+            this.accountEntropyPool = accountEntropyPool;
+        } else {
+            this.pinMasterKey = masterKey;
+            this.accountEntropyPool = null;
+        }
+        this.mediaRootBackupKey = mediaRootBackupKey;
+        getKeyValueStore().storeEntry(storageManifestVersion, -1L);
+        this.setStorageManifest(null);
+        this.storageKey = null;
+        getSenderKeyStore().deleteAll();
+        trustSelfIdentity(ServiceIdType.ACI);
+        trustSelfIdentity(ServiceIdType.PNI);
+        aciAccountData.getSessionStore().archiveAllSessions();
+        pniAccountData.getSessionStore().archiveAllSessions();
+        clearAllPreKeys();
+        getKeyValueStore().storeEntry(lastRecipientsRefresh, null);
+        save();
+    }
+
+    public void finishLinking(
+            final int deviceId,
+            final PreKeyCollection aciPreKeys,
+            final PreKeyCollection pniPreKeys
+    ) {
+        this.registered = true;
+        this.deviceId = deviceId;
+        setPreKeys(ServiceIdType.ACI, aciPreKeys);
+        setPreKeys(ServiceIdType.PNI, pniPreKeys);
+        save();
+    }
+
+    public void finishRegistration(
+            final ACI aci,
+            final PNI pni,
+            final MasterKey masterKey,
+            final String pin,
+            final PreKeyCollection aciPreKeys,
+            final PreKeyCollection pniPreKeys
+    ) {
+        this.pinMasterKey = masterKey;
+        this.accountEntropyPool = null;
+        getKeyValueStore().storeEntry(storageManifestVersion, -1L);
+        this.setStorageManifest(null);
+        this.storageKey = null;
+        this.encryptedDeviceName = null;
+        this.deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
+        this.isMultiDevice = false;
+        this.registered = true;
+        this.aciAccountData.setServiceId(aci);
+        this.pniAccountData.setServiceId(pni);
+        init();
+        this.registrationLockPin = pin;
+        setLastReceiveTimestamp(0L);
+        save();
+
+        setPreKeys(ServiceIdType.ACI, aciPreKeys);
+        setPreKeys(ServiceIdType.PNI, pniPreKeys);
+        aciAccountData.getSessionStore().archiveAllSessions();
+        pniAccountData.getSessionStore().archiveAllSessions();
+        getSenderKeyStore().deleteAll();
+        getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
+        trustSelfIdentity(ServiceIdType.ACI);
+        trustSelfIdentity(ServiceIdType.PNI);
+        getKeyValueStore().storeEntry(lastRecipientsRefresh, null);
+    }
+
     public void initDatabase() {
         getAccountDatabase();
     }
 
-    private void clearAllPreKeys() {
-        this.aciPreKeyIdOffset = new SecureRandom().nextInt(Medium.MAX_VALUE);
-        this.aciNextSignedPreKeyId = new SecureRandom().nextInt(Medium.MAX_VALUE);
-        this.pniPreKeyIdOffset = new SecureRandom().nextInt(Medium.MAX_VALUE);
-        this.pniNextSignedPreKeyId = new SecureRandom().nextInt(Medium.MAX_VALUE);
-        this.getAciPreKeyStore().removeAllPreKeys();
-        this.getAciSignedPreKeyStore().removeAllSignedPreKeys();
-        this.getPniPreKeyStore().removeAllPreKeys();
-        this.getPniSignedPreKeyStore().removeAllSignedPreKeys();
-        save();
-    }
-
-    private static SignalAccount createLinkedAccount(
-            File dataPath,
-            String accountPath,
-            String number,
-            ServiceEnvironment serviceEnvironment,
-            ACI aci,
-            PNI pni,
-            String password,
-            String encryptedDeviceName,
-            int deviceId,
-            IdentityKeyPair aciIdentityKey,
-            IdentityKeyPair pniIdentityKey,
-            int registrationId,
-            ProfileKey profileKey,
-            final TrustNewIdentity trustNewIdentity
-    ) throws IOException {
-        var fileName = getFileName(dataPath, accountPath);
-        IOUtils.createPrivateFile(fileName);
-
-        final var pair = openFileChannel(fileName, true);
-        var signalAccount = new SignalAccount(pair.first(), pair.second());
-
-        signalAccount.setProvisioningData(number,
-                aci,
-                pni,
-                password,
-                encryptedDeviceName,
-                deviceId,
-                aciIdentityKey,
-                pniIdentityKey,
-                profileKey);
-
-        signalAccount.dataPath = dataPath;
-        signalAccount.accountPath = accountPath;
-        signalAccount.serviceEnvironment = serviceEnvironment;
-        signalAccount.localRegistrationId = registrationId;
-        signalAccount.trustNewIdentity = trustNewIdentity;
-        signalAccount.groupStore = new GroupStore(getGroupCachePath(dataPath, accountPath),
-                signalAccount.getRecipientResolver(),
-                signalAccount::saveGroupStore);
-        signalAccount.stickerStore = new StickerStore(signalAccount::saveStickerStore);
-        signalAccount.configurationStore = new ConfigurationStore(signalAccount::saveConfigurationStore);
-
-        signalAccount.getRecipientTrustedResolver()
-                .resolveSelfRecipientTrusted(signalAccount.getSelfRecipientAddress());
-        signalAccount.previousStorageVersion = CURRENT_STORAGE_VERSION;
-        signalAccount.migrateLegacyConfigs();
-        signalAccount.clearAllPreKeys();
-        signalAccount.save();
-
-        return signalAccount;
-    }
-
-    private void setProvisioningData(
-            final String number,
-            final ACI aci,
-            final PNI pni,
-            final String password,
-            final String encryptedDeviceName,
-            final int deviceId,
-            final IdentityKeyPair aciIdentity,
-            final IdentityKeyPair pniIdentity,
-            final ProfileKey profileKey
-    ) {
-        this.number = number;
-        this.aci = aci;
-        this.pni = pni;
-        this.password = password;
-        this.profileKey = profileKey;
-        this.encryptedDeviceName = encryptedDeviceName;
-        this.deviceId = deviceId;
-        this.aciIdentityKeyPair = aciIdentity;
-        this.pniIdentityKeyPair = pniIdentity;
-        this.registered = true;
-        this.isMultiDevice = true;
-        this.lastReceiveTimestamp = 0;
-        this.pinMasterKey = null;
-        this.storageManifestVersion = -1;
-        this.storageKey = null;
+    private void init() {
+        this.selfRecipientId = getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
     }
 
     private void migrateLegacyConfigs() {
-        if (getPassword() == null) {
-            setPassword(KeyUtils.createPassword());
-        }
-
-        if (getProfileKey() == null) {
-            // Old config file, creating new profile key
-            setProfileKey(KeyUtils.createProfileKey());
-        }
-        // Ensure our profile key is stored in profile store
-        getProfileStore().storeSelfProfileKey(getSelfRecipientId(), getProfileKey());
-        if (previousStorageVersion < 3) {
-            for (final var group : groupStore.getGroups()) {
-                if (group instanceof GroupInfoV2 && group.getDistributionId() == null) {
-                    ((GroupInfoV2) group).setDistributionId(DistributionId.create());
-                    groupStore.updateGroup(group);
-                }
-            }
-            save();
-        }
         if (isPrimaryDevice() && getPniIdentityKeyPair() == null) {
+            logger.trace("Migrating legacy parts of account file");
             setPniIdentityKeyPair(KeyUtils.generateIdentityKeyPair());
         }
     }
 
-    private void mergeRecipients(RecipientId recipientId, RecipientId toBeMergedRecipientId) {
-        getSessionStore().mergeRecipients(recipientId, toBeMergedRecipientId);
-        getIdentityKeyStore().mergeRecipients(recipientId, toBeMergedRecipientId);
+    private void mergeRecipients(
+            final Connection connection,
+            RecipientId recipientId,
+            RecipientId toBeMergedRecipientId
+    ) throws SQLException {
         getMessageCache().mergeRecipients(recipientId, toBeMergedRecipientId);
-        getGroupStore().mergeRecipients(recipientId, toBeMergedRecipientId);
-        getSenderKeyStore().mergeRecipients(recipientId, toBeMergedRecipientId);
+        getGroupStore().mergeRecipients(connection, recipientId, toBeMergedRecipientId);
     }
 
     public void removeRecipient(final RecipientId recipientId) {
-        getSessionStore().deleteAllSessions(recipientId);
-        getIdentityKeyStore().deleteIdentity(recipientId);
-        getMessageCache().deleteMessages(recipientId);
-        getSenderKeyStore().deleteAll(recipientId);
+        final var recipientAddress = getRecipientStore().resolveRecipientAddress(recipientId);
+        if (recipientAddress.matches(getSelfRecipientAddress())) {
+            throw new RuntimeException("Can't delete self recipient");
+        }
         getRecipientStore().deleteRecipientData(recipientId);
+        getMessageCache().deleteMessages(recipientId);
+        if (recipientAddress.aci().isPresent()) {
+            final var serviceId = recipientAddress.aci().get();
+            aciAccountData.getSessionStore().deleteAllSessions(serviceId);
+            pniAccountData.getSessionStore().deleteAllSessions(serviceId);
+            getIdentityKeyStore().deleteIdentity(serviceId);
+            getSenderKeyStore().deleteAll(serviceId);
+        }
+        if (recipientAddress.pni().isPresent()) {
+            final var serviceId = recipientAddress.pni().get();
+            aciAccountData.getSessionStore().deleteAllSessions(serviceId);
+            pniAccountData.getSessionStore().deleteAllSessions(serviceId);
+            getIdentityKeyStore().deleteIdentity(serviceId);
+            getSenderKeyStore().deleteAll(serviceId);
+        }
     }
 
     public static File getFileName(File dataPath, String account) {
@@ -431,46 +443,6 @@ public class SignalAccount implements Closeable {
         return new File(getUserPath(dataPath, account), "msg-cache");
     }
 
-    private static File getGroupCachePath(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "group-cache");
-    }
-
-    private static File getAciPreKeysPath(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "pre-keys");
-    }
-
-    private static File getAciSignedPreKeysPath(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "signed-pre-keys");
-    }
-
-    private static File getPniPreKeysPath(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "pre-keys-pni");
-    }
-
-    private static File getPniSignedPreKeysPath(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "signed-pre-keys-pni");
-    }
-
-    private static File getIdentitiesPath(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "identities");
-    }
-
-    private static File getSessionsPath(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "sessions");
-    }
-
-    private static File getSenderKeysPath(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "sender-keys");
-    }
-
-    private static File getSharedSenderKeysFile(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "shared-sender-keys-store");
-    }
-
-    private static File getRecipientsStoreFile(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "recipients-store");
-    }
-
     private static File getStorageManifestFile(File dataPath, String account) {
         return new File(getUserPath(dataPath, account), "storage-manifest");
     }
@@ -484,52 +456,158 @@ public class SignalAccount implements Closeable {
             return false;
         }
         var f = getFileName(dataPath, account);
-        return !(!f.exists() || f.isDirectory());
+        return f.exists() && !f.isDirectory() && f.length() > 0L;
     }
 
-    private void load(
-            File dataPath, String accountPath, final TrustNewIdentity trustNewIdentity
-    ) throws IOException {
+    private void load(File dataPath, String accountPath, final Settings settings) throws IOException {
+        logger.trace("Loading account file {}", accountPath);
         this.dataPath = dataPath;
         this.accountPath = accountPath;
+        this.settings = settings;
         final JsonNode rootNode;
         synchronized (fileChannel) {
             fileChannel.position(0);
             rootNode = jsonProcessor.readTree(Channels.newInputStream(fileChannel));
         }
 
+        var migratedLegacyConfig = false;
+
         if (rootNode.hasNonNull("version")) {
             var accountVersion = rootNode.get("version").asInt(1);
             if (accountVersion > CURRENT_STORAGE_VERSION) {
-                throw new IOException("Config file was created by a more recent version!");
+                throw new IOException("Config file was created by a more recent version: " + accountVersion);
             } else if (accountVersion < MINIMUM_STORAGE_VERSION) {
-                throw new IOException("Config file was created by a no longer supported older version!");
+                throw new IOException("Config file was created by a no longer supported older version: "
+                        + accountVersion);
             }
             previousStorageVersion = accountVersion;
+            if (accountVersion < CURRENT_STORAGE_VERSION) {
+                migratedLegacyConfig = true;
+            }
         }
 
+        if (previousStorageVersion < 8) {
+            final var userPath = getUserPath(dataPath, accountPath);
+            loadLegacyFile(userPath, rootNode);
+            migratedLegacyConfig = true;
+        } else {
+            final var storage = jsonProcessor.convertValue(rootNode, Storage.class);
+            serviceEnvironment = ServiceEnvironment.valueOf(storage.serviceEnvironment);
+            registered = storage.registered;
+            number = storage.number;
+            username = storage.username;
+            if ("".equals(username)) {
+                username = null;
+            }
+            encryptedDeviceName = storage.encryptedDeviceName;
+            deviceId = storage.deviceId;
+            isMultiDevice = storage.isMultiDevice;
+            password = storage.password;
+            setAccountData(aciAccountData, storage.aciAccountData, ACI::parseOrThrow);
+            setAccountData(pniAccountData, storage.pniAccountData, PNI::parseOrThrow);
+            registrationLockPin = storage.registrationLockPin;
+            final var base64 = Base64.getDecoder();
+            if (storage.pinMasterKey != null) {
+                pinMasterKey = new MasterKey(base64.decode(storage.pinMasterKey));
+            }
+            if (storage.storageKey != null) {
+                storageKey = new StorageKey(base64.decode(storage.storageKey));
+            }
+            if (storage.accountEntropyPool != null) {
+                accountEntropyPool = new AccountEntropyPool(storage.accountEntropyPool);
+            }
+            if (storage.mediaRootBackupKey != null) {
+                mediaRootBackupKey = new MediaRootBackupKey(base64.decode(storage.mediaRootBackupKey));
+            }
+            if (storage.profileKey != null) {
+                try {
+                    profileKey = new ProfileKey(base64.decode(storage.profileKey));
+                } catch (InvalidInputException e) {
+                    throw new IOException(
+                            "Config file contains an invalid profileKey, needs to be base64 encoded array of 32 bytes",
+                            e);
+                }
+            }
+            if (storage.usernameLinkEntropy != null && storage.usernameLinkServerId != null) {
+                usernameLink = new UsernameLinkComponents(base64.decode(storage.usernameLinkEntropy),
+                        UUID.fromString(storage.usernameLinkServerId));
+            }
+        }
+
+        if (migratedLegacyConfig) {
+            save();
+        }
+    }
+
+    private <SERVICE_ID extends ServiceId> void setAccountData(
+            AccountData<SERVICE_ID> accountData,
+            Storage.AccountData storage,
+            Function<String, SERVICE_ID> serviceIdParser
+    ) throws IOException {
+        if (storage.serviceId != null) {
+            try {
+                accountData.setServiceId(serviceIdParser.apply(storage.serviceId));
+            } catch (IllegalArgumentException e) {
+                throw new IOException("Config file contains an invalid serviceId, needs to be a valid UUID", e);
+            }
+        }
+        accountData.setLocalRegistrationId(storage.registrationId);
+        if (storage.identityPrivateKey != null && storage.identityPublicKey != null) {
+            final var base64 = Base64.getDecoder();
+            final var publicKeyBytes = base64.decode(storage.identityPublicKey);
+            final var privateKeyBytes = base64.decode(storage.identityPrivateKey);
+            final var keyPair = KeyUtils.getIdentityKeyPair(publicKeyBytes, privateKeyBytes);
+            accountData.setIdentityKeyPair(keyPair);
+        }
+        accountData.preKeyMetadata.nextPreKeyId = storage.nextPreKeyId;
+        accountData.preKeyMetadata.nextSignedPreKeyId = storage.nextSignedPreKeyId;
+        accountData.preKeyMetadata.activeSignedPreKeyId = storage.activeSignedPreKeyId;
+        accountData.preKeyMetadata.nextKyberPreKeyId = storage.nextKyberPreKeyId;
+        accountData.preKeyMetadata.activeLastResortKyberPreKeyId = storage.activeLastResortKyberPreKeyId;
+    }
+
+    private void loadLegacyFile(final File userPath, final JsonNode rootNode) throws IOException {
         number = Utils.getNotNullNode(rootNode, "username").asText();
         if (rootNode.hasNonNull("password")) {
             password = rootNode.get("password").asText();
         }
+        if (password == null) {
+            password = KeyUtils.createPassword();
+        }
+
         if (rootNode.hasNonNull("serviceEnvironment")) {
             serviceEnvironment = ServiceEnvironment.valueOf(rootNode.get("serviceEnvironment").asText());
         }
+        if (serviceEnvironment == null) {
+            serviceEnvironment = ServiceEnvironment.LIVE;
+        }
         registered = Utils.getNotNullNode(rootNode, "registered").asBoolean();
+        if (rootNode.hasNonNull("usernameIdentifier")) {
+            username = rootNode.get("usernameIdentifier").asText();
+            if ("".equals(username)) {
+                username = null;
+            }
+        }
         if (rootNode.hasNonNull("uuid")) {
             try {
-                aci = ACI.parseOrThrow(rootNode.get("uuid").asText());
+                aciAccountData.setServiceId(ACI.parseOrThrow(rootNode.get("uuid").asText()));
             } catch (IllegalArgumentException e) {
                 throw new IOException("Config file contains an invalid aci/uuid, needs to be a valid UUID", e);
             }
         }
         if (rootNode.hasNonNull("pni")) {
             try {
-                pni = PNI.parseOrThrow(rootNode.get("pni").asText());
+                pniAccountData.setServiceId(PNI.parseOrThrow(rootNode.get("pni").asText()));
             } catch (IllegalArgumentException e) {
                 throw new IOException("Config file contains an invalid pni, needs to be a valid UUID", e);
             }
         }
+        if (rootNode.hasNonNull("sessionId")) {
+            getKeyValueStore().storeEntry(verificationSessionId, rootNode.get("sessionId").asText());
+        }
+        if (rootNode.hasNonNull("sessionNumber")) {
+            getKeyValueStore().storeEntry(verificationSessionNumber, rootNode.get("sessionNumber").asText());
+        }
         if (rootNode.hasNonNull("deviceName")) {
             encryptedDeviceName = rootNode.get("deviceName").asText();
         }
@@ -540,12 +618,17 @@ public class SignalAccount implements Closeable {
             isMultiDevice = rootNode.get("isMultiDevice").asBoolean();
         }
         if (rootNode.hasNonNull("lastReceiveTimestamp")) {
-            lastReceiveTimestamp = rootNode.get("lastReceiveTimestamp").asLong();
+            setLastReceiveTimestamp(rootNode.get("lastReceiveTimestamp").asLong());
         }
         int registrationId = 0;
         if (rootNode.hasNonNull("registrationId")) {
             registrationId = rootNode.get("registrationId").asInt();
         }
+        if (rootNode.hasNonNull("pniRegistrationId")) {
+            pniAccountData.setLocalRegistrationId(rootNode.get("pniRegistrationId").asInt());
+        } else {
+            pniAccountData.setLocalRegistrationId(KeyHelper.generateRegistrationId(false));
+        }
         IdentityKeyPair aciIdentityKeyPair = null;
         if (rootNode.hasNonNull("identityPrivateKey") && rootNode.hasNonNull("identityKey")) {
             final var publicKeyBytes = Base64.getDecoder().decode(rootNode.get("identityKey").asText());
@@ -555,7 +638,7 @@ public class SignalAccount implements Closeable {
         if (rootNode.hasNonNull("pniIdentityPrivateKey") && rootNode.hasNonNull("pniIdentityKey")) {
             final var publicKeyBytes = Base64.getDecoder().decode(rootNode.get("pniIdentityKey").asText());
             final var privateKeyBytes = Base64.getDecoder().decode(rootNode.get("pniIdentityPrivateKey").asText());
-            pniIdentityKeyPair = KeyUtils.getIdentityKeyPair(publicKeyBytes, privateKeyBytes);
+            pniAccountData.setIdentityKeyPair(KeyUtils.getIdentityKeyPair(publicKeyBytes, privateKeyBytes));
         }
 
         if (rootNode.hasNonNull("registrationLockPin")) {
@@ -568,27 +651,59 @@ public class SignalAccount implements Closeable {
             storageKey = new StorageKey(Base64.getDecoder().decode(rootNode.get("storageKey").asText()));
         }
         if (rootNode.hasNonNull("storageManifestVersion")) {
-            storageManifestVersion = rootNode.get("storageManifestVersion").asLong();
+            getKeyValueStore().storeEntry(storageManifestVersion, rootNode.get("storageManifestVersion").asLong());
         }
         if (rootNode.hasNonNull("preKeyIdOffset")) {
-            aciPreKeyIdOffset = rootNode.get("preKeyIdOffset").asInt(1);
+            aciAccountData.preKeyMetadata.nextPreKeyId = rootNode.get("preKeyIdOffset").asInt(1);
         } else {
-            aciPreKeyIdOffset = 1;
+            aciAccountData.preKeyMetadata.nextPreKeyId = getRandomPreKeyIdOffset();
         }
         if (rootNode.hasNonNull("nextSignedPreKeyId")) {
-            aciNextSignedPreKeyId = rootNode.get("nextSignedPreKeyId").asInt(1);
+            aciAccountData.preKeyMetadata.nextSignedPreKeyId = rootNode.get("nextSignedPreKeyId").asInt(1);
         } else {
-            aciNextSignedPreKeyId = 1;
+            aciAccountData.preKeyMetadata.nextSignedPreKeyId = getRandomPreKeyIdOffset();
+        }
+        if (rootNode.hasNonNull("activeSignedPreKeyId")) {
+            aciAccountData.preKeyMetadata.activeSignedPreKeyId = rootNode.get("activeSignedPreKeyId").asInt(-1);
+        } else {
+            aciAccountData.preKeyMetadata.activeSignedPreKeyId = -1;
         }
         if (rootNode.hasNonNull("pniPreKeyIdOffset")) {
-            pniPreKeyIdOffset = rootNode.get("pniPreKeyIdOffset").asInt(1);
+            pniAccountData.preKeyMetadata.nextPreKeyId = rootNode.get("pniPreKeyIdOffset").asInt(1);
         } else {
-            pniPreKeyIdOffset = 1;
+            pniAccountData.preKeyMetadata.nextPreKeyId = getRandomPreKeyIdOffset();
         }
         if (rootNode.hasNonNull("pniNextSignedPreKeyId")) {
-            pniNextSignedPreKeyId = rootNode.get("pniNextSignedPreKeyId").asInt(1);
+            pniAccountData.preKeyMetadata.nextSignedPreKeyId = rootNode.get("pniNextSignedPreKeyId").asInt(1);
         } else {
-            pniNextSignedPreKeyId = 1;
+            pniAccountData.preKeyMetadata.nextSignedPreKeyId = getRandomPreKeyIdOffset();
+        }
+        if (rootNode.hasNonNull("pniActiveSignedPreKeyId")) {
+            pniAccountData.preKeyMetadata.activeSignedPreKeyId = rootNode.get("pniActiveSignedPreKeyId").asInt(-1);
+        } else {
+            pniAccountData.preKeyMetadata.activeSignedPreKeyId = -1;
+        }
+        if (rootNode.hasNonNull("kyberPreKeyIdOffset")) {
+            aciAccountData.preKeyMetadata.nextKyberPreKeyId = rootNode.get("kyberPreKeyIdOffset").asInt(1);
+        } else {
+            aciAccountData.preKeyMetadata.nextKyberPreKeyId = getRandomPreKeyIdOffset();
+        }
+        if (rootNode.hasNonNull("activeLastResortKyberPreKeyId")) {
+            aciAccountData.preKeyMetadata.activeLastResortKyberPreKeyId = rootNode.get("activeLastResortKyberPreKeyId")
+                    .asInt(-1);
+        } else {
+            aciAccountData.preKeyMetadata.activeLastResortKyberPreKeyId = -1;
+        }
+        if (rootNode.hasNonNull("pniKyberPreKeyIdOffset")) {
+            pniAccountData.preKeyMetadata.nextKyberPreKeyId = rootNode.get("pniKyberPreKeyIdOffset").asInt(1);
+        } else {
+            pniAccountData.preKeyMetadata.nextKyberPreKeyId = getRandomPreKeyIdOffset();
+        }
+        if (rootNode.hasNonNull("pniActiveLastResortKyberPreKeyId")) {
+            pniAccountData.preKeyMetadata.activeLastResortKyberPreKeyId = rootNode.get(
+                    "pniActiveLastResortKyberPreKeyId").asInt(-1);
+        } else {
+            pniAccountData.preKeyMetadata.activeLastResortKyberPreKeyId = -1;
         }
         if (rootNode.hasNonNull("profileKey")) {
             try {
@@ -599,8 +714,50 @@ public class SignalAccount implements Closeable {
                         e);
             }
         }
+        if (profileKey == null) {
+            // Old config file, creating new profile key
+            setProfileKey(KeyUtils.createProfileKey());
+        }
 
-        var migratedLegacyConfig = false;
+        if (previousStorageVersion < 5) {
+            final var legacyRecipientsStoreFile = new File(userPath, "recipients-store");
+            if (legacyRecipientsStoreFile.exists()) {
+                LegacyRecipientStore2.migrate(legacyRecipientsStoreFile, getRecipientStore());
+            }
+        }
+        if (previousStorageVersion < 6) {
+            getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
+        }
+        final var legacyAciPreKeysPath = new File(userPath, "pre-keys");
+        if (legacyAciPreKeysPath.exists()) {
+            LegacyPreKeyStore.migrate(legacyAciPreKeysPath, aciAccountData.getPreKeyStore());
+        }
+        final var legacyPniPreKeysPath = new File(userPath, "pre-keys-pni");
+        if (legacyPniPreKeysPath.exists()) {
+            LegacyPreKeyStore.migrate(legacyPniPreKeysPath, pniAccountData.getPreKeyStore());
+        }
+        final var legacyAciSignedPreKeysPath = new File(userPath, "signed-pre-keys");
+        if (legacyAciSignedPreKeysPath.exists()) {
+            LegacySignedPreKeyStore.migrate(legacyAciSignedPreKeysPath, aciAccountData.getSignedPreKeyStore());
+        }
+        final var legacyPniSignedPreKeysPath = new File(userPath, "signed-pre-keys-pni");
+        if (legacyPniSignedPreKeysPath.exists()) {
+            LegacySignedPreKeyStore.migrate(legacyPniSignedPreKeysPath, pniAccountData.getSignedPreKeyStore());
+        }
+        final var legacySessionsPath = new File(userPath, "sessions");
+        if (legacySessionsPath.exists()) {
+            LegacySessionStore.migrate(legacySessionsPath,
+                    getRecipientResolver(),
+                    getRecipientAddressResolver(),
+                    aciAccountData.getSessionStore());
+        }
+        final var legacyIdentitiesPath = new File(userPath, "identities");
+        if (legacyIdentitiesPath.exists()) {
+            LegacyIdentityKeyStore.migrate(legacyIdentitiesPath,
+                    getRecipientResolver(),
+                    getRecipientAddressResolver(),
+                    getIdentityKeyStore());
+        }
         final var legacySignalProtocolStore = rootNode.hasNonNull("axolotlStore")
                 ? jsonProcessor.convertValue(Utils.getNotNullNode(rootNode, "axolotlStore"),
                 LegacyJsonSignalProtocolStore.class)
@@ -608,113 +765,116 @@ public class SignalAccount implements Closeable {
         if (legacySignalProtocolStore != null && legacySignalProtocolStore.getLegacyIdentityKeyStore() != null) {
             aciIdentityKeyPair = legacySignalProtocolStore.getLegacyIdentityKeyStore().getIdentityKeyPair();
             registrationId = legacySignalProtocolStore.getLegacyIdentityKeyStore().getLocalRegistrationId();
-            migratedLegacyConfig = true;
         }
 
-        this.aciIdentityKeyPair = aciIdentityKeyPair;
-        this.localRegistrationId = registrationId;
-        this.trustNewIdentity = trustNewIdentity;
+        this.aciAccountData.setIdentityKeyPair(aciIdentityKeyPair);
+        this.aciAccountData.setLocalRegistrationId(registrationId);
 
-        migratedLegacyConfig = loadLegacyStores(rootNode, legacySignalProtocolStore) || migratedLegacyConfig;
+        loadLegacyStores(rootNode, legacySignalProtocolStore);
 
+        final var legacySenderKeysPath = new File(userPath, "sender-keys");
+        if (legacySenderKeysPath.exists()) {
+            LegacySenderKeyRecordStore.migrate(legacySenderKeysPath,
+                    getRecipientResolver(),
+                    getRecipientAddressResolver(),
+                    getSenderKeyStore());
+        }
+        final var legacySenderKeysSharedPath = new File(userPath, "shared-sender-keys-store");
+        if (legacySenderKeysSharedPath.exists()) {
+            LegacySenderKeySharedStore.migrate(legacySenderKeysSharedPath,
+                    getRecipientResolver(),
+                    getRecipientAddressResolver(),
+                    getSenderKeyStore());
+        }
         if (rootNode.hasNonNull("groupStore")) {
-            groupStoreStorage = jsonProcessor.convertValue(rootNode.get("groupStore"), GroupStore.Storage.class);
-            groupStore = GroupStore.fromStorage(groupStoreStorage,
-                    getGroupCachePath(dataPath, accountPath),
+            final var groupStoreStorage = jsonProcessor.convertValue(rootNode.get("groupStore"),
+                    LegacyGroupStore.Storage.class);
+            LegacyGroupStore.migrate(groupStoreStorage,
+                    new File(userPath, "group-cache"),
                     getRecipientResolver(),
-                    this::saveGroupStore);
-        } else {
-            groupStore = new GroupStore(getGroupCachePath(dataPath, accountPath),
-                    getRecipientResolver(),
-                    this::saveGroupStore);
+                    getGroupStore());
         }
 
         if (rootNode.hasNonNull("stickerStore")) {
-            stickerStoreStorage = jsonProcessor.convertValue(rootNode.get("stickerStore"), StickerStore.Storage.class);
-            stickerStore = StickerStore.fromStorage(stickerStoreStorage, this::saveStickerStore);
-        } else {
-            stickerStore = new StickerStore(this::saveStickerStore);
+            final var storage = jsonProcessor.convertValue(rootNode.get("stickerStore"),
+                    LegacyStickerStore.Storage.class);
+            LegacyStickerStore.migrate(storage, getStickerStore());
         }
 
         if (rootNode.hasNonNull("configurationStore")) {
-            configurationStoreStorage = jsonProcessor.convertValue(rootNode.get("configurationStore"),
-                    ConfigurationStore.Storage.class);
-            configurationStore = ConfigurationStore.fromStorage(configurationStoreStorage,
-                    this::saveConfigurationStore);
-        } else {
-            configurationStore = new ConfigurationStore(this::saveConfigurationStore);
+            final var configurationStoreStorage = jsonProcessor.convertValue(rootNode.get("configurationStore"),
+                    LegacyConfigurationStore.Storage.class);
+            LegacyConfigurationStore.migrate(configurationStoreStorage, getConfigurationStore());
         }
 
-        migratedLegacyConfig = loadLegacyThreadStore(rootNode) || migratedLegacyConfig;
-
-        if (migratedLegacyConfig) {
-            save();
-        }
+        loadLegacyThreadStore(rootNode);
     }
 
-    private boolean loadLegacyStores(
-            final JsonNode rootNode, final LegacyJsonSignalProtocolStore legacySignalProtocolStore
+    private void loadLegacyStores(
+            final JsonNode rootNode,
+            final LegacyJsonSignalProtocolStore legacySignalProtocolStore
     ) {
-        var migrated = false;
         var legacyRecipientStoreNode = rootNode.get("recipientStore");
         if (legacyRecipientStoreNode != null) {
             logger.debug("Migrating legacy recipient store.");
             var legacyRecipientStore = jsonProcessor.convertValue(legacyRecipientStoreNode, LegacyRecipientStore.class);
             if (legacyRecipientStore != null) {
-                getRecipientStore().resolveRecipientsTrusted(legacyRecipientStore.getAddresses());
+                legacyRecipientStore.getAddresses()
+                        .forEach(recipient -> getRecipientStore().resolveRecipientTrusted(recipient));
             }
             getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
-            migrated = true;
         }
 
         if (legacySignalProtocolStore != null && legacySignalProtocolStore.getLegacyPreKeyStore() != null) {
             logger.debug("Migrating legacy pre key store.");
+            aciAccountData.getPreKeyStore().removeAllPreKeys();
             for (var entry : legacySignalProtocolStore.getLegacyPreKeyStore().getPreKeys().entrySet()) {
                 try {
-                    getAciPreKeyStore().storePreKey(entry.getKey(), new PreKeyRecord(entry.getValue()));
+                    aciAccountData.getPreKeyStore().storePreKey(entry.getKey(), new PreKeyRecord(entry.getValue()));
                 } catch (InvalidMessageException e) {
                     logger.warn("Failed to migrate pre key, ignoring", e);
                 }
             }
-            migrated = true;
         }
 
         if (legacySignalProtocolStore != null && legacySignalProtocolStore.getLegacySignedPreKeyStore() != null) {
             logger.debug("Migrating legacy signed pre key store.");
+            aciAccountData.getSignedPreKeyStore().removeAllSignedPreKeys();
             for (var entry : legacySignalProtocolStore.getLegacySignedPreKeyStore().getSignedPreKeys().entrySet()) {
                 try {
-                    getAciSignedPreKeyStore().storeSignedPreKey(entry.getKey(),
-                            new SignedPreKeyRecord(entry.getValue()));
+                    aciAccountData.getSignedPreKeyStore()
+                            .storeSignedPreKey(entry.getKey(), new SignedPreKeyRecord(entry.getValue()));
                 } catch (InvalidMessageException e) {
                     logger.warn("Failed to migrate signed pre key, ignoring", e);
                 }
             }
-            migrated = true;
         }
 
         if (legacySignalProtocolStore != null && legacySignalProtocolStore.getLegacySessionStore() != null) {
             logger.debug("Migrating legacy session store.");
             for (var session : legacySignalProtocolStore.getLegacySessionStore().getSessions()) {
                 try {
-                    getSessionStore().storeSession(new SignalProtocolAddress(session.address.getIdentifier(),
-                            session.deviceId), new SessionRecord(session.sessionRecord));
+                    aciAccountData.getSessionStore()
+                            .storeSession(new SignalProtocolAddress(session.address.getIdentifier(), session.deviceId),
+                                    new SessionRecord(session.sessionRecord));
                 } catch (Exception e) {
                     logger.warn("Failed to migrate session, ignoring", e);
                 }
             }
-            migrated = true;
         }
 
         if (legacySignalProtocolStore != null && legacySignalProtocolStore.getLegacyIdentityKeyStore() != null) {
             logger.debug("Migrating legacy identity session store.");
             for (var identity : legacySignalProtocolStore.getLegacyIdentityKeyStore().getIdentities()) {
-                RecipientId recipientId = getRecipientStore().resolveRecipientTrusted(identity.getAddress());
-                getIdentityKeyStore().saveIdentity(recipientId, identity.getIdentityKey(), identity.getDateAdded());
-                getIdentityKeyStore().setIdentityTrustLevel(recipientId,
+                if (identity.getAddress().serviceId().isEmpty()) {
+                    continue;
+                }
+                final var serviceId = identity.getAddress().serviceId().get();
+                getIdentityKeyStore().saveIdentity(serviceId, identity.getIdentityKey());
+                getIdentityKeyStore().setIdentityTrustLevel(serviceId,
                         identity.getIdentityKey(),
                         identity.getTrustLevel());
             }
-            migrated = true;
         }
 
         if (rootNode.hasNonNull("contactStore")) {
@@ -725,12 +885,21 @@ public class SignalAccount implements Closeable {
                 final var recipientId = getRecipientStore().resolveRecipientTrusted(contact.getAddress());
                 getContactStore().storeContact(recipientId,
                         new Contact(contact.name,
+                                null,
+                                null,
+                                null,
+                                null,
                                 null,
                                 contact.color,
                                 contact.messageExpirationTime,
+                                1,
+                                0,
+                                false,
                                 contact.blocked,
                                 contact.archived,
-                                false));
+                                false,
+                                false,
+                                null));
 
                 // Store profile keys only in profile store
                 var profileKeyString = contact.profileKey;
@@ -744,7 +913,6 @@ public class SignalAccount implements Closeable {
                     }
                 }
             }
-            migrated = true;
         }
 
         if (rootNode.hasNonNull("profileStore")) {
@@ -752,21 +920,18 @@ public class SignalAccount implements Closeable {
             var profileStoreNode = rootNode.get("profileStore");
             final var legacyProfileStore = jsonProcessor.convertValue(profileStoreNode, LegacyProfileStore.class);
             for (var profileEntry : legacyProfileStore.getProfileEntries()) {
-                var recipientId = getRecipientResolver().resolveRecipient(profileEntry.getAddress());
-                getProfileStore().storeProfileKeyCredential(recipientId, profileEntry.getProfileKeyCredential());
-                getProfileStore().storeProfileKey(recipientId, profileEntry.getProfileKey());
-                final var profile = profileEntry.getProfile();
+                var recipientId = getRecipientResolver().resolveRecipient(profileEntry.address());
+                // Not migrating profile key credential here, it was changed to expiring profile key credentials
+                getProfileStore().storeProfileKey(recipientId, profileEntry.profileKey());
+                final var profile = profileEntry.profile();
                 if (profile != null) {
                     final var capabilities = new HashSet<Profile.Capability>();
                     if (profile.getCapabilities() != null) {
-                        if (profile.getCapabilities().gv1Migration) {
-                            capabilities.add(Profile.Capability.gv1Migration);
-                        }
                         if (profile.getCapabilities().storage) {
                             capabilities.add(Profile.Capability.storage);
                         }
                     }
-                    final var newProfile = new Profile(profileEntry.getLastUpdateTimestamp(),
+                    final var newProfile = new Profile(profileEntry.lastUpdateTimestamp(),
                             profile.getGivenName(),
                             profile.getFamilyName(),
                             profile.getAbout(),
@@ -778,16 +943,15 @@ public class SignalAccount implements Closeable {
                                     : profile.getUnidentifiedAccess() != null
                                             ? Profile.UnidentifiedAccessMode.ENABLED
                                             : Profile.UnidentifiedAccessMode.DISABLED,
-                            capabilities);
+                            capabilities,
+                            null);
                     getProfileStore().storeProfile(recipientId, newProfile);
                 }
             }
         }
-
-        return migrated;
     }
 
-    private boolean loadLegacyThreadStore(final JsonNode rootNode) {
+    private void loadLegacyThreadStore(final JsonNode rootNode) {
         var threadStoreNode = rootNode.get("threadStore");
         if (threadStoreNode != null && !threadStoreNode.isNull()) {
             var threadStore = jsonProcessor.convertValue(threadStoreNode, LegacyJsonThreadStore.class);
@@ -804,87 +968,50 @@ public class SignalAccount implements Closeable {
                             getContactStore().storeContact(recipientId,
                                     Contact.newBuilder(contact)
                                             .withMessageExpirationTime(thread.messageExpirationTime)
+                                            .withMessageExpirationTimeVersion(1)
                                             .build());
                         }
                     } else {
-                        var groupInfo = groupStore.getGroup(GroupId.fromBase64(thread.id));
+                        var groupInfo = getGroupStore().getGroup(GroupId.fromBase64(thread.id));
                         if (groupInfo instanceof GroupInfoV1) {
                             ((GroupInfoV1) groupInfo).messageExpirationTime = thread.messageExpirationTime;
-                            groupStore.updateGroup(groupInfo);
+                            getGroupStore().updateGroup(groupInfo);
                         }
                     }
                 } catch (Exception e) {
                     logger.warn("Failed to read legacy thread info: {}", e.getMessage());
                 }
             }
-            return true;
         }
-
-        return false;
-    }
-
-    private void saveStickerStore(StickerStore.Storage storage) {
-        this.stickerStoreStorage = storage;
-        save();
-    }
-
-    private void saveGroupStore(GroupStore.Storage storage) {
-        this.groupStoreStorage = storage;
-        save();
-    }
-
-    private void saveConfigurationStore(ConfigurationStore.Storage storage) {
-        this.configurationStoreStorage = storage;
-        save();
     }
 
     private void save() {
         synchronized (fileChannel) {
-            var rootNode = jsonProcessor.createObjectNode();
-            rootNode.put("version", CURRENT_STORAGE_VERSION)
-                    .put("username", number)
-                    .put("serviceEnvironment", serviceEnvironment == null ? null : serviceEnvironment.name())
-                    .put("uuid", aci == null ? null : aci.toString())
-                    .put("pni", pni == null ? null : pni.toString())
-                    .put("deviceName", encryptedDeviceName)
-                    .put("deviceId", deviceId)
-                    .put("isMultiDevice", isMultiDevice)
-                    .put("lastReceiveTimestamp", lastReceiveTimestamp)
-                    .put("password", password)
-                    .put("registrationId", localRegistrationId)
-                    .put("identityPrivateKey",
-                            Base64.getEncoder().encodeToString(aciIdentityKeyPair.getPrivateKey().serialize()))
-                    .put("identityKey",
-                            Base64.getEncoder().encodeToString(aciIdentityKeyPair.getPublicKey().serialize()))
-                    .put("pniIdentityPrivateKey",
-                            pniIdentityKeyPair == null
-                                    ? null
-                                    : Base64.getEncoder()
-                                            .encodeToString(pniIdentityKeyPair.getPrivateKey().serialize()))
-                    .put("pniIdentityKey",
-                            pniIdentityKeyPair == null
-                                    ? null
-                                    : Base64.getEncoder().encodeToString(pniIdentityKeyPair.getPublicKey().serialize()))
-                    .put("registrationLockPin", registrationLockPin)
-                    .put("pinMasterKey",
-                            pinMasterKey == null ? null : Base64.getEncoder().encodeToString(pinMasterKey.serialize()))
-                    .put("storageKey",
-                            storageKey == null ? null : Base64.getEncoder().encodeToString(storageKey.serialize()))
-                    .put("storageManifestVersion", storageManifestVersion == -1 ? null : storageManifestVersion)
-                    .put("preKeyIdOffset", aciPreKeyIdOffset)
-                    .put("nextSignedPreKeyId", aciNextSignedPreKeyId)
-                    .put("pniPreKeyIdOffset", pniPreKeyIdOffset)
-                    .put("pniNextSignedPreKeyId", pniNextSignedPreKeyId)
-                    .put("profileKey",
-                            profileKey == null ? null : Base64.getEncoder().encodeToString(profileKey.serialize()))
-                    .put("registered", registered)
-                    .putPOJO("groupStore", groupStoreStorage)
-                    .putPOJO("stickerStore", stickerStoreStorage)
-                    .putPOJO("configurationStore", configurationStoreStorage);
+            final var base64 = Base64.getEncoder();
+            final var storage = new Storage(CURRENT_STORAGE_VERSION,
+                    System.currentTimeMillis(),
+                    serviceEnvironment.name(),
+                    registered,
+                    number,
+                    username,
+                    encryptedDeviceName,
+                    deviceId,
+                    isMultiDevice,
+                    password,
+                    Storage.AccountData.from(aciAccountData),
+                    Storage.AccountData.from(pniAccountData),
+                    registrationLockPin,
+                    pinMasterKey == null ? null : base64.encodeToString(pinMasterKey.serialize()),
+                    storageKey == null ? null : base64.encodeToString(storageKey.serialize()),
+                    accountEntropyPool == null ? null : accountEntropyPool.getValue(),
+                    mediaRootBackupKey == null ? null : base64.encodeToString(mediaRootBackupKey.getValue()),
+                    profileKey == null ? null : base64.encodeToString(profileKey.serialize()),
+                    usernameLink == null ? null : base64.encodeToString(usernameLink.getEntropy()),
+                    usernameLink == null ? null : usernameLink.getServerId().toString());
             try {
                 try (var output = new ByteArrayOutputStream()) {
                     // Write to memory first to prevent corrupting the file in case of serialization errors
-                    jsonProcessor.writeValue(output, rootNode);
+                    jsonProcessor.writeValue(output, storage);
                     var input = new ByteArrayInputStream(output.toByteArray());
                     fileChannel.position(0);
                     input.transferTo(Channels.newOutputStream(fileChannel));
@@ -920,87 +1047,175 @@ public class SignalAccount implements Closeable {
         }
     }
 
-    public void addPreKeys(ServiceIdType serviceIdType, List<PreKeyRecord> records) {
-        if (serviceIdType.equals(ServiceIdType.ACI)) {
-            addAciPreKeys(records);
-        } else {
-            addPniPreKeys(records);
-        }
+    private void clearAllPreKeys() {
+        clearAllPreKeys(ServiceIdType.ACI);
+        clearAllPreKeys(ServiceIdType.PNI);
     }
 
-    public void addAciPreKeys(List<PreKeyRecord> records) {
-        for (var record : records) {
-            if (aciPreKeyIdOffset != record.getId()) {
-                logger.error("Invalid pre key id {}, expected {}", record.getId(), aciPreKeyIdOffset);
-                throw new AssertionError("Invalid pre key id");
-            }
-            getAciPreKeyStore().storePreKey(record.getId(), record);
-            aciPreKeyIdOffset = (aciPreKeyIdOffset + 1) % Medium.MAX_VALUE;
-        }
+    private void initAllPreKeyIds() {
+        resetPreKeyOffsets(ServiceIdType.ACI);
+        resetPreKeyOffsets(ServiceIdType.PNI);
+        resetKyberPreKeyOffsets(ServiceIdType.ACI);
+        resetKyberPreKeyOffsets(ServiceIdType.PNI);
+    }
+
+    private void clearAllPreKeys(ServiceIdType serviceIdType) {
+        final var accountData = getAccountData(serviceIdType);
+        resetPreKeyOffsets(serviceIdType);
+        resetKyberPreKeyOffsets(serviceIdType);
+        accountData.getPreKeyStore().removeAllPreKeys();
+        accountData.getSignedPreKeyStore().removeAllSignedPreKeys();
+        accountData.getKyberPreKeyStore().removeAllKyberPreKeys();
         save();
     }
 
-    public void addPniPreKeys(List<PreKeyRecord> records) {
+    private void setPreKeys(ServiceIdType serviceIdType, PreKeyCollection preKeyCollection) {
+        final var accountData = getAccountData(serviceIdType);
+        final var preKeyMetadata = accountData.getPreKeyMetadata();
+        preKeyMetadata.nextSignedPreKeyId = preKeyCollection.getSignedPreKey().getId();
+        preKeyMetadata.nextKyberPreKeyId = preKeyCollection.getLastResortKyberPreKey().getId();
+
+        accountData.getPreKeyStore().removeAllPreKeys();
+        accountData.getSignedPreKeyStore().removeAllSignedPreKeys();
+        accountData.getKyberPreKeyStore().removeAllKyberPreKeys();
+
+        addSignedPreKey(serviceIdType, preKeyCollection.getSignedPreKey());
+        addLastResortKyberPreKey(serviceIdType, preKeyCollection.getLastResortKyberPreKey());
+
+        save();
+    }
+
+    public void resetPreKeyOffsets(final ServiceIdType serviceIdType) {
+        final var preKeyMetadata = getAccountData(serviceIdType).getPreKeyMetadata();
+        preKeyMetadata.nextPreKeyId = getRandomPreKeyIdOffset();
+        preKeyMetadata.nextSignedPreKeyId = getRandomPreKeyIdOffset();
+        preKeyMetadata.activeSignedPreKeyId = -1;
+        save();
+    }
+
+    private static int getRandomPreKeyIdOffset() {
+        return KeyUtils.getRandomInt(PREKEY_MAXIMUM_ID);
+    }
+
+    public void addPreKeys(ServiceIdType serviceIdType, List<PreKeyRecord> records) {
+        final var accountData = getAccountData(serviceIdType);
+        final var preKeyMetadata = accountData.getPreKeyMetadata();
+        logger.debug("Adding {} {} pre keys with offset {}",
+                records.size(),
+                serviceIdType,
+                preKeyMetadata.nextPreKeyId);
+        accountData.getSignalServiceAccountDataStore()
+                .markAllOneTimeEcPreKeysStaleIfNecessary(System.currentTimeMillis());
         for (var record : records) {
-            if (pniPreKeyIdOffset != record.getId()) {
-                logger.error("Invalid pre key id {}, expected {}", record.getId(), pniPreKeyIdOffset);
+            if (preKeyMetadata.nextPreKeyId != record.getId()) {
+                logger.error("Invalid pre key id {}, expected {}", record.getId(), preKeyMetadata.nextPreKeyId);
                 throw new AssertionError("Invalid pre key id");
             }
-            getPniPreKeyStore().storePreKey(record.getId(), record);
-            pniPreKeyIdOffset = (pniPreKeyIdOffset + 1) % Medium.MAX_VALUE;
+            accountData.getPreKeyStore().storePreKey(record.getId(), record);
+            preKeyMetadata.nextPreKeyId = (preKeyMetadata.nextPreKeyId + 1) % PREKEY_MAXIMUM_ID;
         }
         save();
     }
 
     public void addSignedPreKey(ServiceIdType serviceIdType, SignedPreKeyRecord record) {
-        if (serviceIdType.equals(ServiceIdType.ACI)) {
-            addAciSignedPreKey(record);
+        final var accountData = getAccountData(serviceIdType);
+        final var preKeyMetadata = accountData.getPreKeyMetadata();
+        logger.debug("Adding {} signed pre key with offset {}", serviceIdType, preKeyMetadata.nextSignedPreKeyId);
+        if (preKeyMetadata.nextSignedPreKeyId != record.getId()) {
+            logger.error("Invalid signed pre key id {}, expected {}",
+                    record.getId(),
+                    preKeyMetadata.nextSignedPreKeyId);
+            throw new AssertionError("Invalid signed pre key id");
+        }
+        accountData.getSignedPreKeyStore().storeSignedPreKey(record.getId(), record);
+        preKeyMetadata.nextSignedPreKeyId = (preKeyMetadata.nextSignedPreKeyId + 1) % PREKEY_MAXIMUM_ID;
+        preKeyMetadata.activeSignedPreKeyId = record.getId();
+        save();
+    }
+
+    public void resetKyberPreKeyOffsets(final ServiceIdType serviceIdType) {
+        final var preKeyMetadata = getAccountData(serviceIdType).getPreKeyMetadata();
+        preKeyMetadata.nextKyberPreKeyId = getRandomPreKeyIdOffset();
+        preKeyMetadata.activeLastResortKyberPreKeyId = -1;
+        save();
+    }
+
+    public void addKyberPreKeys(ServiceIdType serviceIdType, List<KyberPreKeyRecord> records) {
+        final var accountData = getAccountData(serviceIdType);
+        final var preKeyMetadata = accountData.getPreKeyMetadata();
+        logger.debug("Adding {} {} kyber pre keys with offset {}",
+                records.size(),
+                serviceIdType,
+                preKeyMetadata.nextKyberPreKeyId);
+        accountData.getSignalServiceAccountDataStore()
+                .markAllOneTimeKyberPreKeysStaleIfNecessary(System.currentTimeMillis());
+        for (var record : records) {
+            if (preKeyMetadata.nextKyberPreKeyId != record.getId()) {
+                logger.error("Invalid kyber pre key id {}, expected {}",
+                        record.getId(),
+                        preKeyMetadata.nextKyberPreKeyId);
+                throw new AssertionError("Invalid kyber pre key id");
+            }
+            accountData.getKyberPreKeyStore().storeKyberPreKey(record.getId(), record);
+            preKeyMetadata.nextKyberPreKeyId = (preKeyMetadata.nextKyberPreKeyId + 1) % PREKEY_MAXIMUM_ID;
+        }
+        save();
+    }
+
+    public void addLastResortKyberPreKey(ServiceIdType serviceIdType, KyberPreKeyRecord record) {
+        final var accountData = getAccountData(serviceIdType);
+        final var preKeyMetadata = accountData.getPreKeyMetadata();
+        logger.debug("Adding {} last resort kyber pre key with offset {}",
+                serviceIdType,
+                preKeyMetadata.nextKyberPreKeyId);
+        if (preKeyMetadata.nextKyberPreKeyId != record.getId()) {
+            logger.error("Invalid last resort kyber pre key id {}, expected {}",
+                    record.getId(),
+                    preKeyMetadata.nextKyberPreKeyId);
+            throw new AssertionError("Invalid last resort kyber pre key id");
+        }
+        accountData.getKyberPreKeyStore().storeLastResortKyberPreKey(record.getId(), record);
+        preKeyMetadata.activeLastResortKyberPreKeyId = record.getId();
+        preKeyMetadata.nextKyberPreKeyId = (preKeyMetadata.nextKyberPreKeyId + 1) % PREKEY_MAXIMUM_ID;
+        save();
+    }
+
+    public int getPreviousStorageVersion() {
+        return previousStorageVersion;
+    }
+
+    public AccountData<? extends ServiceId> getAccountData(ServiceIdType serviceIdType) {
+        return switch (serviceIdType) {
+            case ACI -> aciAccountData;
+            case PNI -> pniAccountData;
+        };
+    }
+
+    public AccountData<? extends ServiceId> getAccountData(ServiceId accountIdentifier) {
+        if (accountIdentifier.equals(aciAccountData.getServiceId())) {
+            return aciAccountData;
+        } else if (accountIdentifier.equals(pniAccountData.getServiceId())) {
+            return pniAccountData;
         } else {
-            addPniSignedPreKey(record);
+            throw new IllegalArgumentException("No matching account data found for " + accountIdentifier);
         }
     }
 
-    public void addAciSignedPreKey(SignedPreKeyRecord record) {
-        if (aciNextSignedPreKeyId != record.getId()) {
-            logger.error("Invalid signed pre key id {}, expected {}", record.getId(), aciNextSignedPreKeyId);
-            throw new AssertionError("Invalid signed pre key id");
-        }
-        getAciSignedPreKeyStore().storeSignedPreKey(record.getId(), record);
-        aciNextSignedPreKeyId = (aciNextSignedPreKeyId + 1) % Medium.MAX_VALUE;
-        save();
-    }
-
-    public void addPniSignedPreKey(SignedPreKeyRecord record) {
-        if (pniNextSignedPreKeyId != record.getId()) {
-            logger.error("Invalid signed pre key id {}, expected {}", record.getId(), pniNextSignedPreKeyId);
-            throw new AssertionError("Invalid signed pre key id");
-        }
-        getPniSignedPreKeyStore().storeSignedPreKey(record.getId(), record);
-        pniNextSignedPreKeyId = (pniNextSignedPreKeyId + 1) % Medium.MAX_VALUE;
-        save();
-    }
-
     public SignalServiceDataStore getSignalServiceDataStore() {
         return new SignalServiceDataStore() {
             @Override
             public SignalServiceAccountDataStore get(final ServiceId accountIdentifier) {
-                if (accountIdentifier.equals(aci)) {
-                    return getSignalServiceAccountDataStore();
-                } else if (accountIdentifier.equals(pni)) {
-                    throw new AssertionError("PNI not to be used yet!");
-                } else {
-                    throw new IllegalArgumentException("No matching store found for " + accountIdentifier);
-                }
+                return getAccountData(accountIdentifier).getSignalServiceAccountDataStore();
             }
 
             @Override
             public SignalServiceAccountDataStore aci() {
-                return getSignalServiceAccountDataStore();
+                return aciAccountData.getSignalServiceAccountDataStore();
             }
 
             @Override
             public SignalServiceAccountDataStore pni() {
-                throw new AssertionError("PNI not to be used yet!");
+                return pniAccountData.getSignalServiceAccountDataStore();
             }
 
             @Override
@@ -1010,75 +1225,50 @@ public class SignalAccount implements Closeable {
         };
     }
 
-    public SignalServiceAccountDataStore getSignalServiceAccountDataStore() {
-        return getOrCreate(() -> signalProtocolStore,
-                () -> signalProtocolStore = new SignalProtocolStore(getAciPreKeyStore(),
-                        getAciSignedPreKeyStore(),
-                        getSessionStore(),
-                        getIdentityKeyStore(),
-                        getSenderKeyStore(),
-                        this::isMultiDevice));
-    }
-
-    private PreKeyStore getAciPreKeyStore() {
-        return getOrCreate(() -> aciPreKeyStore,
-                () -> aciPreKeyStore = new PreKeyStore(getAciPreKeysPath(dataPath, accountPath)));
-    }
-
-    private SignedPreKeyStore getAciSignedPreKeyStore() {
-        return getOrCreate(() -> aciSignedPreKeyStore,
-                () -> aciSignedPreKeyStore = new SignedPreKeyStore(getAciSignedPreKeysPath(dataPath, accountPath)));
-    }
-
-    private PreKeyStore getPniPreKeyStore() {
-        return getOrCreate(() -> pniPreKeyStore,
-                () -> pniPreKeyStore = new PreKeyStore(getPniPreKeysPath(dataPath, accountPath)));
-    }
-
-    private SignedPreKeyStore getPniSignedPreKeyStore() {
-        return getOrCreate(() -> pniSignedPreKeyStore,
-                () -> pniSignedPreKeyStore = new SignedPreKeyStore(getPniSignedPreKeysPath(dataPath, accountPath)));
-    }
-
-    public SessionStore getSessionStore() {
-        return getOrCreate(() -> sessionStore,
-                () -> sessionStore = new SessionStore(getSessionsPath(dataPath, accountPath), getRecipientResolver()));
-    }
-
     public IdentityKeyStore getIdentityKeyStore() {
         return getOrCreate(() -> identityKeyStore,
-                () -> identityKeyStore = new IdentityKeyStore(getIdentitiesPath(dataPath, accountPath),
-                        getRecipientResolver(),
-                        aciIdentityKeyPair,
-                        localRegistrationId,
-                        trustNewIdentity));
+                () -> identityKeyStore = new IdentityKeyStore(getAccountDatabase(),
+                        settings.trustNewIdentity(),
+                        getRecipientStore()));
     }
 
     public GroupStore getGroupStore() {
-        return groupStore;
+        return getOrCreate(() -> groupStore,
+                () -> groupStore = new GroupStore(getAccountDatabase(),
+                        getRecipientResolver(),
+                        getRecipientIdCreator()));
     }
 
     public ContactsStore getContactStore() {
         return getRecipientStore();
     }
 
+    public CdsiStore getCdsiStore() {
+        return getOrCreate(() -> cdsiStore, () -> cdsiStore = new CdsiStore(getAccountDatabase()));
+    }
+
+    private RecipientIdCreator getRecipientIdCreator() {
+        return recipientId -> getRecipientStore().create(recipientId);
+    }
+
     public RecipientResolver getRecipientResolver() {
-        return getRecipientStore();
+        return new RecipientResolver.RecipientResolverWrapper(this::getRecipientStore);
     }
 
     public RecipientTrustedResolver getRecipientTrustedResolver() {
-        return getRecipientStore();
+        return new RecipientTrustedResolver.RecipientTrustedResolverWrapper(this::getRecipientStore);
     }
 
     public RecipientAddressResolver getRecipientAddressResolver() {
-        return getRecipientStore()::resolveRecipientAddress;
+        return recipientId -> getRecipientStore().resolveRecipientAddress(recipientId);
     }
 
     public RecipientStore getRecipientStore() {
         return getOrCreate(() -> recipientStore,
-                () -> recipientStore = RecipientStore.load(getRecipientsStoreFile(dataPath, accountPath),
-                        this::mergeRecipients,
-                        this::getSelfRecipientAddress));
+                () -> recipientStore = new RecipientStore(this::mergeRecipients,
+                        this::getSelfRecipientAddress,
+                        this::getProfileKey,
+                        getAccountDatabase()));
     }
 
     public ProfileStore getProfileStore() {
@@ -1086,19 +1276,24 @@ public class SignalAccount implements Closeable {
     }
 
     public StickerStore getStickerStore() {
-        return stickerStore;
+        return getOrCreate(() -> stickerStore, () -> stickerStore = new StickerStore(getAccountDatabase()));
     }
 
     public SenderKeyStore getSenderKeyStore() {
-        return getOrCreate(() -> senderKeyStore,
-                () -> senderKeyStore = new SenderKeyStore(getSharedSenderKeysFile(dataPath, accountPath),
-                        getSenderKeysPath(dataPath, accountPath),
-                        getRecipientAddressResolver(),
-                        getRecipientResolver()));
+        return getOrCreate(() -> senderKeyStore, () -> senderKeyStore = new SenderKeyStore(getAccountDatabase()));
+    }
+
+    private KeyValueStore getKeyValueStore() {
+        return getOrCreate(() -> keyValueStore, () -> keyValueStore = new KeyValueStore(getAccountDatabase()));
+    }
+
+    public UnknownStorageIdStore getUnknownStorageIdStore() {
+        return getOrCreate(() -> unknownStorageIdStore, () -> unknownStorageIdStore = new UnknownStorageIdStore());
     }
 
     public ConfigurationStore getConfigurationStore() {
-        return configurationStore;
+        return getOrCreate(() -> configurationStore,
+                () -> configurationStore = new ConfigurationStore(getKeyValueStore(), getRecipientStore()));
     }
 
     public MessageCache getMessageCache() {
@@ -1118,19 +1313,20 @@ public class SignalAccount implements Closeable {
 
     public MessageSendLogStore getMessageSendLogStore() {
         return getOrCreate(() -> messageSendLogStore,
-                () -> messageSendLogStore = new MessageSendLogStore(getRecipientResolver(), getAccountDatabase()));
+                () -> messageSendLogStore = new MessageSendLogStore(getAccountDatabase(),
+                        settings.disableMessageSendLog()));
     }
 
     public CredentialsProvider getCredentialsProvider() {
         return new CredentialsProvider() {
             @Override
             public ACI getAci() {
-                return aci;
+                return aciAccountData.getServiceId();
             }
 
             @Override
             public PNI getPni() {
-                return pni;
+                return pniAccountData.getServiceId();
             }
 
             @Override
@@ -1159,6 +1355,24 @@ public class SignalAccount implements Closeable {
         save();
     }
 
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(final String username) {
+        this.username = username;
+        save();
+    }
+
+    public UsernameLinkComponents getUsernameLink() {
+        return usernameLink;
+    }
+
+    public void setUsernameLink(final UsernameLinkComponents usernameLink) {
+        this.usernameLink = usernameLink;
+        save();
+    }
+
     public ServiceEnvironment getServiceEnvironment() {
         return serviceEnvironment;
     }
@@ -1168,38 +1382,107 @@ public class SignalAccount implements Closeable {
         save();
     }
 
+    public AccountAttributes getAccountAttributes(String registrationLock) {
+        return new AccountAttributes(null,
+                aciAccountData.getLocalRegistrationId(),
+                false,
+                false,
+                true,
+                registrationLock != null ? registrationLock : getRegistrationLock(),
+                getSelfUnidentifiedAccessKey(),
+                isUnrestrictedUnidentifiedAccess(),
+                isDiscoverableByPhoneNumber(),
+                getAccountCapabilities(),
+                encryptedDeviceName,
+                pniAccountData.getLocalRegistrationId(),
+                getRecoveryPassword());
+    }
+
+    public AccountAttributes.Capabilities getAccountCapabilities() {
+        return getCapabilities(isPrimaryDevice());
+    }
+
+    public ServiceId getAccountId(ServiceIdType serviceIdType) {
+        return getAccountData(serviceIdType).getServiceId();
+    }
+
     public ACI getAci() {
-        return aci;
+        return aciAccountData.getServiceId();
     }
 
     public void setAci(final ACI aci) {
-        this.aci = aci;
+        this.aciAccountData.setServiceId(aci);
         save();
     }
 
     public PNI getPni() {
-        return pni;
+        return pniAccountData.getServiceId();
     }
 
-    public void setPni(final PNI pni) {
-        this.pni = pni;
+    public void setPni(final PNI updatedPni) {
+        final var oldPni = pniAccountData.getServiceId();
+        if (oldPni != null && !oldPni.equals(updatedPni)) {
+            // Clear data for old PNI
+            identityKeyStore.deleteIdentity(oldPni);
+        }
+
+        this.pniAccountData.setServiceId(updatedPni);
+        getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
+        trustSelfIdentity(ServiceIdType.PNI);
+        save();
+    }
+
+    public void setNewPniIdentity(
+            final IdentityKeyPair pniIdentityKeyPair,
+            final SignedPreKeyRecord pniSignedPreKey,
+            final KyberPreKeyRecord lastResortKyberPreKey,
+            final int localPniRegistrationId
+    ) {
+        setPniIdentityKeyPair(pniIdentityKeyPair);
+        pniAccountData.setLocalRegistrationId(localPniRegistrationId);
+
+        final AccountData<? extends ServiceId> accountData = getAccountData(ServiceIdType.PNI);
+        final var preKeyMetadata = accountData.getPreKeyMetadata();
+        preKeyMetadata.nextSignedPreKeyId = pniSignedPreKey.getId();
+        accountData.getSignedPreKeyStore().removeSignedPreKey(pniSignedPreKey.getId());
+        addSignedPreKey(ServiceIdType.PNI, pniSignedPreKey);
+        if (lastResortKyberPreKey != null) {
+            preKeyMetadata.nextKyberPreKeyId = lastResortKyberPreKey.getId();
+            accountData.getKyberPreKeyStore().removeKyberPreKey(lastResortKyberPreKey.getId());
+            addLastResortKyberPreKey(ServiceIdType.PNI, lastResortKyberPreKey);
+        }
         save();
     }
 
     public SignalServiceAddress getSelfAddress() {
-        return new SignalServiceAddress(aci, number);
+        return new SignalServiceAddress(getAci(), number);
     }
 
     public RecipientAddress getSelfRecipientAddress() {
-        return new RecipientAddress(aci == null ? null : aci.uuid(), number);
+        return new RecipientAddress(getAci(), getPni(), number, username);
     }
 
     public RecipientId getSelfRecipientId() {
-        return getRecipientResolver().resolveRecipient(getSelfRecipientAddress());
+        return selfRecipientId;
     }
 
-    public byte[] getEncryptedDeviceName() {
-        return encryptedDeviceName == null ? null : Base64.getDecoder().decode(encryptedDeviceName);
+    public Profile getSelfRecipientProfile() {
+        return recipientStore.getProfile(selfRecipientId);
+    }
+
+    public String getSessionId(final String forNumber) {
+        final var keyValueStore = getKeyValueStore();
+        final var sessionNumber = keyValueStore.getEntry(verificationSessionNumber);
+        if (!forNumber.equals(sessionNumber)) {
+            return null;
+        }
+        return keyValueStore.getEntry(verificationSessionId);
+    }
+
+    public void setSessionId(final String sessionNumber, final String sessionId) {
+        final var keyValueStore = getKeyValueStore();
+        keyValueStore.storeEntry(verificationSessionNumber, sessionNumber);
+        keyValueStore.storeEntry(verificationSessionId, sessionId);
     }
 
     public void setEncryptedDeviceName(final String encryptedDeviceName) {
@@ -1216,79 +1499,162 @@ public class SignalAccount implements Closeable {
     }
 
     public IdentityKeyPair getIdentityKeyPair(ServiceIdType serviceIdType) {
-        return serviceIdType.equals(ServiceIdType.ACI) ? aciIdentityKeyPair : pniIdentityKeyPair;
+        return getAccountData(serviceIdType).getIdentityKeyPair();
     }
 
     public IdentityKeyPair getAciIdentityKeyPair() {
-        return aciIdentityKeyPair;
+        return aciAccountData.getIdentityKeyPair();
     }
 
     public IdentityKeyPair getPniIdentityKeyPair() {
-        return pniIdentityKeyPair;
+        return pniAccountData.getIdentityKeyPair();
     }
 
     public void setPniIdentityKeyPair(final IdentityKeyPair identityKeyPair) {
-        pniIdentityKeyPair = identityKeyPair;
+        pniAccountData.setIdentityKeyPair(identityKeyPair);
+        trustSelfIdentity(ServiceIdType.PNI);
         save();
     }
 
-    public int getLocalRegistrationId() {
-        return localRegistrationId;
-    }
-
     public String getPassword() {
         return password;
     }
 
-    private void setPassword(final String password) {
-        this.password = password;
-        save();
-    }
-
-    public void setRegistrationLockPin(final String registrationLockPin, final MasterKey pinMasterKey) {
+    public void setRegistrationLockPin(final String registrationLockPin) {
         this.registrationLockPin = registrationLockPin;
-        this.pinMasterKey = pinMasterKey;
         save();
     }
 
-    public MasterKey getPinMasterKey() {
-        return pinMasterKey;
+    public String getRegistrationLockPin() {
+        return registrationLockPin;
     }
 
-    public StorageKey getStorageKey() {
-        if (pinMasterKey != null) {
-            return pinMasterKey.deriveStorageServiceKey();
+    public String getRegistrationLock() {
+        final var masterKey = getPinBackedMasterKey();
+        if (masterKey == null) {
+            return null;
         }
-        return storageKey;
+        return masterKey.deriveRegistrationLock();
+    }
+
+    public MasterKey getPinBackedMasterKey() {
+        if (registrationLockPin == null) {
+            return null;
+        } else if (!isPrimaryDevice()) {
+            return getMasterKey();
+        }
+        return getOrCreatePinMasterKey();
+    }
+
+    public MasterKey getOrCreatePinMasterKey() {
+        final var key = getMasterKey();
+        if (key != null) {
+            return key;
+        }
+
+        return getOrCreateAccountEntropyPool().deriveMasterKey();
+    }
+
+    private MasterKey getMasterKey() {
+        if (pinMasterKey != null) {
+            return pinMasterKey;
+        } else if (accountEntropyPool != null) {
+            return accountEntropyPool.deriveMasterKey();
+        }
+        return null;
+    }
+
+    public void setMasterKey(MasterKey masterKey) {
+        if (isPrimaryDevice()) {
+            return;
+        }
+        this.pinMasterKey = masterKey;
+        if (masterKey != null) {
+            this.storageKey = null;
+        }
+        save();
+    }
+
+    public StorageKey getOrCreateStorageKey() {
+        if (storageKey != null) {
+            return storageKey;
+        } else if (pinMasterKey != null) {
+            return pinMasterKey.deriveStorageServiceKey();
+        } else if (accountEntropyPool != null) {
+            return accountEntropyPool.deriveMasterKey().deriveStorageServiceKey();
+        } else if (!isPrimaryDevice() || !isMultiDevice()) {
+            // Only upload storage, if a pin master key already exists or linked devices exist
+            return null;
+        }
+
+        return getOrCreatePinMasterKey().deriveStorageServiceKey();
     }
 
     public void setStorageKey(final StorageKey storageKey) {
-        if (storageKey.equals(this.storageKey)) {
+        if (isPrimaryDevice() || storageKey.equals(this.storageKey)) {
             return;
         }
         this.storageKey = storageKey;
         save();
     }
 
-    public long getStorageManifestVersion() {
-        return this.storageManifestVersion;
+    public AccountEntropyPool getOrCreateAccountEntropyPool() {
+        if (accountEntropyPool == null) {
+            accountEntropyPool = AccountEntropyPool.Companion.generate();
+            save();
+        }
+        return accountEntropyPool;
     }
 
-    public void setStorageManifestVersion(final long storageManifestVersion) {
-        if (storageManifestVersion == this.storageManifestVersion) {
-            return;
+    public void setAccountEntropyPool(final AccountEntropyPool accountEntropyPool) {
+        this.accountEntropyPool = accountEntropyPool;
+        if (accountEntropyPool != null) {
+            this.storageKey = null;
+            this.pinMasterKey = null;
         }
-        this.storageManifestVersion = storageManifestVersion;
         save();
     }
 
+    public boolean needsStorageKeyMigration() {
+        return isPrimaryDevice() && (storageKey != null || pinMasterKey != null);
+    }
+
+    public MediaRootBackupKey getOrCreateMediaRootBackupKey() {
+        if (mediaRootBackupKey == null) {
+            mediaRootBackupKey = KeyUtils.createMediaRootBackupKey();
+            save();
+        }
+        return mediaRootBackupKey;
+    }
+
+    public void setMediaRootBackupKey(final MediaRootBackupKey mediaRootBackupKey) {
+        this.mediaRootBackupKey = mediaRootBackupKey;
+        save();
+    }
+
+    public String getRecoveryPassword() {
+        final var masterKey = getPinBackedMasterKey();
+        if (masterKey == null) {
+            return null;
+        }
+        return masterKey.deriveRegistrationRecoveryPassword();
+    }
+
+    public long getStorageManifestVersion() {
+        return getKeyValueStore().getEntry(storageManifestVersion);
+    }
+
+    public void setStorageManifestVersion(final long value) {
+        getKeyValueStore().storeEntry(storageManifestVersion, value);
+    }
+
     public Optional<SignalStorageManifest> getStorageManifest() {
         final var storageManifestFile = getStorageManifestFile(dataPath, accountPath);
         if (!storageManifestFile.exists()) {
             return Optional.empty();
         }
         try (var inputStream = new FileInputStream(storageManifestFile)) {
-            return Optional.of(SignalStorageManifest.deserialize(inputStream.readAllBytes()));
+            return Optional.of(SignalStorageManifest.Companion.deserialize(inputStream.readAllBytes()));
         } catch (IOException e) {
             logger.warn("Failed to read local storage manifest.", e);
             return Optional.empty();
@@ -1296,9 +1662,19 @@ public class SignalAccount implements Closeable {
     }
 
     public void setStorageManifest(SignalStorageManifest manifest) {
-        final var manifestBytes = manifest.serialize();
-
         final var storageManifestFile = getStorageManifestFile(dataPath, accountPath);
+        if (manifest == null) {
+            if (storageManifestFile.exists()) {
+                try {
+                    Files.delete(storageManifestFile.toPath());
+                } catch (IOException e) {
+                    logger.error("Failed to delete local storage manifest.", e);
+                }
+            }
+            return;
+        }
+
+        final var manifestBytes = manifest.serialize();
         try (var outputStream = new FileOutputStream(storageManifestFile)) {
             outputStream.write(manifestBytes);
         } catch (IOException e) {
@@ -1306,6 +1682,22 @@ public class SignalAccount implements Closeable {
         }
     }
 
+    public byte[] getCdsiToken() {
+        return getKeyValueStore().getEntry(cdsiToken);
+    }
+
+    public void setCdsiToken(final byte[] value) {
+        getKeyValueStore().storeEntry(cdsiToken, value);
+    }
+
+    public Long getLastRecipientsRefresh() {
+        return getKeyValueStore().getEntry(lastRecipientsRefresh);
+    }
+
+    public void setLastRecipientsRefresh(final Long value) {
+        getKeyValueStore().storeEntry(lastRecipientsRefresh, value);
+    }
+
     public ProfileKey getProfileKey() {
         return profileKey;
     }
@@ -1316,21 +1708,12 @@ public class SignalAccount implements Closeable {
         }
         this.profileKey = profileKey;
         save();
-        getProfileStore().storeSelfProfileKey(getSelfRecipientId(), getProfileKey());
     }
 
     public byte[] getSelfUnidentifiedAccessKey() {
         return UnidentifiedAccess.deriveAccessKeyFrom(getProfileKey());
     }
 
-    public int getPreKeyIdOffset(ServiceIdType serviceIdType) {
-        return serviceIdType.equals(ServiceIdType.ACI) ? aciPreKeyIdOffset : pniPreKeyIdOffset;
-    }
-
-    public int getNextSignedPreKeyId(ServiceIdType serviceIdType) {
-        return serviceIdType.equals(ServiceIdType.ACI) ? aciNextSignedPreKeyId : pniNextSignedPreKeyId;
-    }
-
     public boolean isRegistered() {
         return registered;
     }
@@ -1353,44 +1736,44 @@ public class SignalAccount implements Closeable {
     }
 
     public long getLastReceiveTimestamp() {
-        return lastReceiveTimestamp;
+        return getKeyValueStore().getEntry(lastReceiveTimestamp);
     }
 
-    public void setLastReceiveTimestamp(final long lastReceiveTimestamp) {
-        this.lastReceiveTimestamp = lastReceiveTimestamp;
-        save();
+    public void setLastReceiveTimestamp(final long value) {
+        getKeyValueStore().storeEntry(lastReceiveTimestamp, value);
+    }
+
+    public void setNeedsToRetryFailedMessages(final boolean value) {
+        getKeyValueStore().storeEntry(needsToRetryFailedMessages, value);
+    }
+
+    public boolean getNeedsToRetryFailedMessages() {
+        return getKeyValueStore().getEntry(needsToRetryFailedMessages);
     }
 
     public boolean isUnrestrictedUnidentifiedAccess() {
-        final var profile = getProfileStore().getProfile(getSelfRecipientId());
-        return profile != null && profile.getUnidentifiedAccessMode() == Profile.UnidentifiedAccessMode.UNRESTRICTED;
+        return Boolean.TRUE.equals(getKeyValueStore().getEntry(unrestrictedUnidentifiedAccess));
+    }
+
+    public void setUnrestrictedUnidentifiedAccess(boolean value) {
+        getKeyValueStore().storeEntry(unrestrictedUnidentifiedAccess, value);
     }
 
     public boolean isDiscoverableByPhoneNumber() {
-        return configurationStore.getPhoneNumberUnlisted() == null || !configurationStore.getPhoneNumberUnlisted();
+        final var phoneNumberUnlisted = getConfigurationStore().getPhoneNumberUnlisted();
+        return phoneNumberUnlisted == null || !phoneNumberUnlisted;
     }
 
-    public void finishRegistration(final ACI aci, final PNI pni, final MasterKey masterKey, final String pin) {
-        this.pinMasterKey = masterKey;
-        this.storageManifestVersion = -1;
-        this.storageKey = null;
-        this.encryptedDeviceName = null;
-        this.deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
-        this.isMultiDevice = false;
-        this.registered = true;
-        this.aci = aci;
-        this.pni = pni;
-        this.registrationLockPin = pin;
-        this.lastReceiveTimestamp = 0;
-        save();
-
-        clearAllPreKeys();
-        getSessionStore().archiveAllSessions();
-        getSenderKeyStore().deleteAll();
-        final var recipientId = getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
-        final var publicKey = getAciIdentityKeyPair().getPublicKey();
-        getIdentityKeyStore().saveIdentity(recipientId, publicKey, new Date());
-        getIdentityKeyStore().setIdentityTrustLevel(recipientId, publicKey, TrustLevel.TRUSTED_VERIFIED);
+    private void trustSelfIdentity(ServiceIdType serviceIdType) {
+        final var accountData = getAccountData(serviceIdType);
+        final var serviceId = accountData.getServiceId();
+        final var identityKeyPair = accountData.getIdentityKeyPair();
+        if (serviceId == null || identityKeyPair == null) {
+            return;
+        }
+        final var publicKey = identityKeyPair.getPublicKey();
+        getIdentityKeyStore().saveIdentity(serviceId, publicKey);
+        getIdentityKeyStore().setIdentityTrustLevel(serviceId, publicKey, TrustLevel.TRUSTED_VERIFIED);
     }
 
     public void deleteAccountData() throws IOException {
@@ -1408,11 +1791,7 @@ public class SignalAccount implements Closeable {
     public void close() {
         synchronized (fileChannel) {
             if (accountDatabase != null) {
-                try {
-                    accountDatabase.close();
-                } catch (SQLException e) {
-                    logger.warn("Failed to close account database: {}", e.getMessage(), e);
-                }
+                accountDatabase.close();
             }
             if (messageSendLogStore != null) {
                 messageSendLogStore.close();
@@ -1449,4 +1828,178 @@ public class SignalAccount implements Closeable {
 
         void call();
     }
+
+    public static class PreKeyMetadata {
+
+        private int nextPreKeyId = 1;
+        private int nextSignedPreKeyId = 1;
+        private int activeSignedPreKeyId = -1;
+        private int nextKyberPreKeyId = 1;
+        private int activeLastResortKyberPreKeyId = -1;
+
+        public int getNextPreKeyId() {
+            return nextPreKeyId;
+        }
+
+        public int getNextSignedPreKeyId() {
+            return nextSignedPreKeyId;
+        }
+
+        public int getActiveSignedPreKeyId() {
+            return activeSignedPreKeyId;
+        }
+
+        public int getNextKyberPreKeyId() {
+            return nextKyberPreKeyId;
+        }
+
+        public int getActiveLastResortKyberPreKeyId() {
+            return activeLastResortKyberPreKeyId;
+        }
+    }
+
+    public class AccountData<SERVICE_ID extends ServiceId> {
+
+        private final ServiceIdType serviceIdType;
+        private SERVICE_ID serviceId;
+        private IdentityKeyPair identityKeyPair;
+        private int localRegistrationId;
+        private final PreKeyMetadata preKeyMetadata = new PreKeyMetadata();
+
+        private SignalProtocolStore signalProtocolStore;
+        private PreKeyStore preKeyStore;
+        private SignedPreKeyStore signedPreKeyStore;
+        private KyberPreKeyStore kyberPreKeyStore;
+        private SessionStore sessionStore;
+        private SignalIdentityKeyStore identityKeyStore;
+
+        private AccountData(final ServiceIdType serviceIdType) {
+            this.serviceIdType = serviceIdType;
+        }
+
+        public SERVICE_ID getServiceId() {
+            return serviceId;
+        }
+
+        private void setServiceId(final SERVICE_ID serviceId) {
+            this.serviceId = serviceId;
+        }
+
+        public IdentityKeyPair getIdentityKeyPair() {
+            return identityKeyPair;
+        }
+
+        private void setIdentityKeyPair(final IdentityKeyPair identityKeyPair) {
+            this.identityKeyPair = identityKeyPair;
+        }
+
+        public int getLocalRegistrationId() {
+            return localRegistrationId;
+        }
+
+        private void setLocalRegistrationId(final int localRegistrationId) {
+            this.localRegistrationId = localRegistrationId;
+            this.identityKeyStore = null;
+        }
+
+        public PreKeyMetadata getPreKeyMetadata() {
+            return preKeyMetadata;
+        }
+
+        private SignalServiceAccountDataStore getSignalServiceAccountDataStore() {
+            return getOrCreate(() -> signalProtocolStore,
+                    () -> signalProtocolStore = new SignalProtocolStore(getPreKeyStore(),
+                            getSignedPreKeyStore(),
+                            getKyberPreKeyStore(),
+                            getSessionStore(),
+                            getIdentityKeyStore(),
+                            getSenderKeyStore(),
+                            SignalAccount.this::isMultiDevice));
+        }
+
+        public PreKeyStore getPreKeyStore() {
+            return getOrCreate(() -> preKeyStore,
+                    () -> preKeyStore = new PreKeyStore(getAccountDatabase(), serviceIdType));
+        }
+
+        public SignedPreKeyStore getSignedPreKeyStore() {
+            return getOrCreate(() -> signedPreKeyStore,
+                    () -> signedPreKeyStore = new SignedPreKeyStore(getAccountDatabase(), serviceIdType));
+        }
+
+        public KyberPreKeyStore getKyberPreKeyStore() {
+            return getOrCreate(() -> kyberPreKeyStore,
+                    () -> kyberPreKeyStore = new KyberPreKeyStore(getAccountDatabase(), serviceIdType));
+        }
+
+        public SessionStore getSessionStore() {
+            return getOrCreate(() -> sessionStore,
+                    () -> sessionStore = new SessionStore(getAccountDatabase(), serviceIdType));
+        }
+
+        public SignalIdentityKeyStore getIdentityKeyStore() {
+            return getOrCreate(() -> identityKeyStore,
+                    () -> identityKeyStore = new SignalIdentityKeyStore(() -> identityKeyPair,
+                            localRegistrationId,
+                            SignalAccount.this.getIdentityKeyStore()));
+        }
+    }
+
+    public record Storage(
+            int version,
+            long timestamp,
+            String serviceEnvironment,
+            boolean registered,
+            String number,
+            String username,
+            String encryptedDeviceName,
+            int deviceId,
+            boolean isMultiDevice,
+            String password,
+            AccountData aciAccountData,
+            AccountData pniAccountData,
+            String registrationLockPin,
+            String pinMasterKey,
+            String storageKey,
+            String accountEntropyPool,
+            String mediaRootBackupKey,
+            String profileKey,
+            String usernameLinkEntropy,
+            String usernameLinkServerId
+    ) {
+
+        public record AccountData(
+                String serviceId,
+                int registrationId,
+                String identityPrivateKey,
+                String identityPublicKey,
+
+                int nextPreKeyId,
+                int nextSignedPreKeyId,
+                int activeSignedPreKeyId,
+                int nextKyberPreKeyId,
+                int activeLastResortKyberPreKeyId
+        ) {
+
+            private static AccountData from(final SignalAccount.AccountData<?> accountData) {
+                final var base64 = Base64.getEncoder();
+                final var preKeyMetadata = accountData.getPreKeyMetadata();
+                return new AccountData(accountData.getServiceId() == null
+                        ? null
+                        : accountData.getServiceId().toString(),
+                        accountData.getLocalRegistrationId(),
+                        accountData.getIdentityKeyPair() == null
+                                ? null
+                                : base64.encodeToString(accountData.getIdentityKeyPair().getPrivateKey().serialize()),
+                        accountData.getIdentityKeyPair() == null
+                                ? null
+                                : base64.encodeToString(accountData.getIdentityKeyPair().getPublicKey().serialize()),
+                        preKeyMetadata.getNextPreKeyId(),
+                        preKeyMetadata.getNextSignedPreKeyId(),
+                        preKeyMetadata.getActiveSignedPreKeyId(),
+                        preKeyMetadata.getNextKyberPreKeyId(),
+                        preKeyMetadata.getActiveLastResortKyberPreKeyId());
+            }
+        }
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/UnknownStorageIdStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/UnknownStorageIdStore.java
new file mode 100644
index 00000000..5ea5eff0
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/UnknownStorageIdStore.java
@@ -0,0 +1,103 @@
+package org.asamk.signal.manager.storage;
+
+import org.whispersystems.signalservice.api.storage.StorageId;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class UnknownStorageIdStore {
+
+    private static final String TABLE_STORAGE_ID = "storage_id";
+
+    public static void createSql(Connection connection) throws SQLException {
+        // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
+        try (final var statement = connection.createStatement()) {
+            statement.executeUpdate("""
+                                    CREATE TABLE storage_id (
+                                      _id INTEGER PRIMARY KEY,
+                                      type INTEGER NOT NULL,
+                                      storage_id BLOB UNIQUE NOT NULL
+                                    ) STRICT;
+                                    """);
+        }
+    }
+
+    public Set<StorageId> getUnknownStorageIds(Connection connection) throws SQLException {
+        final var sql = (
+                """
+                SELECT s.type, s.storage_id
+                FROM %s s
+                """
+        ).formatted(TABLE_STORAGE_ID);
+        try (final var statement = connection.prepareStatement(sql)) {
+            try (var result = Utils.executeQueryForStream(statement, this::getStorageIdFromResultSet)) {
+                return result.collect(Collectors.toSet());
+            }
+        }
+    }
+
+    public List<StorageId> getUnknownStorageIds(Connection connection, Collection<Integer> types) throws SQLException {
+        final var typesCommaSeparated = types.stream().map(String::valueOf).collect(Collectors.joining(","));
+        final var sql = (
+                """
+                SELECT s.type, s.storage_id
+                FROM %s s
+                WHERE s.type IN (%s)
+                """
+        ).formatted(TABLE_STORAGE_ID, typesCommaSeparated);
+        try (final var statement = connection.prepareStatement(sql)) {
+            try (var result = Utils.executeQueryForStream(statement, this::getStorageIdFromResultSet)) {
+                return result.toList();
+            }
+        }
+    }
+
+    public void addUnknownStorageIds(Connection connection, Collection<StorageId> storageIds) throws SQLException {
+        final var sql = (
+                """
+                INSERT OR REPLACE INTO %s (type, storage_id)
+                VALUES (?, ?)
+                """
+        ).formatted(TABLE_STORAGE_ID);
+        try (final var statement = connection.prepareStatement(sql)) {
+            for (final var storageId : storageIds) {
+                statement.setInt(1, storageId.getType());
+                statement.setBytes(2, storageId.getRaw());
+                statement.executeUpdate();
+            }
+        }
+    }
+
+    public void deleteUnknownStorageIds(Connection connection, Collection<StorageId> storageIds) throws SQLException {
+        final var sql = (
+                """
+                DELETE FROM %s
+                WHERE storage_id = ?
+                """
+        ).formatted(TABLE_STORAGE_ID);
+        try (final var statement = connection.prepareStatement(sql)) {
+            for (final var storageId : storageIds) {
+                statement.setBytes(1, storageId.getRaw());
+                statement.executeUpdate();
+            }
+        }
+    }
+
+    public void deleteAllUnknownStorageIds(Connection connection) throws SQLException {
+        final var sql = "DELETE FROM %s".formatted(TABLE_STORAGE_ID);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.executeUpdate();
+        }
+    }
+
+    private StorageId getStorageIdFromResultSet(ResultSet resultSet) throws SQLException {
+        final var type = resultSet.getInt("type");
+        final var storageId = resultSet.getBytes("storage_id");
+        return StorageId.forType(storageId, type);
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java b/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java
index e4b639a2..e4858f21 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java
@@ -10,13 +10,27 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.io.InvalidObjectException;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.Optional;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 public class Utils {
 
+    private static final Logger logger = LoggerFactory.getLogger(Utils.class);
+
     private Utils() {
     }
 
@@ -42,11 +56,72 @@ public class Utils {
         return node;
     }
 
-    public static RecipientAddress getRecipientAddressFromIdentifier(final String identifier) {
+    public static RecipientAddress getRecipientAddressFromLegacyIdentifier(final String identifier) {
         if (UuidUtil.isUuid(identifier)) {
-            return new RecipientAddress(UuidUtil.parseOrThrow(identifier));
+            return new RecipientAddress(ServiceId.parseOrThrow(identifier));
         } else {
             return new RecipientAddress(Optional.empty(), Optional.of(identifier));
         }
     }
+
+    public static int getAccountIdType(ServiceIdType serviceIdType) {
+        return switch (serviceIdType) {
+            case ACI -> 0;
+            case PNI -> 1;
+        };
+    }
+
+    public static <T> T executeQuerySingleRow(
+            PreparedStatement statement,
+            ResultSetMapper<T> mapper
+    ) throws SQLException {
+        final var resultSet = statement.executeQuery();
+        if (!resultSet.next()) {
+            throw new RuntimeException("Expected a row in result set, but none found.");
+        }
+        return mapper.apply(resultSet);
+    }
+
+    public static <T> Optional<T> executeQueryForOptional(
+            PreparedStatement statement,
+            ResultSetMapper<T> mapper
+    ) throws SQLException {
+        final var resultSet = statement.executeQuery();
+        if (!resultSet.next()) {
+            return Optional.empty();
+        }
+        return Optional.ofNullable(mapper.apply(resultSet));
+    }
+
+    public static <T> Stream<T> executeQueryForStream(
+            PreparedStatement statement,
+            ResultSetMapper<T> mapper
+    ) throws SQLException {
+        final var resultSet = statement.executeQuery();
+
+        return StreamSupport.stream(new Spliterators.AbstractSpliterator<>(Long.MAX_VALUE, Spliterator.ORDERED) {
+            @Override
+            public boolean tryAdvance(final Consumer<? super T> consumer) {
+                try {
+                    if (!resultSet.next()) {
+                        return false;
+                    }
+                    consumer.accept(mapper.apply(resultSet));
+                    return true;
+                } catch (SQLException e) {
+                    logger.warn("Failed to read from database result", e);
+                    throw new RuntimeException(e);
+                }
+            }
+        }, false);
+    }
+
+    public static Long getIdMapper(ResultSet resultSet) throws SQLException {
+        return resultSet.getLong("_id");
+    }
+
+    public interface ResultSetMapper<T> {
+
+        T apply(ResultSet resultSet) throws SQLException;
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStorage.java b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStorage.java
index 7507c339..40107986 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStorage.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStorage.java
@@ -2,7 +2,7 @@ package org.asamk.signal.manager.storage.accounts;
 
 import java.util.List;
 
-public record AccountsStorage(List<Account> accounts) {
+public record AccountsStorage(List<Account> accounts, Integer version) {
 
-    public record Account(String path, String number, String uuid) {}
+    public record Account(String path, String environment, String number, String uuid) {}
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
index ea2f0a1b..7be4a401 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
@@ -1,14 +1,16 @@
 package org.asamk.signal.manager.storage.accounts;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
 
 import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.ServiceEnvironment;
+import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.Utils;
 import org.asamk.signal.manager.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.push.ACI;
-import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -29,39 +31,54 @@ import java.util.stream.Stream;
 
 public class AccountsStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(AccountsStore.class);
+    private static final int MINIMUM_STORAGE_VERSION = 1;
+    private static final int CURRENT_STORAGE_VERSION = 2;
+    private static final Logger logger = LoggerFactory.getLogger(AccountsStore.class);
     private final ObjectMapper objectMapper = Utils.createStorageObjectMapper();
 
     private final File dataPath;
+    private final String serviceEnvironment;
+    private final AccountLoader accountLoader;
 
-    public AccountsStore(final File dataPath) throws IOException {
+    public AccountsStore(
+            final File dataPath,
+            final ServiceEnvironment serviceEnvironment,
+            final AccountLoader accountLoader
+    ) throws IOException {
         this.dataPath = dataPath;
+        this.serviceEnvironment = getServiceEnvironmentString(serviceEnvironment);
+        this.accountLoader = accountLoader;
         if (!getAccountsFile().exists()) {
             createInitialAccounts();
         }
     }
 
-    public synchronized Set<String> getAllNumbers() {
+    public synchronized Set<String> getAllNumbers() throws IOException {
         return readAccounts().stream()
                 .map(AccountsStorage.Account::number)
                 .filter(Objects::nonNull)
                 .collect(Collectors.toSet());
     }
 
-    public synchronized Set<AccountsStorage.Account> getAllAccounts() {
-        return readAccounts().stream().filter(a -> a.number() != null).collect(Collectors.toSet());
+    public synchronized Set<AccountsStorage.Account> getAllAccounts() throws IOException {
+        return readAccounts().stream()
+                .filter(a -> a.environment() == null || serviceEnvironment.equals(a.environment()))
+                .filter(a -> a.number() != null)
+                .collect(Collectors.toSet());
     }
 
-    public synchronized String getPathByNumber(String number) {
+    public synchronized String getPathByNumber(String number) throws IOException {
         return readAccounts().stream()
+                .filter(a -> a.environment() == null || serviceEnvironment.equals(a.environment()))
                 .filter(a -> number.equals(a.number()))
                 .map(AccountsStorage.Account::path)
                 .findFirst()
                 .orElse(null);
     }
 
-    public synchronized String getPathByAci(ACI aci) {
+    public synchronized String getPathByAci(ACI aci) throws IOException {
         return readAccounts().stream()
+                .filter(a -> a.environment() == null || serviceEnvironment.equals(a.environment()))
                 .filter(a -> aci.toString().equals(a.uuid()))
                 .map(AccountsStorage.Account::path)
                 .findFirst()
@@ -70,15 +87,22 @@ public class AccountsStore {
 
     public synchronized void updateAccount(String path, String number, ACI aci) {
         updateAccounts(accounts -> accounts.stream().map(a -> {
+            if (a.environment() != null && !serviceEnvironment.equals(a.environment())) {
+                return a;
+            }
+
             if (path.equals(a.path())) {
-                return new AccountsStorage.Account(a.path(), number, aci == null ? null : aci.toString());
+                return new AccountsStorage.Account(a.path(),
+                        serviceEnvironment,
+                        number,
+                        aci == null ? null : aci.toString());
             }
 
             if (number != null && number.equals(a.number())) {
-                return new AccountsStorage.Account(a.path(), null, a.uuid());
+                return new AccountsStorage.Account(a.path(), a.environment(), null, a.uuid());
             }
             if (aci != null && aci.toString().equals(a.toString())) {
-                return new AccountsStorage.Account(a.path(), a.number(), null);
+                return new AccountsStorage.Account(a.path(), a.environment(), a.number(), null);
             }
 
             return a;
@@ -87,14 +111,21 @@ public class AccountsStore {
 
     public synchronized String addAccount(String number, ACI aci) {
         final var accountPath = generateNewAccountPath();
-        final var account = new AccountsStorage.Account(accountPath, number, aci == null ? null : aci.toString());
+        final var account = new AccountsStorage.Account(accountPath,
+                serviceEnvironment,
+                number,
+                aci == null ? null : aci.toString());
         updateAccounts(accounts -> {
             final var existingAccounts = accounts.stream().map(a -> {
-                if (number != null && number.equals(a.number())) {
-                    return new AccountsStorage.Account(a.path(), null, a.uuid());
+                if (a.environment() != null && !serviceEnvironment.equals(a.environment())) {
+                    return a;
                 }
-                if (aci != null && aci.toString().equals(a.toString())) {
-                    return new AccountsStorage.Account(a.path(), a.number(), null);
+
+                if (number != null && number.equals(a.number())) {
+                    return new AccountsStorage.Account(a.path(), a.environment(), null, a.uuid());
+                }
+                if (aci != null && aci.toString().equals(a.uuid())) {
+                    return new AccountsStorage.Account(a.path(), a.environment(), a.number(), null);
                 }
 
                 return a;
@@ -105,7 +136,9 @@ public class AccountsStore {
     }
 
     public void removeAccount(final String accountPath) {
-        updateAccounts(accounts -> accounts.stream().filter(a -> !a.path().equals(accountPath)).toList());
+        updateAccounts(accounts -> accounts.stream().filter(a -> !(
+                (a.environment() == null || serviceEnvironment.equals(a.environment())) && a.path().equals(accountPath)
+        )).toList());
     }
 
     private String generateNewAccountPath() {
@@ -123,8 +156,8 @@ public class AccountsStore {
     private void createInitialAccounts() throws IOException {
         final var legacyAccountPaths = getLegacyAccountPaths();
         final var accountsStorage = new AccountsStorage(legacyAccountPaths.stream()
-                .map(number -> new AccountsStorage.Account(number, number, null))
-                .toList());
+                .map(number -> new AccountsStorage.Account(number, null, number, null))
+                .toList(), CURRENT_STORAGE_VERSION);
 
         IOUtils.createPrivateDirectories(dataPath);
         var fileName = getAccountsFile();
@@ -148,19 +181,58 @@ public class AccountsStore {
         return Arrays.stream(files)
                 .filter(File::isFile)
                 .map(File::getName)
-                .filter(file -> PhoneNumberFormatter.isValidNumber(file, null))
+                .filter(file -> PhoneNumberUtil.getInstance().isPossibleNumber(file, null))
                 .collect(Collectors.toSet());
     }
 
-    private List<AccountsStorage.Account> readAccounts() {
-        try {
-            final var pair = openFileChannel(getAccountsFile());
-            try (final var fileChannel = pair.first(); final var lock = pair.second()) {
-                return readAccountsLocked(fileChannel).accounts();
+    private List<AccountsStorage.Account> readAccounts() throws IOException {
+        final var pair = openFileChannel(getAccountsFile());
+        try (final var fileChannel = pair.first(); final var lock = pair.second()) {
+            final var storage = readAccountsLocked(fileChannel);
+
+            var accountsVersion = storage.version() == null ? 1 : storage.version();
+            if (accountsVersion > CURRENT_STORAGE_VERSION) {
+                throw new IOException("Accounts file was created by a more recent version: " + accountsVersion);
+            } else if (accountsVersion < MINIMUM_STORAGE_VERSION) {
+                throw new IOException("Accounts file was created by a no longer supported older version: "
+                        + accountsVersion);
+            } else if (accountsVersion < CURRENT_STORAGE_VERSION) {
+                return upgradeAccountsFile(fileChannel, storage, accountsVersion).accounts();
             }
-        } catch (IOException e) {
-            logger.error("Failed to read accounts list", e);
-            return List.of();
+            return storage.accounts();
+        }
+    }
+
+    private AccountsStorage upgradeAccountsFile(
+            final FileChannel fileChannel,
+            final AccountsStorage storage,
+            final int accountsVersion
+    ) {
+        try {
+            List<AccountsStorage.Account> newAccounts = storage.accounts();
+            if (accountsVersion < 2) {
+                // add environment field
+                newAccounts = newAccounts.stream().map(a -> {
+                    if (a.environment() != null) {
+                        return a;
+                    }
+                    try (final var account = accountLoader.loadAccountOrNull(a.path())) {
+                        if (account == null || account.getServiceEnvironment() == null) {
+                            return a;
+                        }
+                        return new AccountsStorage.Account(a.path(),
+                                getServiceEnvironmentString(account.getServiceEnvironment()),
+                                a.number(),
+                                a.uuid());
+                    }
+                }).toList();
+            }
+            final var newStorage = new AccountsStorage(newAccounts, CURRENT_STORAGE_VERSION);
+            saveAccountsLocked(fileChannel, newStorage);
+            return newStorage;
+        } catch (Exception e) {
+            logger.warn("Failed to upgrade accounts file", e);
+            return storage;
         }
     }
 
@@ -170,7 +242,7 @@ public class AccountsStore {
             try (final var fileChannel = pair.first(); final var lock = pair.second()) {
                 final var accountsStorage = readAccountsLocked(fileChannel);
                 final var newAccountsStorage = updater.apply(accountsStorage.accounts());
-                saveAccountsLocked(fileChannel, new AccountsStorage(newAccountsStorage));
+                saveAccountsLocked(fileChannel, new AccountsStorage(newAccountsStorage, CURRENT_STORAGE_VERSION));
             }
         } catch (IOException e) {
             logger.error("Failed to update accounts list", e);
@@ -184,18 +256,14 @@ public class AccountsStore {
     }
 
     private void saveAccountsLocked(FileChannel fileChannel, AccountsStorage accountsStorage) throws IOException {
-        try {
-            try (var output = new ByteArrayOutputStream()) {
-                // Write to memory first to prevent corrupting the file in case of serialization errors
-                objectMapper.writeValue(output, accountsStorage);
-                var input = new ByteArrayInputStream(output.toByteArray());
-                fileChannel.position(0);
-                input.transferTo(Channels.newOutputStream(fileChannel));
-                fileChannel.truncate(fileChannel.position());
-                fileChannel.force(false);
-            }
-        } catch (Exception e) {
-            logger.error("Error saving accounts file: {}", e.getMessage(), e);
+        try (var output = new ByteArrayOutputStream()) {
+            // Write to memory first to prevent corrupting the file in case of serialization errors
+            objectMapper.writeValue(output, accountsStorage);
+            var input = new ByteArrayInputStream(output.toByteArray());
+            fileChannel.position(0);
+            input.transferTo(Channels.newOutputStream(fileChannel));
+            fileChannel.truncate(fileChannel.position());
+            fileChannel.force(false);
         }
     }
 
@@ -209,4 +277,16 @@ public class AccountsStore {
         }
         return new Pair<>(fileChannel, lock);
     }
+
+    private String getServiceEnvironmentString(final ServiceEnvironment serviceEnvironment) {
+        return switch (serviceEnvironment) {
+            case LIVE -> "LIVE";
+            case STAGING -> "STAGING";
+        };
+    }
+
+    public interface AccountLoader {
+
+        SignalAccount loadAccountOrNull(String accountPath);
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java
index b810ea23..88f05725 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java
@@ -1,106 +1,180 @@
 package org.asamk.signal.manager.storage.configuration;
 
 import org.asamk.signal.manager.api.PhoneNumberSharingMode;
+import org.asamk.signal.manager.storage.keyValue.KeyValueEntry;
+import org.asamk.signal.manager.storage.keyValue.KeyValueStore;
+import org.asamk.signal.manager.storage.recipients.RecipientStore;
+
+import java.sql.Connection;
+import java.sql.SQLException;
 
 public class ConfigurationStore {
 
-    private final Saver saver;
+    private final KeyValueStore keyValueStore;
+    private final RecipientStore recipientStore;
 
-    private Boolean readReceipts;
-    private Boolean unidentifiedDeliveryIndicators;
-    private Boolean typingIndicators;
-    private Boolean linkPreviews;
-    private Boolean phoneNumberUnlisted;
-    private PhoneNumberSharingMode phoneNumberSharingMode;
+    private final KeyValueEntry<Boolean> readReceipts = new KeyValueEntry<>("config-read-receipts", Boolean.class);
+    private final KeyValueEntry<Boolean> unidentifiedDeliveryIndicators = new KeyValueEntry<>(
+            "config-unidentified-delivery-indicators",
+            Boolean.class);
+    private final KeyValueEntry<Boolean> typingIndicators = new KeyValueEntry<>("config-typing-indicators",
+            Boolean.class);
+    private final KeyValueEntry<Boolean> linkPreviews = new KeyValueEntry<>("config-link-previews", Boolean.class);
+    private final KeyValueEntry<Boolean> phoneNumberUnlisted = new KeyValueEntry<>("config-phone-number-unlisted",
+            Boolean.class);
+    private final KeyValueEntry<PhoneNumberSharingMode> phoneNumberSharingMode = new KeyValueEntry<>(
+            "config-phone-number-sharing-mode",
+            PhoneNumberSharingMode.class);
+    private final KeyValueEntry<String> usernameLinkColor = new KeyValueEntry<>("username-link-color", String.class);
 
-    public ConfigurationStore(final Saver saver) {
-        this.saver = saver;
-    }
-
-    public static ConfigurationStore fromStorage(Storage storage, Saver saver) {
-        final var store = new ConfigurationStore(saver);
-        store.readReceipts = storage.readReceipts;
-        store.unidentifiedDeliveryIndicators = storage.unidentifiedDeliveryIndicators;
-        store.typingIndicators = storage.typingIndicators;
-        store.linkPreviews = storage.linkPreviews;
-        store.phoneNumberSharingMode = storage.phoneNumberSharingMode;
-        return store;
+    public ConfigurationStore(final KeyValueStore keyValueStore, RecipientStore recipientStore) {
+        this.keyValueStore = keyValueStore;
+        this.recipientStore = recipientStore;
     }
 
     public Boolean getReadReceipts() {
-        return readReceipts;
+        return keyValueStore.getEntry(readReceipts);
     }
 
-    public void setReadReceipts(final boolean readReceipts) {
-        this.readReceipts = readReceipts;
-        saver.save(toStorage());
+    public Boolean getReadReceipts(final Connection connection) throws SQLException {
+        return keyValueStore.getEntry(connection, readReceipts);
+    }
+
+    public void setReadReceipts(final boolean value) {
+        if (keyValueStore.storeEntry(readReceipts, value)) {
+            recipientStore.rotateSelfStorageId();
+        }
+    }
+
+    public void setReadReceipts(final Connection connection, final boolean value) throws SQLException {
+        if (keyValueStore.storeEntry(connection, readReceipts, value)) {
+            recipientStore.rotateSelfStorageId(connection);
+        }
     }
 
     public Boolean getUnidentifiedDeliveryIndicators() {
-        return unidentifiedDeliveryIndicators;
+        return keyValueStore.getEntry(unidentifiedDeliveryIndicators);
     }
 
-    public void setUnidentifiedDeliveryIndicators(final boolean unidentifiedDeliveryIndicators) {
-        this.unidentifiedDeliveryIndicators = unidentifiedDeliveryIndicators;
-        saver.save(toStorage());
+    public Boolean getUnidentifiedDeliveryIndicators(final Connection connection) throws SQLException {
+        return keyValueStore.getEntry(connection, unidentifiedDeliveryIndicators);
+    }
+
+    public void setUnidentifiedDeliveryIndicators(final boolean value) {
+        if (keyValueStore.storeEntry(unidentifiedDeliveryIndicators, value)) {
+            recipientStore.rotateSelfStorageId();
+        }
+    }
+
+    public void setUnidentifiedDeliveryIndicators(
+            final Connection connection,
+            final boolean value
+    ) throws SQLException {
+        if (keyValueStore.storeEntry(connection, unidentifiedDeliveryIndicators, value)) {
+            recipientStore.rotateSelfStorageId(connection);
+        }
     }
 
     public Boolean getTypingIndicators() {
-        return typingIndicators;
+        return keyValueStore.getEntry(typingIndicators);
     }
 
-    public void setTypingIndicators(final boolean typingIndicators) {
-        this.typingIndicators = typingIndicators;
-        saver.save(toStorage());
+    public Boolean getTypingIndicators(final Connection connection) throws SQLException {
+        return keyValueStore.getEntry(connection, typingIndicators);
+    }
+
+    public void setTypingIndicators(final boolean value) {
+        if (keyValueStore.storeEntry(typingIndicators, value)) {
+            recipientStore.rotateSelfStorageId();
+        }
+    }
+
+    public void setTypingIndicators(final Connection connection, final boolean value) throws SQLException {
+        if (keyValueStore.storeEntry(connection, typingIndicators, value)) {
+            recipientStore.rotateSelfStorageId(connection);
+        }
     }
 
     public Boolean getLinkPreviews() {
-        return linkPreviews;
+        return keyValueStore.getEntry(linkPreviews);
     }
 
-    public void setLinkPreviews(final boolean linkPreviews) {
-        this.linkPreviews = linkPreviews;
-        saver.save(toStorage());
+    public Boolean getLinkPreviews(final Connection connection) throws SQLException {
+        return keyValueStore.getEntry(connection, linkPreviews);
+    }
+
+    public void setLinkPreviews(final boolean value) {
+        if (keyValueStore.storeEntry(linkPreviews, value)) {
+            recipientStore.rotateSelfStorageId();
+        }
+    }
+
+    public void setLinkPreviews(final Connection connection, final boolean value) throws SQLException {
+        if (keyValueStore.storeEntry(connection, linkPreviews, value)) {
+            recipientStore.rotateSelfStorageId(connection);
+        }
     }
 
     public Boolean getPhoneNumberUnlisted() {
-        return phoneNumberUnlisted;
+        return keyValueStore.getEntry(phoneNumberUnlisted);
     }
 
-    public void setPhoneNumberUnlisted(final boolean phoneNumberUnlisted) {
-        this.phoneNumberUnlisted = phoneNumberUnlisted;
-        saver.save(toStorage());
+    public Boolean getPhoneNumberUnlisted(final Connection connection) throws SQLException {
+        return keyValueStore.getEntry(connection, phoneNumberUnlisted);
+    }
+
+    public void setPhoneNumberUnlisted(final boolean value) {
+        if (keyValueStore.storeEntry(phoneNumberUnlisted, value)) {
+            recipientStore.rotateSelfStorageId();
+        }
+    }
+
+    public void setPhoneNumberUnlisted(final Connection connection, final boolean value) throws SQLException {
+        if (keyValueStore.storeEntry(connection, phoneNumberUnlisted, value)) {
+            recipientStore.rotateSelfStorageId(connection);
+        }
     }
 
     public PhoneNumberSharingMode getPhoneNumberSharingMode() {
-        return phoneNumberSharingMode;
+        return keyValueStore.getEntry(phoneNumberSharingMode);
     }
 
-    public void setPhoneNumberSharingMode(final PhoneNumberSharingMode phoneNumberSharingMode) {
-        this.phoneNumberSharingMode = phoneNumberSharingMode;
-        saver.save(toStorage());
+    public PhoneNumberSharingMode getPhoneNumberSharingMode(final Connection connection) throws SQLException {
+        return keyValueStore.getEntry(connection, phoneNumberSharingMode);
     }
 
-    private Storage toStorage() {
-        return new Storage(readReceipts,
-                unidentifiedDeliveryIndicators,
-                typingIndicators,
-                linkPreviews,
-                phoneNumberUnlisted,
-                phoneNumberSharingMode);
+    public void setPhoneNumberSharingMode(final PhoneNumberSharingMode value) {
+        if (keyValueStore.storeEntry(phoneNumberSharingMode, value)) {
+            recipientStore.rotateSelfStorageId();
+        }
     }
 
-    public record Storage(
-            Boolean readReceipts,
-            Boolean unidentifiedDeliveryIndicators,
-            Boolean typingIndicators,
-            Boolean linkPreviews,
-            Boolean phoneNumberUnlisted,
-            PhoneNumberSharingMode phoneNumberSharingMode
-    ) {}
+    public void setPhoneNumberSharingMode(
+            final Connection connection,
+            final PhoneNumberSharingMode value
+    ) throws SQLException {
+        if (keyValueStore.storeEntry(connection, phoneNumberSharingMode, value)) {
+            recipientStore.rotateSelfStorageId(connection);
+        }
+    }
 
-    public interface Saver {
+    public String getUsernameLinkColor() {
+        return keyValueStore.getEntry(usernameLinkColor);
+    }
 
-        void save(Storage storage);
+    public String getUsernameLinkColor(final Connection connection) throws SQLException {
+        return keyValueStore.getEntry(connection, usernameLinkColor);
+    }
+
+    public void setUsernameLinkColor(final String color) {
+        if (keyValueStore.storeEntry(usernameLinkColor, color)) {
+            recipientStore.rotateSelfStorageId();
+        }
+    }
+
+    public void setUsernameLinkColor(final Connection connection, final String color) throws SQLException {
+        if (keyValueStore.storeEntry(connection, usernameLinkColor, color)) {
+            recipientStore.rotateSelfStorageId(connection);
+        }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/configuration/LegacyConfigurationStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/configuration/LegacyConfigurationStore.java
new file mode 100644
index 00000000..7c799fe1
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/configuration/LegacyConfigurationStore.java
@@ -0,0 +1,33 @@
+package org.asamk.signal.manager.storage.configuration;
+
+import org.asamk.signal.manager.api.PhoneNumberSharingMode;
+
+public class LegacyConfigurationStore {
+
+    public static void migrate(Storage storage, ConfigurationStore configurationStore) {
+        if (storage.readReceipts != null) {
+            configurationStore.setReadReceipts(storage.readReceipts);
+        }
+        if (storage.unidentifiedDeliveryIndicators != null) {
+            configurationStore.setUnidentifiedDeliveryIndicators(storage.unidentifiedDeliveryIndicators);
+        }
+        if (storage.typingIndicators != null) {
+            configurationStore.setTypingIndicators(storage.typingIndicators);
+        }
+        if (storage.linkPreviews != null) {
+            configurationStore.setLinkPreviews(storage.linkPreviews);
+        }
+        if (storage.phoneNumberSharingMode != null) {
+            configurationStore.setPhoneNumberSharingMode(storage.phoneNumberSharingMode);
+        }
+    }
+
+    public record Storage(
+            Boolean readReceipts,
+            Boolean unidentifiedDeliveryIndicators,
+            Boolean typingIndicators,
+            Boolean linkPreviews,
+            Boolean phoneNumberUnlisted,
+            PhoneNumberSharingMode phoneNumberSharingMode
+    ) {}
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/contacts/ContactsStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/contacts/ContactsStore.java
index 2435c4e9..05bc4e27 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/contacts/ContactsStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/contacts/ContactsStore.java
@@ -1,7 +1,7 @@
 package org.asamk.signal.manager.storage.contacts;
 
+import org.asamk.signal.manager.api.Contact;
 import org.asamk.signal.manager.api.Pair;
-import org.asamk.signal.manager.storage.recipients.Contact;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 
 import java.util.List;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/contacts/LegacyContactInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/contacts/LegacyContactInfo.java
index 6c6bd7ea..50dcd91e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/contacts/LegacyContactInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/contacts/LegacyContactInfo.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 
 import java.util.UUID;
 
@@ -43,6 +44,6 @@ public class LegacyContactInfo {
 
     @JsonIgnore
     public RecipientAddress getAddress() {
-        return new RecipientAddress(uuid, number);
+        return new RecipientAddress(uuid == null ? null : ACI.from(uuid), number);
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java
index 3816dcc6..7de3a8f9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java
@@ -1,8 +1,8 @@
 package org.asamk.signal.manager.storage.groups;
 
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupPermission;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupPermission;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.whispersystems.signalservice.api.push.DistributionId;
 
@@ -46,6 +46,10 @@ public sealed abstract class GroupInfo permits GroupInfoV1, GroupInfoV2 {
 
     public abstract void setBlocked(boolean blocked);
 
+    public abstract boolean isProfileSharingEnabled();
+
+    public abstract void setProfileSharingEnabled(boolean profileSharingEnabled);
+
     public abstract int getMessageExpirationTimer();
 
     public abstract boolean isAnnouncementGroup();
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java
index 8b103976..f377ff2d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java
@@ -1,9 +1,9 @@
 package org.asamk.signal.manager.storage.groups;
 
-import org.asamk.signal.manager.groups.GroupIdV1;
-import org.asamk.signal.manager.groups.GroupIdV2;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupPermission;
+import org.asamk.signal.manager.api.GroupIdV1;
+import org.asamk.signal.manager.api.GroupIdV2;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupPermission;
 import org.asamk.signal.manager.groups.GroupUtils;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.whispersystems.signalservice.api.push.DistributionId;
@@ -25,6 +25,7 @@ public final class GroupInfoV1 extends GroupInfo {
     public int messageExpirationTime;
     public boolean blocked;
     public boolean archived;
+    private byte[] storageRecord;
 
     public GroupInfoV1(GroupIdV1 groupId) {
         this.groupId = groupId;
@@ -38,16 +39,18 @@ public final class GroupInfoV1 extends GroupInfo {
             final String color,
             final int messageExpirationTime,
             final boolean blocked,
-            final boolean archived
+            final boolean archived,
+            final byte[] storageRecord
     ) {
         this.groupId = groupId;
         this.expectedV2Id = expectedV2Id;
         this.name = name;
-        this.members = members;
+        this.members = new HashSet<>(members);
         this.color = color;
         this.messageExpirationTime = messageExpirationTime;
         this.blocked = blocked;
         this.archived = archived;
+        this.storageRecord = storageRecord;
     }
 
     @Override
@@ -78,7 +81,7 @@ public final class GroupInfoV1 extends GroupInfo {
     }
 
     public Set<RecipientId> getMembers() {
-        return members;
+        return new HashSet<>(members);
     }
 
     @Override
@@ -91,6 +94,15 @@ public final class GroupInfoV1 extends GroupInfo {
         this.blocked = blocked;
     }
 
+    @Override
+    public boolean isProfileSharingEnabled() {
+        return true;
+    }
+
+    @Override
+    public void setProfileSharingEnabled(final boolean profileSharingEnabled) {
+    }
+
     @Override
     public int getMessageExpirationTimer() {
         return messageExpirationTime;
@@ -123,4 +135,8 @@ public final class GroupInfoV1 extends GroupInfo {
     public void removeMember(RecipientId recipientId) {
         this.members.removeIf(member -> member.equals(recipientId));
     }
+
+    public byte[] getStorageRecord() {
+        return storageRecord;
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
index dc803f0f..f15b94a8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
@@ -1,8 +1,9 @@
 package org.asamk.signal.manager.storage.groups;
 
-import org.asamk.signal.manager.groups.GroupIdV2;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupPermission;
+import org.asamk.signal.manager.api.GroupIdV2;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupPermission;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
@@ -20,31 +21,46 @@ public final class GroupInfoV2 extends GroupInfo {
 
     private final GroupIdV2 groupId;
     private final GroupMasterKey masterKey;
-    private DistributionId distributionId;
+    private final DistributionId distributionId;
     private boolean blocked;
-    private DecryptedGroup group; // stored as a file with base64 groupId as name
+    private boolean profileSharingEnabled;
+    private DecryptedGroup group;
+    private byte[] storageRecord;
     private boolean permissionDenied;
 
-    private RecipientResolver recipientResolver;
+    private final RecipientResolver recipientResolver;
 
-    public GroupInfoV2(final GroupIdV2 groupId, final GroupMasterKey masterKey) {
+    public GroupInfoV2(
+            final GroupIdV2 groupId,
+            final GroupMasterKey masterKey,
+            final RecipientResolver recipientResolver
+    ) {
         this.groupId = groupId;
         this.masterKey = masterKey;
         this.distributionId = DistributionId.create();
+        this.recipientResolver = recipientResolver;
     }
 
     public GroupInfoV2(
             final GroupIdV2 groupId,
             final GroupMasterKey masterKey,
+            final DecryptedGroup group,
             final DistributionId distributionId,
             final boolean blocked,
-            final boolean permissionDenied
+            final boolean profileSharingEnabled,
+            final boolean permissionDenied,
+            final byte[] storageRecord,
+            final RecipientResolver recipientResolver
     ) {
         this.groupId = groupId;
         this.masterKey = masterKey;
+        this.group = group;
         this.distributionId = distributionId;
         this.blocked = blocked;
+        this.profileSharingEnabled = profileSharingEnabled;
         this.permissionDenied = permissionDenied;
+        this.storageRecord = storageRecord;
+        this.recipientResolver = recipientResolver;
     }
 
     @Override
@@ -56,20 +72,19 @@ public final class GroupInfoV2 extends GroupInfo {
         return masterKey;
     }
 
+    public byte[] getStorageRecord() {
+        return storageRecord;
+    }
+
     public DistributionId getDistributionId() {
         return distributionId;
     }
 
-    public void setDistributionId(final DistributionId distributionId) {
-        this.distributionId = distributionId;
-    }
-
-    public void setGroup(final DecryptedGroup group, final RecipientResolver recipientResolver) {
+    public void setGroup(final DecryptedGroup group) {
         if (group != null) {
             this.permissionDenied = false;
         }
         this.group = group;
-        this.recipientResolver = recipientResolver;
     }
 
     public DecryptedGroup getGroup() {
@@ -81,7 +96,7 @@ public final class GroupInfoV2 extends GroupInfo {
         if (this.group == null) {
             return null;
         }
-        return this.group.getTitle();
+        return this.group.title;
     }
 
     @Override
@@ -89,15 +104,15 @@ public final class GroupInfoV2 extends GroupInfo {
         if (this.group == null) {
             return null;
         }
-        return this.group.getDescription();
+        return this.group.description;
     }
 
     @Override
     public GroupInviteLinkUrl getGroupInviteLink() {
-        if (this.group == null || this.group.getInviteLinkPassword().isEmpty() || (
-                this.group.getAccessControl().getAddFromInviteLink() != AccessControl.AccessRequired.ANY
-                        && this.group.getAccessControl().getAddFromInviteLink()
-                        != AccessControl.AccessRequired.ADMINISTRATOR
+        if (this.group == null || this.group.inviteLinkPassword.toByteArray().length == 0 || (
+                this.group.accessControl != null
+                        && this.group.accessControl.addFromInviteLink != AccessControl.AccessRequired.ANY
+                        && this.group.accessControl.addFromInviteLink != AccessControl.AccessRequired.ADMINISTRATOR
         )) {
             return null;
         }
@@ -110,9 +125,8 @@ public final class GroupInfoV2 extends GroupInfo {
         if (this.group == null) {
             return Set.of();
         }
-        return group.getMembersList()
-                .stream()
-                .map(m -> ServiceId.fromByteString(m.getUuid()))
+        return group.members.stream()
+                .map(m -> ServiceId.parseOrThrow(m.aciBytes))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
     }
@@ -122,9 +136,8 @@ public final class GroupInfoV2 extends GroupInfo {
         if (this.group == null) {
             return Set.of();
         }
-        return group.getBannedMembersList()
-                .stream()
-                .map(m -> ServiceId.fromByteString(m.getUuid()))
+        return group.bannedMembers.stream()
+                .map(m -> ServiceId.parseOrThrow(m.serviceIdBytes))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
     }
@@ -134,9 +147,8 @@ public final class GroupInfoV2 extends GroupInfo {
         if (this.group == null) {
             return Set.of();
         }
-        return group.getPendingMembersList()
-                .stream()
-                .map(m -> ServiceId.fromByteString(m.getUuid()))
+        return group.pendingMembers.stream()
+                .map(m -> ServiceId.parseOrThrow(m.serviceIdBytes))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
     }
@@ -146,9 +158,8 @@ public final class GroupInfoV2 extends GroupInfo {
         if (this.group == null) {
             return Set.of();
         }
-        return group.getRequestingMembersList()
-                .stream()
-                .map(m -> ServiceId.fromByteString(m.getUuid()))
+        return group.requestingMembers.stream()
+                .map(m -> ServiceId.parseOrThrow(m.aciBytes))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
     }
@@ -158,10 +169,11 @@ public final class GroupInfoV2 extends GroupInfo {
         if (this.group == null) {
             return Set.of();
         }
-        return group.getMembersList()
-                .stream()
-                .filter(m -> m.getRole() == Member.Role.ADMINISTRATOR)
-                .map(m -> ServiceId.fromByteString(m.getUuid()))
+        return group.members.stream()
+                .filter(m -> m.role == Member.Role.ADMINISTRATOR)
+                .map(m -> new RecipientAddress(ServiceId.ACI.parseOrNull(m.aciBytes),
+                        ServiceId.PNI.parseOrNull(m.pniBytes),
+                        null))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
     }
@@ -176,28 +188,38 @@ public final class GroupInfoV2 extends GroupInfo {
         this.blocked = blocked;
     }
 
+    @Override
+    public boolean isProfileSharingEnabled() {
+        return profileSharingEnabled;
+    }
+
+    @Override
+    public void setProfileSharingEnabled(final boolean profileSharingEnabled) {
+        this.profileSharingEnabled = profileSharingEnabled;
+    }
+
     @Override
     public int getMessageExpirationTimer() {
-        return this.group != null && this.group.hasDisappearingMessagesTimer()
-                ? this.group.getDisappearingMessagesTimer().getDuration()
+        return this.group != null && this.group.disappearingMessagesTimer != null
+                ? this.group.disappearingMessagesTimer.duration
                 : 0;
     }
 
     @Override
     public boolean isAnnouncementGroup() {
-        return this.group != null && this.group.getIsAnnouncementGroup() == EnabledState.ENABLED;
+        return this.group != null && this.group.isAnnouncementGroup == EnabledState.ENABLED;
     }
 
     @Override
     public GroupPermission getPermissionAddMember() {
         final var accessControl = getAccessControl();
-        return accessControl == null ? GroupPermission.EVERY_MEMBER : toGroupPermission(accessControl.getMembers());
+        return accessControl == null ? GroupPermission.EVERY_MEMBER : toGroupPermission(accessControl.members);
     }
 
     @Override
     public GroupPermission getPermissionEditDetails() {
         final var accessControl = getAccessControl();
-        return accessControl == null ? GroupPermission.EVERY_MEMBER : toGroupPermission(accessControl.getAttributes());
+        return accessControl == null ? GroupPermission.EVERY_MEMBER : toGroupPermission(accessControl.attributes);
     }
 
     @Override
@@ -214,11 +236,11 @@ public final class GroupInfoV2 extends GroupInfo {
     }
 
     private AccessControl getAccessControl() {
-        if (this.group == null || !this.group.hasAccessControl()) {
+        if (this.group == null || this.group.accessControl == null) {
             return null;
         }
 
-        return this.group.getAccessControl();
+        return this.group.accessControl;
     }
 
     private static GroupPermission toGroupPermission(final AccessControl.AccessRequired permission) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
index a9affdd6..26c4c08d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
@@ -1,384 +1,777 @@
 package org.asamk.signal.manager.storage.groups;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupIdV1;
-import org.asamk.signal.manager.groups.GroupIdV2;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupIdV1;
+import org.asamk.signal.manager.api.GroupIdV2;
 import org.asamk.signal.manager.groups.GroupUtils;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.asamk.signal.manager.storage.Database;
+import org.asamk.signal.manager.storage.Utils;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
+import org.asamk.signal.manager.storage.recipients.RecipientIdCreator;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
-import org.asamk.signal.manager.util.IOUtils;
+import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
+import org.signal.libsignal.zkgroup.groups.GroupSecretParams;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.push.DistributionId;
+import org.whispersystems.signalservice.api.storage.StorageId;
 import org.whispersystems.signalservice.api.util.UuidUtil;
-import org.whispersystems.signalservice.internal.util.Hex;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.nio.file.Files;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
 import java.util.ArrayList;
-import java.util.Base64;
-import java.util.HashMap;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class GroupStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(GroupStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(GroupStore.class);
+    private static final String TABLE_GROUP_V2 = "group_v2";
+    private static final String TABLE_GROUP_V1 = "group_v1";
+    private static final String TABLE_GROUP_V1_MEMBER = "group_v1_member";
 
-    private final File groupCachePath;
-    private final Map<GroupId, GroupInfo> groups;
+    private final Database database;
     private final RecipientResolver recipientResolver;
-    private final Saver saver;
+    private final RecipientIdCreator recipientIdCreator;
 
-    private GroupStore(
-            final File groupCachePath,
-            final Map<GroupId, GroupInfo> groups,
-            final RecipientResolver recipientResolver,
-            final Saver saver
-    ) {
-        this.groupCachePath = groupCachePath;
-        this.groups = groups;
-        this.recipientResolver = recipientResolver;
-        this.saver = saver;
+    public static void createSql(Connection connection) throws SQLException {
+        // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
+        try (final var statement = connection.createStatement()) {
+            statement.executeUpdate("""
+                                    CREATE TABLE group_v2 (
+                                      _id INTEGER PRIMARY KEY,
+                                      storage_id BLOB UNIQUE,
+                                      storage_record BLOB,
+                                      group_id BLOB UNIQUE NOT NULL,
+                                      master_key BLOB NOT NULL,
+                                      group_data BLOB,
+                                      distribution_id BLOB UNIQUE NOT NULL,
+                                      blocked INTEGER NOT NULL DEFAULT FALSE,
+                                      profile_sharing INTEGER NOT NULL DEFAULT FALSE,
+                                      permission_denied INTEGER NOT NULL DEFAULT FALSE
+                                    ) STRICT;
+                                    CREATE TABLE group_v1 (
+                                      _id INTEGER PRIMARY KEY,
+                                      storage_id BLOB UNIQUE,
+                                      storage_record BLOB,
+                                      group_id BLOB UNIQUE NOT NULL,
+                                      group_id_v2 BLOB UNIQUE,
+                                      name TEXT,
+                                      color TEXT,
+                                      expiration_time INTEGER NOT NULL DEFAULT 0,
+                                      blocked INTEGER NOT NULL DEFAULT FALSE,
+                                      archived INTEGER NOT NULL DEFAULT FALSE
+                                    ) STRICT;
+                                    CREATE TABLE group_v1_member (
+                                      _id INTEGER PRIMARY KEY,
+                                      group_id INTEGER NOT NULL REFERENCES group_v1 (_id) ON DELETE CASCADE,
+                                      recipient_id INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,
+                                      UNIQUE(group_id, recipient_id)
+                                    ) STRICT;
+                                    """);
+        }
     }
 
     public GroupStore(
-            final File groupCachePath, final RecipientResolver recipientResolver, final Saver saver
-    ) {
-        this.groups = new HashMap<>();
-        this.groupCachePath = groupCachePath;
-        this.recipientResolver = recipientResolver;
-        this.saver = saver;
-    }
-
-    public static GroupStore fromStorage(
-            final Storage storage,
-            final File groupCachePath,
+            final Database database,
             final RecipientResolver recipientResolver,
-            final Saver saver
+            final RecipientIdCreator recipientIdCreator
     ) {
-        final var groups = storage.groups.stream().map(g -> {
-            if (g instanceof Storage.GroupV1 g1) {
-                final var members = g1.members.stream().map(m -> {
-                    if (m.recipientId == null) {
-                        return recipientResolver.resolveRecipient(new RecipientAddress(UuidUtil.parseOrNull(m.uuid),
-                                m.number));
-                    }
-
-                    return recipientResolver.resolveRecipient(m.recipientId);
-                }).filter(Objects::nonNull).collect(Collectors.toSet());
-
-                return new GroupInfoV1(GroupIdV1.fromBase64(g1.groupId),
-                        g1.expectedV2Id == null ? null : GroupIdV2.fromBase64(g1.expectedV2Id),
-                        g1.name,
-                        members,
-                        g1.color,
-                        g1.messageExpirationTime,
-                        g1.blocked,
-                        g1.archived);
-            }
-
-            final var g2 = (Storage.GroupV2) g;
-            var groupId = GroupIdV2.fromBase64(g2.groupId);
-            GroupMasterKey masterKey;
-            try {
-                masterKey = new GroupMasterKey(Base64.getDecoder().decode(g2.masterKey));
-            } catch (InvalidInputException | IllegalArgumentException e) {
-                throw new AssertionError("Invalid master key for group " + groupId.toBase64());
-            }
-
-            return new GroupInfoV2(groupId,
-                    masterKey,
-                    g2.distributionId == null ? null : DistributionId.from(g2.distributionId),
-                    g2.blocked,
-                    g2.permissionDenied);
-        }).collect(Collectors.toMap(GroupInfo::getGroupId, g -> g));
-
-        return new GroupStore(groupCachePath, groups, recipientResolver, saver);
+        this.database = database;
+        this.recipientResolver = recipientResolver;
+        this.recipientIdCreator = recipientIdCreator;
     }
 
     public void updateGroup(GroupInfo group) {
-        final Storage storage;
-        synchronized (groups) {
-            groups.put(group.getGroupId(), group);
-            if (group instanceof GroupInfoV2 && ((GroupInfoV2) group).getGroup() != null) {
-                try {
-                    IOUtils.createPrivateDirectories(groupCachePath);
-                    try (var stream = new FileOutputStream(getGroupV2File(group.getGroupId()))) {
-                        ((GroupInfoV2) group).getGroup().writeTo(stream);
-                    }
-                    final var groupFileLegacy = getGroupV2FileLegacy(group.getGroupId());
-                    if (groupFileLegacy.exists()) {
-                        try {
-                            Files.delete(groupFileLegacy.toPath());
-                        } catch (IOException e) {
-                            logger.error("Failed to delete legacy group file {}: {}", groupFileLegacy, e.getMessage());
-                        }
-                    }
-                } catch (IOException e) {
-                    logger.warn("Failed to cache group, ignoring: {}", e.getMessage());
-                }
-            }
-            storage = toStorageLocked();
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            updateGroup(connection, group);
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
         }
-        saver.save(storage);
     }
 
-    public void deleteGroupV1(GroupIdV1 groupIdV1) {
-        deleteGroup(groupIdV1);
+    public void updateGroup(final Connection connection, final GroupInfo group) throws SQLException {
+        final Long internalId;
+        final var sql = (
+                """
+                SELECT g._id
+                FROM %s g
+                WHERE g.group_id = ?
+                """
+        ).formatted(group instanceof GroupInfoV1 ? TABLE_GROUP_V1 : TABLE_GROUP_V2);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, group.getGroupId().serialize());
+            internalId = Utils.executeQueryForOptional(statement, res -> res.getLong("_id")).orElse(null);
+        }
+        insertOrReplaceGroup(connection, internalId, group);
+    }
+
+    public void storeStorageRecord(
+            final Connection connection,
+            final GroupId groupId,
+            final StorageId storageId,
+            final byte[] storageRecord
+    ) throws SQLException {
+        final var groupTable = groupId instanceof GroupIdV1 ? TABLE_GROUP_V1 : TABLE_GROUP_V2;
+        final var deleteSql = (
+                """
+                UPDATE %s
+                SET storage_id = NULL
+                WHERE storage_id = ?
+                """
+        ).formatted(groupTable);
+        try (final var statement = connection.prepareStatement(deleteSql)) {
+            statement.setBytes(1, storageId.getRaw());
+            statement.executeUpdate();
+        }
+        final var sql = (
+                """
+                UPDATE %s
+                SET storage_id = ?, storage_record = ?
+                WHERE group_id = ?
+                """
+        ).formatted(groupTable);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, storageId.getRaw());
+            if (storageRecord == null) {
+                statement.setNull(2, Types.BLOB);
+            } else {
+                statement.setBytes(2, storageRecord);
+            }
+            statement.setBytes(3, groupId.serialize());
+            statement.executeUpdate();
+        }
     }
 
     public void deleteGroup(GroupId groupId) {
-        final Storage storage;
-        synchronized (groups) {
-            groups.remove(groupId);
-            storage = toStorageLocked();
+        if (groupId instanceof GroupIdV1 groupIdV1) {
+            deleteGroup(groupIdV1);
+        } else if (groupId instanceof GroupIdV2 groupIdV2) {
+            deleteGroup(groupIdV2);
+        }
+    }
+
+    public void deleteGroup(GroupIdV1 groupIdV1) {
+        try (final var connection = database.getConnection()) {
+            deleteGroup(connection, groupIdV1);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update group store", e);
+        }
+    }
+
+    private void deleteGroup(final Connection connection, final GroupIdV1 groupIdV1) throws SQLException {
+        final var sql = (
+                """
+                DELETE FROM %s
+                WHERE group_id = ?
+                """
+        ).formatted(TABLE_GROUP_V1);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, groupIdV1.serialize());
+            statement.executeUpdate();
+        }
+    }
+
+    public void deleteGroup(GroupIdV2 groupIdV2) {
+        try (final var connection = database.getConnection()) {
+            final var sql = (
+                    """
+                    DELETE FROM %s
+                    WHERE group_id = ?
+                    """
+            ).formatted(TABLE_GROUP_V2);
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setBytes(1, groupIdV2.serialize());
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update group store", e);
         }
-        saver.save(storage);
     }
 
     public GroupInfo getGroup(GroupId groupId) {
-        synchronized (groups) {
-            return getGroupLocked(groupId);
+        try (final var connection = database.getConnection()) {
+            return getGroup(connection, groupId);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from group store", e);
+        }
+    }
+
+    public GroupInfo getGroup(final Connection connection, final GroupId groupId) throws SQLException {
+        switch (groupId) {
+            case GroupIdV1 groupIdV1 -> {
+                final var group = getGroup(connection, groupIdV1);
+                if (group != null) {
+                    return group;
+                }
+                return getGroupV2ByV1Id(connection, groupIdV1);
+            }
+            case GroupIdV2 groupIdV2 -> {
+                final var group = getGroup(connection, groupIdV2);
+                if (group != null) {
+                    return group;
+                }
+                return getGroupV1ByV2Id(connection, groupIdV2);
+            }
         }
     }
 
     public GroupInfoV1 getOrCreateGroupV1(GroupIdV1 groupId) {
-        synchronized (groups) {
-            var group = getGroupLocked(groupId);
-            if (group instanceof GroupInfoV1) {
-                return (GroupInfoV1) group;
-            }
+        try (final var connection = database.getConnection()) {
+            return getOrCreateGroupV1(connection, groupId);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from group store", e);
+        }
+    }
 
-            if (group == null) {
-                return new GroupInfoV1(groupId);
-            }
+    public GroupInfoV1 getOrCreateGroupV1(final Connection connection, final GroupIdV1 groupId) throws SQLException {
+        var group = getGroup(connection, groupId);
 
-            return null;
+        if (group != null) {
+            return group;
+        }
+
+        if (getGroupV2ByV1Id(connection, groupId) == null) {
+            return new GroupInfoV1(groupId);
+        }
+
+        return null;
+    }
+
+    public GroupInfoV2 getGroupOrPartialMigrate(
+            Connection connection,
+            final GroupMasterKey groupMasterKey
+    ) throws SQLException {
+        final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
+        final var groupId = GroupUtils.getGroupIdV2(groupSecretParams);
+
+        return getGroupOrPartialMigrate(connection, groupMasterKey, groupId);
+    }
+
+    public GroupInfoV2 getGroupOrPartialMigrate(final GroupMasterKey groupMasterKey, final GroupIdV2 groupId) {
+        try (final var connection = database.getConnection()) {
+            return getGroupOrPartialMigrate(connection, groupMasterKey, groupId);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from group store", e);
+        }
+    }
+
+    private GroupInfoV2 getGroupOrPartialMigrate(
+            Connection connection,
+            final GroupMasterKey groupMasterKey,
+            final GroupIdV2 groupId
+    ) throws SQLException {
+        switch (getGroup(connection, (GroupId) groupId)) {
+            case GroupInfoV1 groupInfoV1 -> {
+                // Received a v2 group message for a v1 group, we need to locally migrate the group
+                deleteGroup(connection, groupInfoV1.getGroupId());
+                final var groupInfoV2 = new GroupInfoV2(groupId, groupMasterKey, recipientResolver);
+                groupInfoV2.setBlocked(groupInfoV1.isBlocked());
+                updateGroup(connection, groupInfoV2);
+                logger.debug("Locally migrated group {} to group v2, id: {}",
+                        groupInfoV1.getGroupId().toBase64(),
+                        groupInfoV2.getGroupId().toBase64());
+                return groupInfoV2;
+            }
+            case GroupInfoV2 groupInfoV2 -> {
+                return groupInfoV2;
+            }
+            case null -> {
+                return new GroupInfoV2(groupId, groupMasterKey, recipientResolver);
+            }
         }
     }
 
     public List<GroupInfo> getGroups() {
-        synchronized (groups) {
-            final var groups = this.groups.values();
-            for (var group : groups) {
-                loadDecryptedGroupLocked(group);
-            }
-            return new ArrayList<>(groups);
+        return Stream.concat(getGroupsV2().stream(), getGroupsV1().stream()).toList();
+    }
+
+    public List<GroupIdV1> getGroupV1Ids(Connection connection) throws SQLException {
+        final var sql = (
+                """
+                SELECT g.group_id
+                FROM %s g
+                """
+        ).formatted(TABLE_GROUP_V1);
+        try (final var statement = connection.prepareStatement(sql)) {
+            return Utils.executeQueryForStream(statement, this::getGroupIdV1FromResultSet)
+                    .filter(Objects::nonNull)
+                    .toList();
         }
     }
 
-    public void mergeRecipients(final RecipientId recipientId, final RecipientId toBeMergedRecipientId) {
-        Storage storage = null;
-        synchronized (groups) {
-            var modified = false;
-            for (var group : this.groups.values()) {
-                if (group instanceof GroupInfoV1 groupV1) {
-                    if (groupV1.isMember(toBeMergedRecipientId)) {
-                        groupV1.removeMember(toBeMergedRecipientId);
-                        groupV1.addMembers(List.of(recipientId));
-                        modified = true;
+    public List<GroupIdV2> getGroupV2Ids(Connection connection) throws SQLException {
+        final var sql = (
+                """
+                SELECT g.group_id
+                FROM %s g
+                """
+        ).formatted(TABLE_GROUP_V2);
+        try (final var statement = connection.prepareStatement(sql)) {
+            return Utils.executeQueryForStream(statement, this::getGroupIdV2FromResultSet)
+                    .filter(Objects::nonNull)
+                    .toList();
+        }
+    }
+
+    public void mergeRecipients(
+            final Connection connection,
+            final RecipientId recipientId,
+            final RecipientId toBeMergedRecipientId
+    ) throws SQLException {
+        final var sql = (
+                """
+                UPDATE OR REPLACE %s
+                SET recipient_id = ?
+                WHERE recipient_id = ?
+                """
+        ).formatted(TABLE_GROUP_V1_MEMBER);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, recipientId.id());
+            statement.setLong(2, toBeMergedRecipientId.id());
+            final var updatedRows = statement.executeUpdate();
+            if (updatedRows > 0) {
+                logger.debug("Updated {} group members when merging recipients", updatedRows);
+            }
+        }
+    }
+
+    public List<StorageId> getStorageIds(Connection connection) throws SQLException {
+        final var storageIds = new ArrayList<StorageId>();
+        final var sql = """
+                        SELECT g.storage_id
+                        FROM %s g WHERE g.storage_id IS NOT NULL
+                        """;
+        try (final var statement = connection.prepareStatement(sql.formatted(TABLE_GROUP_V1))) {
+            Utils.executeQueryForStream(statement, this::getGroupV1StorageIdFromResultSet).forEach(storageIds::add);
+        }
+        try (final var statement = connection.prepareStatement(sql.formatted(TABLE_GROUP_V2))) {
+            Utils.executeQueryForStream(statement, this::getGroupV2StorageIdFromResultSet).forEach(storageIds::add);
+        }
+        return storageIds;
+    }
+
+    public void updateStorageIds(
+            Connection connection,
+            Map<GroupIdV1, StorageId> storageIdV1Map,
+            Map<GroupIdV2, StorageId> storageIdV2Map
+    ) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET storage_id = ?
+                WHERE group_id = ?
+                """
+        );
+        try (final var statement = connection.prepareStatement(sql.formatted(TABLE_GROUP_V1))) {
+            for (final var entry : storageIdV1Map.entrySet()) {
+                statement.setBytes(1, entry.getValue().getRaw());
+                statement.setBytes(2, entry.getKey().serialize());
+                statement.executeUpdate();
+            }
+        }
+        try (final var statement = connection.prepareStatement(sql.formatted(TABLE_GROUP_V2))) {
+            for (final var entry : storageIdV2Map.entrySet()) {
+                statement.setBytes(1, entry.getValue().getRaw());
+                statement.setBytes(2, entry.getKey().serialize());
+                statement.executeUpdate();
+            }
+        }
+    }
+
+    public void updateStorageId(Connection connection, GroupId groupId, StorageId storageId) throws SQLException {
+        final var sqlV1 = (
+                """
+                UPDATE %s
+                SET storage_id = ?
+                WHERE group_id = ?
+                """
+        ).formatted(groupId instanceof GroupIdV1 ? TABLE_GROUP_V1 : TABLE_GROUP_V2);
+        try (final var statement = connection.prepareStatement(sqlV1)) {
+            statement.setBytes(1, storageId.getRaw());
+            statement.setBytes(2, groupId.serialize());
+            statement.executeUpdate();
+        }
+    }
+
+    public void setMissingStorageIds() {
+        final var selectSql = (
+                """
+                SELECT g.group_id
+                FROM %s g
+                WHERE g.storage_id IS NULL
+                """
+        );
+        final var updateSql = (
+                """
+                UPDATE %s
+                SET storage_id = ?
+                WHERE group_id = ?
+                """
+        );
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            try (final var selectStmt = connection.prepareStatement(selectSql.formatted(TABLE_GROUP_V1))) {
+                final var groupIds = Utils.executeQueryForStream(selectStmt, this::getGroupIdV1FromResultSet).toList();
+                try (final var updateStmt = connection.prepareStatement(updateSql.formatted(TABLE_GROUP_V1))) {
+                    for (final var groupId : groupIds) {
+                        updateStmt.setBytes(1, KeyUtils.createRawStorageId());
+                        updateStmt.setBytes(2, groupId.serialize());
                     }
                 }
             }
-            if (modified) {
-                storage = toStorageLocked();
-            }
-        }
-        if (storage != null) {
-            saver.save(storage);
-        }
-    }
-
-    private GroupInfo getGroupLocked(final GroupId groupId) {
-        var group = groups.get(groupId);
-        if (group == null) {
-            if (groupId instanceof GroupIdV1) {
-                group = getGroupByV1IdLocked((GroupIdV1) groupId);
-            } else if (groupId instanceof GroupIdV2) {
-                group = getGroupV1ByV2IdLocked((GroupIdV2) groupId);
-            }
-        }
-        loadDecryptedGroupLocked(group);
-        return group;
-    }
-
-    private GroupInfo getGroupByV1IdLocked(final GroupIdV1 groupId) {
-        return groups.get(GroupUtils.getGroupIdV2(groupId));
-    }
-
-    private GroupInfoV1 getGroupV1ByV2IdLocked(GroupIdV2 groupIdV2) {
-        for (var g : groups.values()) {
-            if (g instanceof GroupInfoV1 gv1) {
-                if (groupIdV2.equals(gv1.getExpectedV2Id())) {
-                    return gv1;
-                }
-            }
-        }
-        return null;
-    }
-
-    private void loadDecryptedGroupLocked(final GroupInfo group) {
-        if (group instanceof GroupInfoV2 && ((GroupInfoV2) group).getGroup() == null) {
-            var groupFile = getGroupV2File(group.getGroupId());
-            if (!groupFile.exists()) {
-                groupFile = getGroupV2FileLegacy(group.getGroupId());
-            }
-            if (!groupFile.exists()) {
-                return;
-            }
-            try (var stream = new FileInputStream(groupFile)) {
-                ((GroupInfoV2) group).setGroup(DecryptedGroup.parseFrom(stream), recipientResolver);
-            } catch (IOException ignored) {
-            }
-        }
-    }
-
-    private File getGroupV2FileLegacy(final GroupId groupId) {
-        return new File(groupCachePath, Hex.toStringCondensed(groupId.serialize()));
-    }
-
-    private File getGroupV2File(final GroupId groupId) {
-        return new File(groupCachePath, groupId.toBase64().replace("/", "_"));
-    }
-
-    private Storage toStorageLocked() {
-        return new Storage(groups.values().stream().map(g -> {
-            if (g instanceof GroupInfoV1 g1) {
-                return new Storage.GroupV1(g1.getGroupId().toBase64(),
-                        g1.getExpectedV2Id().toBase64(),
-                        g1.name,
-                        g1.color,
-                        g1.messageExpirationTime,
-                        g1.blocked,
-                        g1.archived,
-                        g1.members.stream().map(m -> new Storage.GroupV1.Member(m.id(), null, null)).toList());
-            }
-
-            final var g2 = (GroupInfoV2) g;
-            return new Storage.GroupV2(g2.getGroupId().toBase64(),
-                    Base64.getEncoder().encodeToString(g2.getMasterKey().serialize()),
-                    g2.getDistributionId() == null ? null : g2.getDistributionId().toString(),
-                    g2.isBlocked(),
-                    g2.isPermissionDenied());
-        }).toList());
-    }
-
-    public record Storage(@JsonDeserialize(using = GroupsDeserializer.class) List<Record> groups) {
-
-        private record GroupV1(
-                String groupId,
-                String expectedV2Id,
-                String name,
-                String color,
-                int messageExpirationTime,
-                boolean blocked,
-                boolean archived,
-                @JsonDeserialize(using = MembersDeserializer.class) @JsonSerialize(using = MembersSerializer.class) List<Member> members
-        ) {
-
-            private record Member(Long recipientId, String uuid, String number) {}
-
-            private record JsonRecipientAddress(String uuid, String number) {}
-
-            private static class MembersSerializer extends JsonSerializer<List<Member>> {
-
-                @Override
-                public void serialize(
-                        final List<Member> value, final JsonGenerator jgen, final SerializerProvider provider
-                ) throws IOException {
-                    jgen.writeStartArray(null, value.size());
-                    for (var address : value) {
-                        if (address.recipientId != null) {
-                            jgen.writeNumber(address.recipientId);
-                        } else if (address.uuid != null) {
-                            jgen.writeObject(new JsonRecipientAddress(address.uuid, address.number));
-                        } else {
-                            jgen.writeString(address.number);
-                        }
+            try (final var selectStmt = connection.prepareStatement(selectSql.formatted(TABLE_GROUP_V2))) {
+                final var groupIds = Utils.executeQueryForStream(selectStmt, this::getGroupIdV2FromResultSet).toList();
+                try (final var updateStmt = connection.prepareStatement(updateSql.formatted(TABLE_GROUP_V2))) {
+                    for (final var groupId : groupIds) {
+                        updateStmt.setBytes(1, KeyUtils.createRawStorageId());
+                        updateStmt.setBytes(2, groupId.serialize());
+                        updateStmt.executeUpdate();
                     }
-                    jgen.writeEndArray();
-                }
-            }
-
-            private static class MembersDeserializer extends JsonDeserializer<List<Member>> {
-
-                @Override
-                public List<Member> deserialize(
-                        JsonParser jsonParser, DeserializationContext deserializationContext
-                ) throws IOException {
-                    var addresses = new ArrayList<Member>();
-                    JsonNode node = jsonParser.getCodec().readTree(jsonParser);
-                    for (var n : node) {
-                        if (n.isTextual()) {
-                            addresses.add(new Member(null, null, n.textValue()));
-                        } else if (n.isNumber()) {
-                            addresses.add(new Member(n.numberValue().longValue(), null, null));
-                        } else {
-                            var address = jsonParser.getCodec().treeToValue(n, JsonRecipientAddress.class);
-                            addresses.add(new Member(null, address.uuid, address.number));
-                        }
-                    }
-
-                    return addresses;
                 }
             }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update group store", e);
         }
-
-        private record GroupV2(
-                String groupId,
-                String masterKey,
-                String distributionId,
-                @JsonInclude(JsonInclude.Include.NON_DEFAULT) boolean blocked,
-                @JsonInclude(JsonInclude.Include.NON_DEFAULT) boolean permissionDenied
-        ) {}
     }
 
-    private static class GroupsDeserializer extends JsonDeserializer<List<Object>> {
+    void addLegacyGroups(final Collection<GroupInfo> groups) {
+        logger.debug("Migrating legacy groups to database");
+        long start = System.nanoTime();
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            for (final var group : groups) {
+                insertOrReplaceGroup(connection, null, group);
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update group store", e);
+        }
+        logger.debug("Complete groups migration took {}ms", (System.nanoTime() - start) / 1000000);
+    }
 
-        @Override
-        public List<Object> deserialize(
-                JsonParser jsonParser, DeserializationContext deserializationContext
-        ) throws IOException {
-            var groups = new ArrayList<>();
-            JsonNode node = jsonParser.getCodec().readTree(jsonParser);
-            for (var n : node) {
-                Object g;
-                if (n.hasNonNull("masterKey")) {
-                    // a v2 group
-                    g = jsonParser.getCodec().treeToValue(n, Storage.GroupV2.class);
+    private void insertOrReplaceGroup(
+            final Connection connection,
+            Long internalId,
+            final GroupInfo group
+    ) throws SQLException {
+        if (group instanceof GroupInfoV1 groupV1) {
+            if (internalId != null) {
+                final var sqlDeleteMembers = "DELETE FROM %s where group_id = ?".formatted(TABLE_GROUP_V1_MEMBER);
+                try (final var statement = connection.prepareStatement(sqlDeleteMembers)) {
+                    statement.setLong(1, internalId);
+                    statement.executeUpdate();
+                }
+            }
+            final var sql = """
+                            INSERT OR REPLACE INTO %s (_id, group_id, group_id_v2, name, color, expiration_time, blocked, archived, storage_id)
+                            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+                            RETURNING _id
+                            """.formatted(TABLE_GROUP_V1);
+            try (final var statement = connection.prepareStatement(sql)) {
+                if (internalId == null) {
+                    statement.setNull(1, Types.NUMERIC);
                 } else {
-                    g = jsonParser.getCodec().treeToValue(n, Storage.GroupV1.class);
+                    statement.setLong(1, internalId);
                 }
-                groups.add(g);
-            }
+                statement.setBytes(2, groupV1.getGroupId().serialize());
+                statement.setBytes(3, groupV1.getExpectedV2Id().serialize());
+                statement.setString(4, groupV1.getTitle());
+                statement.setString(5, groupV1.color);
+                statement.setLong(6, groupV1.getMessageExpirationTimer());
+                statement.setBoolean(7, groupV1.isBlocked());
+                statement.setBoolean(8, groupV1.archived);
+                statement.setBytes(9, KeyUtils.createRawStorageId());
+                final var generatedKey = Utils.executeQueryForOptional(statement, Utils::getIdMapper);
 
-            return groups;
+                if (internalId == null) {
+                    if (generatedKey.isPresent()) {
+                        internalId = generatedKey.get();
+                    } else {
+                        throw new RuntimeException("Failed to add new group to database");
+                    }
+                }
+            }
+            final var sqlInsertMember = """
+                                        INSERT OR REPLACE INTO %s (group_id, recipient_id)
+                                        VALUES (?, ?)
+                                        """.formatted(TABLE_GROUP_V1_MEMBER);
+            try (final var statement = connection.prepareStatement(sqlInsertMember)) {
+                for (final var recipient : groupV1.getMembers()) {
+                    statement.setLong(1, internalId);
+                    statement.setLong(2, recipient.id());
+                    statement.executeUpdate();
+                }
+            }
+        } else if (group instanceof GroupInfoV2 groupV2) {
+            final var sql = (
+                    """
+                    INSERT OR REPLACE INTO %s (_id, group_id, master_key, group_data, distribution_id, blocked, permission_denied, storage_id, profile_sharing)
+                    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+                    """
+            ).formatted(TABLE_GROUP_V2);
+            try (final var statement = connection.prepareStatement(sql)) {
+                if (internalId == null) {
+                    statement.setNull(1, Types.NUMERIC);
+                } else {
+                    statement.setLong(1, internalId);
+                }
+                statement.setBytes(2, groupV2.getGroupId().serialize());
+                statement.setBytes(3, groupV2.getMasterKey().serialize());
+                if (groupV2.getGroup() == null) {
+                    statement.setNull(4, Types.NUMERIC);
+                } else {
+                    statement.setBytes(4, groupV2.getGroup().encode());
+                }
+                statement.setBytes(5, UuidUtil.toByteArray(groupV2.getDistributionId().asUuid()));
+                statement.setBoolean(6, groupV2.isBlocked());
+                statement.setBoolean(7, groupV2.isPermissionDenied());
+                statement.setBytes(8, KeyUtils.createRawStorageId());
+                statement.setBoolean(9, groupV2.isProfileSharingEnabled());
+                statement.executeUpdate();
+            }
+        } else {
+            throw new AssertionError("Invalid group id type");
         }
     }
 
-    public interface Saver {
+    private List<GroupInfoV2> getGroupsV2() {
+        final var sql = (
+                """
+                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.profile_sharing, g.permission_denied, g.storage_record
+                FROM %s g
+                """
+        ).formatted(TABLE_GROUP_V2);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                return Utils.executeQueryForStream(statement, this::getGroupInfoV2FromResultSet)
+                        .filter(Objects::nonNull)
+                        .toList();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from group store", e);
+        }
+    }
 
-        void save(Storage storage);
+    public GroupInfoV2 getGroup(Connection connection, GroupIdV2 groupIdV2) throws SQLException {
+        final var sql = (
+                """
+                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.profile_sharing, g.permission_denied, g.storage_record
+                FROM %s g
+                WHERE g.group_id = ?
+                """
+        ).formatted(TABLE_GROUP_V2);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, groupIdV2.serialize());
+            return Utils.executeQueryForOptional(statement, this::getGroupInfoV2FromResultSet).orElse(null);
+        }
+    }
+
+    public StorageId getGroupStorageId(Connection connection, GroupIdV2 groupIdV2) throws SQLException {
+        final var sql = (
+                """
+                SELECT g.storage_id
+                FROM %s g
+                WHERE g.group_id = ?
+                """
+        ).formatted(TABLE_GROUP_V2);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, groupIdV2.serialize());
+            final var storageId = Utils.executeQueryForOptional(statement, this::getGroupV2StorageIdFromResultSet);
+            if (storageId.isPresent()) {
+                return storageId.get();
+            }
+        }
+        final var newStorageId = StorageId.forGroupV2(KeyUtils.createRawStorageId());
+        updateStorageId(connection, groupIdV2, newStorageId);
+        return newStorageId;
+    }
+
+    public GroupInfoV2 getGroupV2(Connection connection, StorageId storageId) throws SQLException {
+        final var sql = (
+                """
+                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.profile_sharing, g.permission_denied, g.storage_record
+                FROM %s g
+                WHERE g.storage_id = ?
+                """
+        ).formatted(TABLE_GROUP_V2);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, storageId.getRaw());
+            return Utils.executeQueryForOptional(statement, this::getGroupInfoV2FromResultSet).orElse(null);
+        }
+    }
+
+    private GroupIdV2 getGroupIdV2FromResultSet(ResultSet resultSet) throws SQLException {
+        final var groupId = resultSet.getBytes("group_id");
+        return GroupId.v2(groupId);
+    }
+
+    private GroupInfoV2 getGroupInfoV2FromResultSet(ResultSet resultSet) throws SQLException {
+        try {
+            final var groupId = resultSet.getBytes("group_id");
+            final var masterKey = resultSet.getBytes("master_key");
+            final var groupData = resultSet.getBytes("group_data");
+            final var distributionId = resultSet.getBytes("distribution_id");
+            final var blocked = resultSet.getBoolean("blocked");
+            final var profileSharingEnabled = resultSet.getBoolean("profile_sharing");
+            final var permissionDenied = resultSet.getBoolean("permission_denied");
+            final var storageRecord = resultSet.getBytes("storage_record");
+            return new GroupInfoV2(GroupId.v2(groupId),
+                    new GroupMasterKey(masterKey),
+                    groupData == null ? null : DecryptedGroup.ADAPTER.decode(groupData),
+                    DistributionId.from(UuidUtil.parseOrThrow(distributionId)),
+                    blocked,
+                    profileSharingEnabled,
+                    permissionDenied,
+                    storageRecord,
+                    recipientResolver);
+        } catch (InvalidInputException | IOException e) {
+            return null;
+        }
+    }
+
+    private StorageId getGroupV1StorageIdFromResultSet(ResultSet resultSet) throws SQLException {
+        final var storageId = resultSet.getBytes("storage_id");
+        return storageId == null
+                ? StorageId.forGroupV1(KeyUtils.createRawStorageId())
+                : StorageId.forGroupV1(storageId);
+    }
+
+    private StorageId getGroupV2StorageIdFromResultSet(ResultSet resultSet) throws SQLException {
+        final var storageId = resultSet.getBytes("storage_id");
+        return storageId == null
+                ? StorageId.forGroupV2(KeyUtils.createRawStorageId())
+                : StorageId.forGroupV2(storageId);
+    }
+
+    private List<GroupInfoV1> getGroupsV1() {
+        final var sql = (
+                """
+                SELECT g.group_id, g.group_id_v2, g.name, g.color, (select group_concat(gm.recipient_id) from %s gm where gm.group_id = g._id) as members, g.expiration_time, g.blocked, g.archived, g.storage_record
+                FROM %s g
+                """
+        ).formatted(TABLE_GROUP_V1_MEMBER, TABLE_GROUP_V1);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                return Utils.executeQueryForStream(statement, this::getGroupInfoV1FromResultSet)
+                        .filter(Objects::nonNull)
+                        .toList();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from group store", e);
+        }
+    }
+
+    public GroupInfoV1 getGroup(Connection connection, GroupIdV1 groupIdV1) throws SQLException {
+        final var sql = (
+                """
+                SELECT g.group_id, g.group_id_v2, g.name, g.color, (select group_concat(gm.recipient_id) from %s gm where gm.group_id = g._id) as members, g.expiration_time, g.blocked, g.archived, g.storage_record
+                FROM %s g
+                WHERE g.group_id = ?
+                """
+        ).formatted(TABLE_GROUP_V1_MEMBER, TABLE_GROUP_V1);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, groupIdV1.serialize());
+            return Utils.executeQueryForOptional(statement, this::getGroupInfoV1FromResultSet).orElse(null);
+        }
+    }
+
+    public StorageId getGroupStorageId(Connection connection, GroupIdV1 groupIdV1) throws SQLException {
+        final var sql = (
+                """
+                SELECT g.storage_id
+                FROM %s g
+                WHERE g.group_id = ?
+                """
+        ).formatted(TABLE_GROUP_V1);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, groupIdV1.serialize());
+            final var storageId = Utils.executeQueryForOptional(statement, this::getGroupV1StorageIdFromResultSet);
+            if (storageId.isPresent()) {
+                return storageId.get();
+            }
+        }
+        final var newStorageId = StorageId.forGroupV1(KeyUtils.createRawStorageId());
+        updateStorageId(connection, groupIdV1, newStorageId);
+        return newStorageId;
+    }
+
+    public GroupInfoV1 getGroupV1(Connection connection, StorageId storageId) throws SQLException {
+        final var sql = (
+                """
+                SELECT g.group_id, g.group_id_v2, g.name, g.color, (select group_concat(gm.recipient_id) from %s gm where gm.group_id = g._id) as members, g.expiration_time, g.blocked, g.archived, g.storage_record
+                FROM %s g
+                WHERE g.storage_id = ?
+                """
+        ).formatted(TABLE_GROUP_V1_MEMBER, TABLE_GROUP_V1);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, storageId.getRaw());
+            return Utils.executeQueryForOptional(statement, this::getGroupInfoV1FromResultSet).orElse(null);
+        }
+    }
+
+    private GroupIdV1 getGroupIdV1FromResultSet(ResultSet resultSet) throws SQLException {
+        final var groupId = resultSet.getBytes("group_id");
+        return GroupId.v1(groupId);
+    }
+
+    private GroupInfoV1 getGroupInfoV1FromResultSet(ResultSet resultSet) throws SQLException {
+        final var groupId = resultSet.getBytes("group_id");
+        final var groupIdV2 = resultSet.getBytes("group_id_v2");
+        final var name = resultSet.getString("name");
+        final var color = resultSet.getString("color");
+        final var membersString = resultSet.getString("members");
+        final var members = membersString == null
+                ? Set.<RecipientId>of()
+                : Arrays.stream(membersString.split(","))
+                        .map(Integer::valueOf)
+                        .map(recipientIdCreator::create)
+                        .collect(Collectors.toSet());
+        final var expirationTime = resultSet.getInt("expiration_time");
+        final var blocked = resultSet.getBoolean("blocked");
+        final var archived = resultSet.getBoolean("archived");
+        final var storageRecord = resultSet.getBytes("storage_record");
+        return new GroupInfoV1(GroupId.v1(groupId),
+                groupIdV2 == null ? null : GroupId.v2(groupIdV2),
+                name,
+                members,
+                color,
+                expirationTime,
+                blocked,
+                archived,
+                storageRecord);
+    }
+
+    private GroupInfoV2 getGroupV2ByV1Id(final Connection connection, final GroupIdV1 groupId) throws SQLException {
+        return getGroup(connection, GroupUtils.getGroupIdV2(groupId));
+    }
+
+    private GroupInfoV1 getGroupV1ByV2Id(Connection connection, GroupIdV2 groupIdV2) throws SQLException {
+        final var sql = (
+                """
+                SELECT g.group_id, g.group_id_v2, g.name, g.color, (select group_concat(gm.recipient_id) from %s gm where gm.group_id = g._id) as members, g.expiration_time, g.blocked, g.archived, g.storage_record
+                FROM %s g
+                WHERE g.group_id_v2 = ?
+                """
+        ).formatted(TABLE_GROUP_V1_MEMBER, TABLE_GROUP_V1);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, groupIdV2.serialize());
+            return Utils.executeQueryForOptional(statement, this::getGroupInfoV1FromResultSet).orElse(null);
+        }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
new file mode 100644
index 00000000..383912dd
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
@@ -0,0 +1,207 @@
+package org.asamk.signal.manager.storage.groups;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupIdV1;
+import org.asamk.signal.manager.api.GroupIdV2;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.asamk.signal.manager.storage.recipients.RecipientResolver;
+import org.signal.libsignal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
+import org.signal.storageservice.protos.groups.local.DecryptedGroup;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.DistributionId;
+import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.internal.util.Hex;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+public class LegacyGroupStore {
+
+    private static final Logger logger = LoggerFactory.getLogger(LegacyGroupStore.class);
+
+    public static void migrate(
+            final Storage storage,
+            final File groupCachePath,
+            final RecipientResolver recipientResolver,
+            final GroupStore groupStore
+    ) {
+        final var groups = storage.groups.stream().map(g -> {
+            if (g instanceof Storage.GroupV1 g1) {
+                final var members = g1.members.stream().map(m -> {
+                    if (m.recipientId == null) {
+                        return recipientResolver.resolveRecipient(new RecipientAddress(ServiceId.ACI.parseOrNull(m.uuid),
+                                m.number));
+                    }
+
+                    return recipientResolver.resolveRecipient(m.recipientId);
+                }).filter(Objects::nonNull).collect(Collectors.toSet());
+
+                return new GroupInfoV1(GroupIdV1.fromBase64(g1.groupId),
+                        g1.expectedV2Id == null ? null : GroupIdV2.fromBase64(g1.expectedV2Id),
+                        g1.name,
+                        members,
+                        g1.color,
+                        g1.messageExpirationTime,
+                        g1.blocked,
+                        g1.archived,
+                        null);
+            }
+
+            final var g2 = (Storage.GroupV2) g;
+            var groupId = GroupIdV2.fromBase64(g2.groupId);
+            GroupMasterKey masterKey;
+            try {
+                masterKey = new GroupMasterKey(Base64.getDecoder().decode(g2.masterKey));
+            } catch (InvalidInputException | IllegalArgumentException e) {
+                throw new AssertionError("Invalid master key for group " + groupId.toBase64());
+            }
+
+            return new GroupInfoV2(groupId,
+                    masterKey,
+                    loadDecryptedGroupLocked(groupId, groupCachePath),
+                    g2.distributionId == null ? DistributionId.create() : DistributionId.from(g2.distributionId),
+                    g2.blocked,
+                    true,
+                    g2.permissionDenied,
+                    null,
+                    recipientResolver);
+        }).toList();
+
+        groupStore.addLegacyGroups(groups);
+        removeGroupCache(groupCachePath);
+    }
+
+    private static void removeGroupCache(File groupCachePath) {
+        final var files = groupCachePath.listFiles();
+        if (files == null) {
+            return;
+        }
+
+        for (var file : files) {
+            try {
+                Files.delete(file.toPath());
+            } catch (IOException e) {
+                logger.error("Failed to delete group cache file {}: {}", file, e.getMessage());
+            }
+        }
+        try {
+            Files.delete(groupCachePath.toPath());
+        } catch (IOException e) {
+            logger.error("Failed to delete group cache directory {}: {}", groupCachePath, e.getMessage());
+        }
+    }
+
+    private static DecryptedGroup loadDecryptedGroupLocked(final GroupIdV2 groupIdV2, final File groupCachePath) {
+        var groupFile = getGroupV2File(groupIdV2, groupCachePath);
+        if (!groupFile.exists()) {
+            groupFile = getGroupV2FileLegacy(groupIdV2, groupCachePath);
+        }
+        if (!groupFile.exists()) {
+            return null;
+        }
+        try (var stream = new FileInputStream(groupFile)) {
+            return DecryptedGroup.ADAPTER.decode(stream);
+        } catch (IOException ignored) {
+            return null;
+        }
+    }
+
+    private static File getGroupV2FileLegacy(final GroupId groupId, final File groupCachePath) {
+        return new File(groupCachePath, Hex.toStringCondensed(groupId.serialize()));
+    }
+
+    private static File getGroupV2File(final GroupId groupId, final File groupCachePath) {
+        return new File(groupCachePath, groupId.toBase64().replace("/", "_"));
+    }
+
+    public record Storage(@JsonDeserialize(using = GroupsDeserializer.class) List<Record> groups) {
+
+        public record GroupV1(
+                String groupId,
+                String expectedV2Id,
+                String name,
+                String color,
+                int messageExpirationTime,
+                boolean blocked,
+                boolean archived,
+                @JsonDeserialize(using = MembersDeserializer.class) List<Member> members
+        ) {
+
+            public record Member(Long recipientId, String uuid, String number) {}
+
+            public record JsonRecipientAddress(String uuid, String number) {}
+
+            private static class MembersDeserializer extends JsonDeserializer<List<Member>> {
+
+                @Override
+                public List<Member> deserialize(
+                        JsonParser jsonParser,
+                        DeserializationContext deserializationContext
+                ) throws IOException {
+                    var addresses = new ArrayList<Member>();
+                    JsonNode node = jsonParser.getCodec().readTree(jsonParser);
+                    for (var n : node) {
+                        if (n.isTextual()) {
+                            addresses.add(new Member(null, null, n.textValue()));
+                        } else if (n.isNumber()) {
+                            addresses.add(new Member(n.numberValue().longValue(), null, null));
+                        } else {
+                            var address = jsonParser.getCodec().treeToValue(n, JsonRecipientAddress.class);
+                            addresses.add(new Member(null, address.uuid, address.number));
+                        }
+                    }
+
+                    return addresses;
+                }
+            }
+        }
+
+        public record GroupV2(
+                String groupId,
+                String masterKey,
+                String distributionId,
+                @JsonInclude(JsonInclude.Include.NON_DEFAULT) boolean blocked,
+                @JsonInclude(JsonInclude.Include.NON_DEFAULT) boolean permissionDenied
+        ) {}
+    }
+
+    private static class GroupsDeserializer extends JsonDeserializer<List<Object>> {
+
+        @Override
+        public List<Object> deserialize(
+                JsonParser jsonParser,
+                DeserializationContext deserializationContext
+        ) throws IOException {
+            var groups = new ArrayList<>();
+            JsonNode node = jsonParser.getCodec().readTree(jsonParser);
+            for (var n : node) {
+                Object g;
+                if (n.hasNonNull("masterKey")) {
+                    // a v2 group
+                    g = jsonParser.getCodec().treeToValue(n, Storage.GroupV2.class);
+                } else {
+                    g = jsonParser.getCodec().treeToValue(n, Storage.GroupV1.class);
+                }
+                groups.add(g);
+            }
+
+            return groups;
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java
index 5a7324e5..0b9b8c17 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java
@@ -1,29 +1,29 @@
 package org.asamk.signal.manager.storage.identities;
 
 import org.asamk.signal.manager.api.TrustLevel;
-import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.signal.libsignal.protocol.IdentityKey;
-
-import java.util.Date;
+import org.whispersystems.signalservice.api.push.ServiceId;
 
 public class IdentityInfo {
 
-    private final RecipientId recipientId;
+    private final String address;
     private final IdentityKey identityKey;
     private final TrustLevel trustLevel;
-    private final Date added;
+    private final long addedTimestamp;
 
-    IdentityInfo(
-            final RecipientId recipientId, IdentityKey identityKey, TrustLevel trustLevel, Date added
-    ) {
-        this.recipientId = recipientId;
+    IdentityInfo(final String address, IdentityKey identityKey, TrustLevel trustLevel, long addedTimestamp) {
+        this.address = address;
         this.identityKey = identityKey;
         this.trustLevel = trustLevel;
-        this.added = added;
+        this.addedTimestamp = addedTimestamp;
     }
 
-    public RecipientId getRecipientId() {
-        return recipientId;
+    public ServiceId getServiceId() {
+        return ServiceId.parseOrThrow(address);
+    }
+
+    public String getAddress() {
+        return address;
     }
 
     public IdentityKey getIdentityKey() {
@@ -38,7 +38,7 @@ public class IdentityInfo {
         return trustLevel == TrustLevel.TRUSTED_UNVERIFIED || trustLevel == TrustLevel.TRUSTED_VERIFIED;
     }
 
-    public Date getDateAdded() {
-        return this.added;
+    public long getDateAddedTimestamp() {
+        return this.addedTimestamp;
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
index d9c553b7..a2d03a21 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
@@ -1,301 +1,323 @@
 package org.asamk.signal.manager.storage.identities;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.asamk.signal.manager.api.TrustLevel;
-import org.asamk.signal.manager.storage.recipients.RecipientId;
-import org.asamk.signal.manager.storage.recipients.RecipientResolver;
-import org.asamk.signal.manager.util.IOUtils;
+import org.asamk.signal.manager.api.TrustNewIdentity;
+import org.asamk.signal.manager.storage.Database;
+import org.asamk.signal.manager.storage.Utils;
+import org.asamk.signal.manager.storage.recipients.RecipientStore;
 import org.signal.libsignal.protocol.IdentityKey;
-import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidKeyException;
-import org.signal.libsignal.protocol.SignalProtocolAddress;
+import org.signal.libsignal.protocol.state.IdentityKeyStore.Direction;
+import org.signal.libsignal.protocol.state.IdentityKeyStore.IdentityChange;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.ServiceId;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Arrays;
-import java.util.Base64;
-import java.util.Date;
-import java.util.HashMap;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
-import java.util.regex.Pattern;
 
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.subjects.PublishSubject;
-import io.reactivex.rxjava3.subjects.Subject;
 
-public class IdentityKeyStore implements org.signal.libsignal.protocol.state.IdentityKeyStore {
+public class IdentityKeyStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(IdentityKeyStore.class);
-    private final ObjectMapper objectMapper = org.asamk.signal.manager.storage.Utils.createStorageObjectMapper();
-
-    private final Map<RecipientId, IdentityInfo> cachedIdentities = new HashMap<>();
-
-    private final File identitiesPath;
-
-    private final RecipientResolver resolver;
-    private final IdentityKeyPair identityKeyPair;
-    private final int localRegistrationId;
+    private static final Logger logger = LoggerFactory.getLogger(IdentityKeyStore.class);
+    private static final String TABLE_IDENTITY = "identity";
+    private final Database database;
     private final TrustNewIdentity trustNewIdentity;
-    private final PublishSubject<RecipientId> identityChanges = PublishSubject.create();
+    private final RecipientStore recipientStore;
+    private final PublishSubject<ServiceId> identityChanges = PublishSubject.create();
 
     private boolean isRetryingDecryption = false;
 
-    public IdentityKeyStore(
-            final File identitiesPath,
-            final RecipientResolver resolver,
-            final IdentityKeyPair identityKeyPair,
-            final int localRegistrationId,
-            final TrustNewIdentity trustNewIdentity
-    ) {
-        this.identitiesPath = identitiesPath;
-        this.resolver = resolver;
-        this.identityKeyPair = identityKeyPair;
-        this.localRegistrationId = localRegistrationId;
-        this.trustNewIdentity = trustNewIdentity;
+    public static void createSql(Connection connection) throws SQLException {
+        // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
+        try (final var statement = connection.createStatement()) {
+            statement.executeUpdate("""
+                                    CREATE TABLE identity (
+                                      _id INTEGER PRIMARY KEY,
+                                      address TEXT UNIQUE NOT NULL,
+                                      identity_key BLOB NOT NULL,
+                                      added_timestamp INTEGER NOT NULL,
+                                      trust_level INTEGER NOT NULL
+                                    ) STRICT;
+                                    """);
+        }
     }
 
-    public Subject<RecipientId> getIdentityChanges() {
+    public IdentityKeyStore(
+            final Database database,
+            final TrustNewIdentity trustNewIdentity,
+            RecipientStore recipientStore
+    ) {
+        this.database = database;
+        this.trustNewIdentity = trustNewIdentity;
+        this.recipientStore = recipientStore;
+    }
+
+    public Observable<ServiceId> getIdentityChanges() {
         return identityChanges;
     }
 
-    @Override
-    public IdentityKeyPair getIdentityKeyPair() {
-        return identityKeyPair;
+    public IdentityChange saveIdentity(final ServiceId serviceId, final IdentityKey identityKey) {
+        return saveIdentity(serviceId.toString(), identityKey);
     }
 
-    @Override
-    public int getLocalRegistrationId() {
-        return localRegistrationId;
+    public IdentityChange saveIdentity(
+            final Connection connection,
+            final ServiceId serviceId,
+            final IdentityKey identityKey
+    ) throws SQLException {
+        return saveIdentity(connection, serviceId.toString(), identityKey);
     }
 
-    @Override
-    public boolean saveIdentity(SignalProtocolAddress address, IdentityKey identityKey) {
-        final var recipientId = resolveRecipient(address.getName());
-
-        return saveIdentity(recipientId, identityKey, new Date());
-    }
-
-    public boolean saveIdentity(final RecipientId recipientId, final IdentityKey identityKey, Date added) {
+    IdentityChange saveIdentity(final String address, final IdentityKey identityKey) {
         if (isRetryingDecryption) {
-            return false;
+            return IdentityChange.NEW_OR_UNCHANGED;
         }
-        synchronized (cachedIdentities) {
-            final var identityInfo = loadIdentityLocked(recipientId);
-            if (identityInfo != null && identityInfo.getIdentityKey().equals(identityKey)) {
-                // Identity already exists, not updating the trust level
-                logger.trace("Not storing new identity for recipient {}, identity already stored", recipientId);
-                return false;
-            }
+        try (final var connection = database.getConnection()) {
+            return saveIdentity(connection, address, identityKey);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update identity store", e);
+        }
+    }
 
-            final var trustLevel = trustNewIdentity == TrustNewIdentity.ALWAYS || (
-                    trustNewIdentity == TrustNewIdentity.ON_FIRST_USE && identityInfo == null
-            ) ? TrustLevel.TRUSTED_UNVERIFIED : TrustLevel.UNTRUSTED;
-            logger.debug("Storing new identity for recipient {} with trust {}", recipientId, trustLevel);
-            final var newIdentityInfo = new IdentityInfo(recipientId, identityKey, trustLevel, added);
-            storeIdentityLocked(recipientId, newIdentityInfo);
-            identityChanges.onNext(recipientId);
-            return true;
+    private IdentityChange saveIdentity(
+            final Connection connection,
+            final String address,
+            final IdentityKey identityKey
+    ) throws SQLException {
+        final var identityInfo = loadIdentity(connection, address);
+        if (identityInfo == null) {
+            saveNewIdentity(connection, address, identityKey, true);
+            return IdentityChange.NEW_OR_UNCHANGED;
         }
+        if (identityInfo.getIdentityKey().equals(identityKey)) {
+            // Identity already exists, not updating the trust level
+            logger.trace("Not storing new identity for recipient {}, identity already stored", address);
+            return IdentityChange.NEW_OR_UNCHANGED;
+        }
+
+        saveNewIdentity(connection, address, identityKey, false);
+        return IdentityChange.REPLACED_EXISTING;
     }
 
     public void setRetryingDecryption(final boolean retryingDecryption) {
         isRetryingDecryption = retryingDecryption;
     }
 
-    public boolean setIdentityTrustLevel(RecipientId recipientId, IdentityKey identityKey, TrustLevel trustLevel) {
-        synchronized (cachedIdentities) {
-            final var identityInfo = loadIdentityLocked(recipientId);
-            if (identityInfo == null) {
-                logger.debug("Not updating trust level for recipient {}, identity not found", recipientId);
-                return false;
-            }
-            if (!identityInfo.getIdentityKey().equals(identityKey)) {
-                logger.debug("Not updating trust level for recipient {}, different identity found", recipientId);
-                return false;
-            }
-            if (identityInfo.getTrustLevel() == trustLevel) {
-                logger.trace("Not updating trust level for recipient {}, trust level already matches", recipientId);
-                return false;
-            }
-
-            logger.debug("Updating trust level for recipient {} with trust {}", recipientId, trustLevel);
-            final var newIdentityInfo = new IdentityInfo(recipientId,
-                    identityKey,
-                    trustLevel,
-                    identityInfo.getDateAdded());
-            storeIdentityLocked(recipientId, newIdentityInfo);
-            return true;
+    public boolean setIdentityTrustLevel(ServiceId serviceId, IdentityKey identityKey, TrustLevel trustLevel) {
+        try (final var connection = database.getConnection()) {
+            return setIdentityTrustLevel(connection, serviceId, identityKey, trustLevel);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update identity store", e);
         }
     }
 
-    @Override
-    public boolean isTrustedIdentity(SignalProtocolAddress address, IdentityKey identityKey, Direction direction) {
+    public boolean setIdentityTrustLevel(
+            final Connection connection,
+            final ServiceId serviceId,
+            final IdentityKey identityKey,
+            final TrustLevel trustLevel
+    ) throws SQLException {
+        final var address = serviceId.toString();
+        final var identityInfo = loadIdentity(connection, address);
+        if (identityInfo == null) {
+            logger.debug("Not updating trust level for recipient {}, identity not found", serviceId);
+            return false;
+        }
+        if (!identityInfo.getIdentityKey().equals(identityKey)) {
+            logger.debug("Not updating trust level for recipient {}, different identity found", serviceId);
+            return false;
+        }
+        if (identityInfo.getTrustLevel() == trustLevel) {
+            logger.trace("Not updating trust level for recipient {}, trust level already matches", serviceId);
+            return false;
+        }
+
+        logger.debug("Updating trust level for recipient {} with trust {}", serviceId, trustLevel);
+        final var newIdentityInfo = new IdentityInfo(address,
+                identityKey,
+                trustLevel,
+                identityInfo.getDateAddedTimestamp());
+        storeIdentity(connection, newIdentityInfo);
+        return true;
+    }
+
+    public boolean isTrustedIdentity(ServiceId serviceId, IdentityKey identityKey, Direction direction) {
+        return isTrustedIdentity(serviceId.toString(), identityKey, direction);
+    }
+
+    public boolean isTrustedIdentity(String address, IdentityKey identityKey, Direction direction) {
         if (trustNewIdentity == TrustNewIdentity.ALWAYS) {
             return true;
         }
 
-        var recipientId = resolveRecipient(address.getName());
-
-        synchronized (cachedIdentities) {
+        try (final var connection = database.getConnection()) {
             // TODO implement possibility for different handling of incoming/outgoing trust decisions
-            var identityInfo = loadIdentityLocked(recipientId);
+            var identityInfo = loadIdentity(connection, address);
             if (identityInfo == null) {
-                logger.debug("Initial identity found for {}, saving.", recipientId);
-                saveIdentity(address, identityKey);
-                identityInfo = loadIdentityLocked(recipientId);
+                logger.debug("Initial identity found for {}, saving.", address);
+                saveNewIdentity(connection, address, identityKey, true);
+                identityInfo = loadIdentity(connection, address);
             } else if (!identityInfo.getIdentityKey().equals(identityKey)) {
                 // Identity found, but different
                 if (direction == Direction.SENDING) {
-                    logger.debug("Changed identity found for {}, saving.", recipientId);
-                    saveIdentity(address, identityKey);
-                    identityInfo = loadIdentityLocked(recipientId);
+                    logger.debug("Changed identity found for {}, saving.", address);
+                    saveNewIdentity(connection, address, identityKey, false);
+                    identityInfo = loadIdentity(connection, address);
                 } else {
-                    logger.trace("Trusting identity for {} for {}: {}", recipientId, direction, false);
+                    logger.trace("Trusting identity for {} for {}: {}", address, direction, false);
                     return false;
                 }
             }
 
             final var isTrusted = identityInfo != null && identityInfo.isTrusted();
-            logger.trace("Trusting identity for {} for {}: {}", recipientId, direction, isTrusted);
+            logger.trace("Trusting identity for {} for {}: {}", address, direction, isTrusted);
             return isTrusted;
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from identity store", e);
         }
     }
 
-    @Override
-    public IdentityKey getIdentity(SignalProtocolAddress address) {
-        var recipientId = resolveRecipient(address.getName());
+    public IdentityInfo getIdentityInfo(ServiceId serviceId) {
+        return getIdentityInfo(serviceId.toString());
+    }
 
-        synchronized (cachedIdentities) {
-            var identity = loadIdentityLocked(recipientId);
-            return identity == null ? null : identity.getIdentityKey();
+    public IdentityInfo getIdentityInfo(String address) {
+        try (final var connection = database.getConnection()) {
+            return loadIdentity(connection, address);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from identity store", e);
         }
     }
 
-    public IdentityInfo getIdentity(RecipientId recipientId) {
-        synchronized (cachedIdentities) {
-            return loadIdentityLocked(recipientId);
-        }
+    public IdentityInfo getIdentityInfo(Connection connection, String address) throws SQLException {
+        return loadIdentity(connection, address);
     }
 
-    final Pattern identityFileNamePattern = Pattern.compile("(\\d+)");
-
     public List<IdentityInfo> getIdentities() {
-        final var files = identitiesPath.listFiles();
-        if (files == null) {
-            return List.of();
-        }
-        return Arrays.stream(files)
-                .filter(f -> identityFileNamePattern.matcher(f.getName()).matches())
-                .map(f -> resolver.resolveRecipient(Long.parseLong(f.getName())))
-                .filter(Objects::nonNull)
-                .map(this::loadIdentityLocked)
-                .filter(Objects::nonNull)
-                .toList();
-    }
-
-    public void mergeRecipients(final RecipientId recipientId, final RecipientId toBeMergedRecipientId) {
-        synchronized (cachedIdentities) {
-            deleteIdentityLocked(toBeMergedRecipientId);
-        }
-    }
-
-    public void deleteIdentity(final RecipientId recipientId) {
-        synchronized (cachedIdentities) {
-            deleteIdentityLocked(recipientId);
-        }
-    }
-
-    /**
-     * @param identifier can be either a serialized uuid or a e164 phone number
-     */
-    private RecipientId resolveRecipient(String identifier) {
-        return resolver.resolveRecipient(identifier);
-    }
-
-    private File getIdentityFile(final RecipientId recipientId) {
-        try {
-            IOUtils.createPrivateDirectories(identitiesPath);
-        } catch (IOException e) {
-            throw new AssertionError("Failed to create identities path", e);
-        }
-        return new File(identitiesPath, String.valueOf(recipientId.id()));
-    }
-
-    private IdentityInfo loadIdentityLocked(final RecipientId recipientId) {
-        {
-            final var session = cachedIdentities.get(recipientId);
-            if (session != null) {
-                return session;
+        try (final var connection = database.getConnection()) {
+            final var sql = (
+                    """
+                    SELECT i.address, i.identity_key, i.added_timestamp, i.trust_level
+                    FROM %s AS i
+                    """
+            ).formatted(TABLE_IDENTITY);
+            try (final var statement = connection.prepareStatement(sql)) {
+                return Utils.executeQueryForStream(statement, this::getIdentityInfoFromResultSet)
+                        .filter(Objects::nonNull)
+                        .toList();
             }
-        }
-
-        final var file = getIdentityFile(recipientId);
-        if (!file.exists()) {
-            return null;
-        }
-        try (var inputStream = new FileInputStream(file)) {
-            var storage = objectMapper.readValue(inputStream, IdentityStorage.class);
-
-            var id = new IdentityKey(Base64.getDecoder().decode(storage.identityKey()));
-            var trustLevel = TrustLevel.fromInt(storage.trustLevel());
-            var added = new Date(storage.addedTimestamp());
-
-            final var identityInfo = new IdentityInfo(recipientId, id, trustLevel, added);
-            cachedIdentities.put(recipientId, identityInfo);
-            return identityInfo;
-        } catch (IOException | InvalidKeyException e) {
-            logger.warn("Failed to load identity key: {}", e.getMessage());
-            return null;
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from identity store", e);
         }
     }
 
-    private void storeIdentityLocked(final RecipientId recipientId, final IdentityInfo identityInfo) {
+    public void deleteIdentity(final ServiceId serviceId) {
+        try (final var connection = database.getConnection()) {
+            deleteIdentity(connection, serviceId.toString());
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update identity store", e);
+        }
+    }
+
+    void addLegacyIdentities(final Collection<IdentityInfo> identities) {
+        logger.debug("Migrating legacy identities to database");
+        long start = System.nanoTime();
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            for (final var identityInfo : identities) {
+                storeIdentity(connection, identityInfo);
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update identity store", e);
+        }
+        logger.debug("Complete identities migration took {}ms", (System.nanoTime() - start) / 1000000);
+    }
+
+    private IdentityInfo loadIdentity(final Connection connection, final String address) throws SQLException {
+        final var sql = (
+                """
+                SELECT i.address, i.identity_key, i.added_timestamp, i.trust_level
+                FROM %s AS i
+                WHERE i.address = ?
+                """
+        ).formatted(TABLE_IDENTITY);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setString(1, address);
+            return Utils.executeQueryForOptional(statement, this::getIdentityInfoFromResultSet).orElse(null);
+        }
+    }
+
+    private void saveNewIdentity(
+            final Connection connection,
+            final String address,
+            final IdentityKey identityKey,
+            final boolean firstIdentity
+    ) throws SQLException {
+        final var trustLevel = trustNewIdentity == TrustNewIdentity.ALWAYS || (
+                trustNewIdentity == TrustNewIdentity.ON_FIRST_USE && firstIdentity
+        ) ? TrustLevel.TRUSTED_UNVERIFIED : TrustLevel.UNTRUSTED;
+        logger.debug("Storing new identity for recipient {} with trust {}", address, trustLevel);
+        final var newIdentityInfo = new IdentityInfo(address, identityKey, trustLevel, System.currentTimeMillis());
+        storeIdentity(connection, newIdentityInfo);
+        final var serviceId = ServiceId.parseOrNull(address);
+        if (serviceId != null) {
+            identityChanges.onNext(serviceId);
+        }
+    }
+
+    private void storeIdentity(final Connection connection, final IdentityInfo identityInfo) throws SQLException {
         logger.trace("Storing identity info for {}, trust: {}, added: {}",
-                recipientId,
+                identityInfo.getServiceId(),
                 identityInfo.getTrustLevel(),
-                identityInfo.getDateAdded());
-        cachedIdentities.put(recipientId, identityInfo);
+                identityInfo.getDateAddedTimestamp());
+        final var sql = (
+                """
+                INSERT OR REPLACE INTO %s (address, identity_key, added_timestamp, trust_level)
+                VALUES (?, ?, ?, ?)
+                """
+        ).formatted(TABLE_IDENTITY);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setString(1, identityInfo.getAddress());
+            statement.setBytes(2, identityInfo.getIdentityKey().serialize());
+            statement.setLong(3, identityInfo.getDateAddedTimestamp());
+            statement.setInt(4, identityInfo.getTrustLevel().ordinal());
+            statement.executeUpdate();
+        }
+        recipientStore.rotateStorageId(connection, identityInfo.getServiceId());
+    }
 
-        var storage = new IdentityStorage(Base64.getEncoder().encodeToString(identityInfo.getIdentityKey().serialize()),
-                identityInfo.getTrustLevel().ordinal(),
-                identityInfo.getDateAdded().getTime());
-
-        final var file = getIdentityFile(recipientId);
-        // Write to memory first to prevent corrupting the file in case of serialization errors
-        try (var inMemoryOutput = new ByteArrayOutputStream()) {
-            objectMapper.writeValue(inMemoryOutput, storage);
-
-            var input = new ByteArrayInputStream(inMemoryOutput.toByteArray());
-            try (var outputStream = new FileOutputStream(file)) {
-                input.transferTo(outputStream);
-            }
-        } catch (Exception e) {
-            logger.error("Error saving identity file: {}", e.getMessage());
+    private void deleteIdentity(final Connection connection, final String address) throws SQLException {
+        final var sql = (
+                """
+                DELETE FROM %s AS i
+                WHERE i.address = ?
+                """
+        ).formatted(TABLE_IDENTITY);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setString(1, address);
+            statement.executeUpdate();
         }
     }
 
-    private void deleteIdentityLocked(final RecipientId recipientId) {
-        cachedIdentities.remove(recipientId);
-
-        final var file = getIdentityFile(recipientId);
-        if (!file.exists()) {
-            return;
-        }
+    private IdentityInfo getIdentityInfoFromResultSet(ResultSet resultSet) throws SQLException {
         try {
-            Files.delete(file.toPath());
-        } catch (IOException e) {
-            logger.error("Failed to delete identity file {}: {}", file, e.getMessage());
+            final var address = resultSet.getString("address");
+            final var id = new IdentityKey(resultSet.getBytes("identity_key"));
+            final var trustLevel = TrustLevel.fromInt(resultSet.getInt("trust_level"));
+            final var added = resultSet.getLong("added_timestamp");
+
+            return new IdentityInfo(address, id, trustLevel, added);
+        } catch (InvalidKeyException e) {
+            logger.warn("Failed to load identity key, resetting: {}", e.getMessage());
+            return null;
         }
     }
-
-    private record IdentityStorage(String identityKey, int trustLevel, long addedTimestamp) {}
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
new file mode 100644
index 00000000..fc6e93e1
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
@@ -0,0 +1,119 @@
+package org.asamk.signal.manager.storage.identities;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.asamk.signal.manager.api.TrustLevel;
+import org.asamk.signal.manager.helper.RecipientAddressResolver;
+import org.asamk.signal.manager.storage.recipients.RecipientId;
+import org.asamk.signal.manager.storage.recipients.RecipientResolver;
+import org.asamk.signal.manager.util.IOUtils;
+import org.signal.libsignal.protocol.IdentityKey;
+import org.signal.libsignal.protocol.InvalidKeyException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.List;
+import java.util.Objects;
+import java.util.regex.Pattern;
+
+public class LegacyIdentityKeyStore {
+
+    private static final Logger logger = LoggerFactory.getLogger(LegacyIdentityKeyStore.class);
+    private static final ObjectMapper objectMapper = org.asamk.signal.manager.storage.Utils.createStorageObjectMapper();
+
+    public static void migrate(
+            final File identitiesPath,
+            final RecipientResolver resolver,
+            final RecipientAddressResolver addressResolver,
+            final IdentityKeyStore identityKeyStore
+    ) {
+        final var identities = getIdentities(identitiesPath, resolver, addressResolver);
+        identityKeyStore.addLegacyIdentities(identities);
+        removeIdentityFiles(identitiesPath);
+    }
+
+    static final Pattern identityFileNamePattern = Pattern.compile("(\\d+)");
+
+    private static List<IdentityInfo> getIdentities(
+            final File identitiesPath,
+            final RecipientResolver resolver,
+            final RecipientAddressResolver addressResolver
+    ) {
+        final var files = identitiesPath.listFiles();
+        if (files == null) {
+            return List.of();
+        }
+        return Arrays.stream(files)
+                .filter(f -> identityFileNamePattern.matcher(f.getName()).matches())
+                .map(f -> resolver.resolveRecipient(Long.parseLong(f.getName())))
+                .filter(Objects::nonNull)
+                .map(recipientId -> loadIdentityLocked(recipientId, addressResolver, identitiesPath))
+                .filter(Objects::nonNull)
+                .toList();
+    }
+
+    private static File getIdentityFile(final RecipientId recipientId, final File identitiesPath) {
+        try {
+            IOUtils.createPrivateDirectories(identitiesPath);
+        } catch (IOException e) {
+            throw new AssertionError("Failed to create identities path", e);
+        }
+        return new File(identitiesPath, String.valueOf(recipientId.id()));
+    }
+
+    private static IdentityInfo loadIdentityLocked(
+            final RecipientId recipientId,
+            RecipientAddressResolver addressResolver,
+            final File identitiesPath
+    ) {
+        final var file = getIdentityFile(recipientId, identitiesPath);
+        if (!file.exists()) {
+            return null;
+        }
+        final var address = addressResolver.resolveRecipientAddress(recipientId);
+        if (address.serviceId().isEmpty()) {
+            return null;
+        }
+        try (var inputStream = new FileInputStream(file)) {
+            var storage = objectMapper.readValue(inputStream, IdentityStorage.class);
+
+            var id = new IdentityKey(Base64.getDecoder().decode(storage.identityKey()));
+            var trustLevel = TrustLevel.fromInt(storage.trustLevel());
+            var added = storage.addedTimestamp();
+
+            final var serviceId = address.serviceId().get();
+            return new IdentityInfo(serviceId.toString(), id, trustLevel, added);
+        } catch (IOException | InvalidKeyException e) {
+            logger.warn("Failed to load identity key: {}", e.getMessage());
+            return null;
+        }
+    }
+
+    private static void removeIdentityFiles(File identitiesPath) {
+        final var files = identitiesPath.listFiles();
+        if (files == null) {
+            return;
+        }
+
+        for (var file : files) {
+            try {
+                Files.delete(file.toPath());
+            } catch (IOException e) {
+                logger.error("Failed to delete identity file {}: {}", file, e.getMessage());
+            }
+        }
+        try {
+            Files.delete(identitiesPath.toPath());
+        } catch (IOException e) {
+            logger.error("Failed to delete identity directory {}: {}", identitiesPath, e.getMessage());
+        }
+    }
+
+    public record IdentityStorage(String identityKey, int trustLevel, long addedTimestamp) {}
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/SignalIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/SignalIdentityKeyStore.java
new file mode 100644
index 00000000..1ac7c9a6
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/SignalIdentityKeyStore.java
@@ -0,0 +1,50 @@
+package org.asamk.signal.manager.storage.identities;
+
+import org.signal.libsignal.protocol.IdentityKey;
+import org.signal.libsignal.protocol.IdentityKeyPair;
+import org.signal.libsignal.protocol.SignalProtocolAddress;
+
+import java.util.function.Supplier;
+
+public class SignalIdentityKeyStore implements org.signal.libsignal.protocol.state.IdentityKeyStore {
+
+    private final Supplier<IdentityKeyPair> identityKeyPairSupplier;
+    private final int localRegistrationId;
+    private final IdentityKeyStore identityKeyStore;
+
+    public SignalIdentityKeyStore(
+            final Supplier<IdentityKeyPair> identityKeyPairSupplier,
+            final int localRegistrationId,
+            final IdentityKeyStore identityKeyStore
+    ) {
+        this.identityKeyPairSupplier = identityKeyPairSupplier;
+        this.localRegistrationId = localRegistrationId;
+        this.identityKeyStore = identityKeyStore;
+    }
+
+    @Override
+    public IdentityKeyPair getIdentityKeyPair() {
+        return identityKeyPairSupplier.get();
+    }
+
+    @Override
+    public int getLocalRegistrationId() {
+        return localRegistrationId;
+    }
+
+    @Override
+    public IdentityChange saveIdentity(SignalProtocolAddress address, IdentityKey identityKey) {
+        return identityKeyStore.saveIdentity(address.getName(), identityKey);
+    }
+
+    @Override
+    public boolean isTrustedIdentity(SignalProtocolAddress address, IdentityKey identityKey, Direction direction) {
+        return identityKeyStore.isTrustedIdentity(address.getName(), identityKey, direction);
+    }
+
+    @Override
+    public IdentityKey getIdentity(SignalProtocolAddress address) {
+        final var identityInfo = identityKeyStore.getIdentityInfo(address.getName());
+        return identityInfo == null ? null : identityInfo.getIdentityKey();
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueEntry.java b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueEntry.java
new file mode 100644
index 00000000..3195bc81
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueEntry.java
@@ -0,0 +1,8 @@
+package org.asamk.signal.manager.storage.keyValue;
+
+public record KeyValueEntry<T>(String key, Class<T> clazz, T defaultValue) {
+
+    public KeyValueEntry(String key, Class<T> clazz) {
+        this(key, clazz, null);
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
new file mode 100644
index 00000000..2f59c9d2
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
@@ -0,0 +1,203 @@
+package org.asamk.signal.manager.storage.keyValue;
+
+import org.asamk.signal.manager.storage.Database;
+import org.asamk.signal.manager.storage.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.HashMap;
+import java.util.Objects;
+
+public class KeyValueStore {
+
+    private static final String TABLE_KEY_VALUE = "key_value";
+    private static final Logger logger = LoggerFactory.getLogger(KeyValueStore.class);
+
+    private final Database database;
+    private final HashMap<KeyValueEntry<?>, Object> cache = new HashMap<>();
+
+    public static void createSql(Connection connection) throws SQLException {
+        // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
+        try (final var statement = connection.createStatement()) {
+            statement.executeUpdate("""
+                                    CREATE TABLE key_value (
+                                      _id INTEGER PRIMARY KEY,
+                                      key TEXT UNIQUE NOT NULL,
+                                      value ANY
+                                    ) STRICT;
+                                    """);
+        }
+    }
+
+    public KeyValueStore(final Database database) {
+        this.database = database;
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> T getEntry(KeyValueEntry<T> key) {
+        synchronized (cache) {
+            if (cache.containsKey(key)) {
+                logger.trace("Got entry for key {} from cache", key.key());
+                return (T) cache.get(key);
+            }
+        }
+        try (final var connection = database.getConnection()) {
+            return getEntry(connection, key);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from key_value store", e);
+        }
+    }
+
+    public <T> boolean storeEntry(KeyValueEntry<T> key, T value) {
+        try (final var connection = database.getConnection()) {
+            return storeEntry(connection, key, value);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update key_value store", e);
+        }
+    }
+
+    public <T> T getEntry(final Connection connection, final KeyValueEntry<T> key) throws SQLException {
+        final var sql = (
+                """
+                SELECT key, value
+                FROM %s p
+                WHERE p.key = ?
+                """
+        ).formatted(TABLE_KEY_VALUE);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setString(1, key.key());
+
+            var result = Utils.executeQueryForOptional(statement, resultSet -> readValueFromResultSet(key, resultSet))
+                    .orElse(null);
+
+            if (result == null) {
+                logger.trace("Got entry for key {} from default value", key.key());
+                result = key.defaultValue();
+            } else {
+                logger.trace("Got entry for key {} from db", key.key());
+            }
+            synchronized (cache) {
+                cache.put(key, result);
+            }
+            return result;
+        }
+    }
+
+    public <T> boolean storeEntry(
+            final Connection connection,
+            final KeyValueEntry<T> key,
+            final T value
+    ) throws SQLException {
+        final var entry = getEntry(connection, key);
+        if (Objects.equals(entry, value)) {
+            return false;
+        }
+
+        final var sql = (
+                """
+                INSERT INTO %s (key, value)
+                VALUES (?1, ?2)
+                ON CONFLICT (key) DO UPDATE SET value=excluded.value
+                """
+        ).formatted(TABLE_KEY_VALUE);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setString(1, key.key());
+            setParameterValue(statement, 2, key.clazz(), value);
+            statement.executeUpdate();
+        }
+        synchronized (cache) {
+            cache.put(key, value);
+        }
+        return true;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <T> T readValueFromResultSet(
+            final KeyValueEntry<T> key,
+            final ResultSet resultSet
+    ) throws SQLException {
+        Object value;
+        final var clazz = key.clazz();
+        if (clazz == int.class || clazz == Integer.class) {
+            value = resultSet.getInt("value");
+        } else if (clazz == long.class || clazz == Long.class) {
+            value = resultSet.getLong("value");
+        } else if (clazz == boolean.class || clazz == Boolean.class) {
+            value = resultSet.getBoolean("value");
+        } else if (clazz == byte[].class || clazz == Byte[].class) {
+            value = resultSet.getBytes("value");
+        } else if (clazz == String.class) {
+            value = resultSet.getString("value");
+        } else if (Enum.class.isAssignableFrom(clazz)) {
+            final var name = resultSet.getString("value");
+            if (name == null) {
+                value = null;
+            } else {
+                try {
+                    value = Enum.valueOf((Class<Enum>) key.clazz(), name);
+                } catch (IllegalArgumentException e) {
+                    logger.debug("Read invalid enum value from store, ignoring: {} for {}", name, key.clazz());
+                    value = null;
+                }
+            }
+        } else {
+            throw new AssertionError("Invalid key type " + clazz.getSimpleName());
+        }
+        if (resultSet.wasNull()) {
+            return null;
+        }
+        return (T) value;
+    }
+
+    private static <T> void setParameterValue(
+            final PreparedStatement statement,
+            final int parameterIndex,
+            final Class<T> clazz,
+            final T value
+    ) throws SQLException {
+        if (clazz == int.class || clazz == Integer.class) {
+            if (value == null) {
+                statement.setNull(parameterIndex, Types.INTEGER);
+            } else {
+                statement.setInt(parameterIndex, (int) value);
+            }
+        } else if (clazz == long.class || clazz == Long.class) {
+            if (value == null) {
+                statement.setNull(parameterIndex, Types.INTEGER);
+            } else {
+                statement.setLong(parameterIndex, (long) value);
+            }
+        } else if (clazz == boolean.class || clazz == Boolean.class) {
+            if (value == null) {
+                statement.setNull(parameterIndex, Types.BOOLEAN);
+            } else {
+                statement.setBoolean(parameterIndex, (boolean) value);
+            }
+        } else if (clazz == byte[].class || clazz == Byte[].class) {
+            if (value == null) {
+                statement.setNull(parameterIndex, Types.BLOB);
+            } else {
+                statement.setBytes(parameterIndex, (byte[]) value);
+            }
+        } else if (clazz == String.class) {
+            if (value == null) {
+                statement.setNull(parameterIndex, Types.VARCHAR);
+            } else {
+                statement.setString(parameterIndex, (String) value);
+            }
+        } else if (Enum.class.isAssignableFrom(clazz)) {
+            if (value == null) {
+                statement.setNull(parameterIndex, Types.VARCHAR);
+            } else {
+                statement.setString(parameterIndex, ((Enum<?>) value).name());
+            }
+        } else {
+            throw new AssertionError("Invalid key type " + clazz.getSimpleName());
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java
index 941c4fa9..4b2cea9b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java
@@ -11,25 +11,34 @@ import java.nio.file.Files;
 
 public final class CachedMessage {
 
-    private final static Logger logger = LoggerFactory.getLogger(CachedMessage.class);
+    private static final Logger logger = LoggerFactory.getLogger(CachedMessage.class);
 
     private final File file;
 
+    private SignalServiceEnvelope envelope;
+
     CachedMessage(final File file) {
         this.file = file;
     }
 
+    CachedMessage(final File file, SignalServiceEnvelope envelope) {
+        this.file = file;
+        this.envelope = envelope;
+    }
+
     File getFile() {
         return file;
     }
 
     public SignalServiceEnvelope loadEnvelope() {
-        try {
-            return MessageCacheUtils.loadEnvelope(file);
-        } catch (Exception e) {
-            logger.error("Failed to load cached message envelope “{}”: {}", file, e.getMessage());
-            return null;
+        if (envelope == null) {
+            try {
+                envelope = MessageCacheUtils.loadEnvelope(file);
+            } catch (Exception e) {
+                logger.error("Failed to load cached message envelope “{}”: {}", file, e.getMessage(), e);
+            }
         }
+        return envelope;
     }
 
     public void delete() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
index 4853b223..e4fd8c01 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
@@ -10,6 +10,7 @@ import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Objects;
@@ -17,7 +18,7 @@ import java.util.stream.Stream;
 
 public class MessageCache {
 
-    private final static Logger logger = LoggerFactory.getLogger(MessageCache.class);
+    private static final Logger logger = LoggerFactory.getLogger(MessageCache.class);
 
     private final File messageCachePath;
 
@@ -51,13 +52,21 @@ public class MessageCache {
     public CachedMessage cacheMessage(SignalServiceEnvelope envelope, RecipientId recipientId) {
         final var now = System.currentTimeMillis();
 
+        File cacheFile;
+        try {
+            cacheFile = getMessageCacheFile(recipientId, now, envelope.getTimestamp());
+        } catch (IOException e) {
+            logger.warn("Failed to create recipient folder in disk cache: {}", e.getMessage());
+            throw new RuntimeException(e);
+        }
+
+        final var cachedMessage = new CachedMessage(cacheFile, envelope);
         try {
-            var cacheFile = getMessageCacheFile(recipientId, now, envelope.getTimestamp());
             MessageCacheUtils.storeEnvelope(envelope, cacheFile);
-            return new CachedMessage(cacheFile);
+            return cachedMessage;
         } catch (IOException e) {
             logger.warn("Failed to store encrypted message in disk cache, ignoring: {}", e.getMessage());
-            return null;
+            return cachedMessage;
         }
     }
 
@@ -66,7 +75,8 @@ public class MessageCache {
         if (cacheFile.equals(cachedMessage.getFile())) {
             return cachedMessage;
         }
-        Files.move(cachedMessage.getFile().toPath(), cacheFile.toPath());
+        logger.debug("Moving cached message {} to {}", cachedMessage.getFile().toPath(), cacheFile.toPath());
+        Files.move(cachedMessage.getFile().toPath(), cacheFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
         return new CachedMessage(cacheFile);
     }
 
@@ -125,7 +135,7 @@ public class MessageCache {
                 final var cacheFile = getMessageCacheFile(recipientId, file.getName());
                 Files.move(file.toPath(), cacheFile.toPath());
             } catch (IOException e) {
-                logger.warn("Failed to move cache file “{}”, ignoring: {}", file, e.getMessage());
+                logger.warn("Failed to move cache file “{}”, ignoring: {}", file, e.getMessage(), e);
             }
         }
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java
new file mode 100644
index 00000000..7b05dff9
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java
@@ -0,0 +1,299 @@
+package org.asamk.signal.manager.storage.prekeys;
+
+import org.asamk.signal.manager.storage.Database;
+import org.asamk.signal.manager.storage.Utils;
+import org.signal.libsignal.protocol.InvalidKeyIdException;
+import org.signal.libsignal.protocol.InvalidMessageException;
+import org.signal.libsignal.protocol.state.KyberPreKeyRecord;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.SignalServiceKyberPreKeyStore;
+import org.whispersystems.signalservice.api.push.ServiceIdType;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+
+import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_ARCHIVE_AGE;
+
+public class KyberPreKeyStore implements SignalServiceKyberPreKeyStore {
+
+    private static final String TABLE_KYBER_PRE_KEY = "kyber_pre_key";
+    private static final Logger logger = LoggerFactory.getLogger(KyberPreKeyStore.class);
+
+    private final Database database;
+    private final int accountIdType;
+
+    public static void createSql(Connection connection) throws SQLException {
+        // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
+        try (final var statement = connection.createStatement()) {
+            statement.executeUpdate("""
+                                    CREATE TABLE kyber_pre_key (
+                                      _id INTEGER PRIMARY KEY,
+                                      account_id_type INTEGER NOT NULL,
+                                      key_id INTEGER NOT NULL,
+                                      serialized BLOB NOT NULL,
+                                      is_last_resort INTEGER NOT NULL,
+                                      stale_timestamp INTEGER,
+                                      timestamp INTEGER DEFAULT 0,
+                                      UNIQUE(account_id_type, key_id)
+                                    ) STRICT;
+                                    """);
+        }
+    }
+
+    public KyberPreKeyStore(final Database database, final ServiceIdType serviceIdType) {
+        this.database = database;
+        this.accountIdType = Utils.getAccountIdType(serviceIdType);
+    }
+
+    @Override
+    public KyberPreKeyRecord loadKyberPreKey(final int keyId) throws InvalidKeyIdException {
+        final var kyberPreKey = getPreKey(keyId);
+        if (kyberPreKey == null) {
+            throw new InvalidKeyIdException("No such kyber pre key record: " + keyId);
+        }
+        return kyberPreKey;
+    }
+
+    @Override
+    public List<KyberPreKeyRecord> loadKyberPreKeys() {
+        final var sql = (
+                """
+                SELECT p.serialized
+                FROM %s p
+                WHERE p.account_id_type = ?
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                return Utils.executeQueryForStream(statement, this::getKyberPreKeyRecordFromResultSet).toList();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from kyber_pre_key store", e);
+        }
+    }
+
+    @Override
+    public List<KyberPreKeyRecord> loadLastResortKyberPreKeys() {
+        final var sql = (
+                """
+                SELECT p.serialized
+                FROM %s p
+                WHERE p.account_id_type = ? AND p.is_last_resort = TRUE
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                return Utils.executeQueryForStream(statement, this::getKyberPreKeyRecordFromResultSet).toList();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from kyber_pre_key store", e);
+        }
+    }
+
+    @Override
+    public void storeLastResortKyberPreKey(final int keyId, final KyberPreKeyRecord record) {
+        storeKyberPreKey(keyId, record, true);
+    }
+
+    @Override
+    public void storeKyberPreKey(final int keyId, final KyberPreKeyRecord record) {
+        storeKyberPreKey(keyId, record, false);
+    }
+
+    public void storeKyberPreKey(final int keyId, final KyberPreKeyRecord record, final boolean isLastResort) {
+        final var sql = (
+                """
+                INSERT INTO %s (account_id_type, key_id, serialized, is_last_resort, timestamp)
+                VALUES (?, ?, ?, ?, ?)
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setInt(2, keyId);
+                statement.setBytes(3, record.serialize());
+                statement.setBoolean(4, isLastResort);
+                statement.setLong(5, record.getTimestamp());
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update kyber_pre_key store", e);
+        }
+    }
+
+    @Override
+    public boolean containsKyberPreKey(final int keyId) {
+        return getPreKey(keyId) != null;
+    }
+
+    @Override
+    public void markKyberPreKeyUsed(final int keyId) {
+        final var sql = (
+                """
+                DELETE FROM %s AS p
+                WHERE p.account_id_type = ? AND p.key_id = ? AND p.is_last_resort = FALSE
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setInt(2, keyId);
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update kyber_pre_key store", e);
+        }
+    }
+
+    @Override
+    public void removeKyberPreKey(final int keyId) {
+        final var sql = (
+                """
+                DELETE FROM %s AS p
+                WHERE p.account_id_type = ? AND p.key_id = ?
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setInt(2, keyId);
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update kyber_pre_key store", e);
+        }
+    }
+
+    public void removeAllKyberPreKeys() {
+        final var sql = (
+                """
+                DELETE FROM %s AS p
+                WHERE p.account_id_type = ?
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update kyber_pre_key store", e);
+        }
+    }
+
+    private KyberPreKeyRecord getPreKey(int keyId) {
+        final var sql = (
+                """
+                SELECT p.serialized
+                FROM %s p
+                WHERE p.account_id_type = ? AND p.key_id = ?
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setInt(2, keyId);
+                return Utils.executeQueryForOptional(statement, this::getKyberPreKeyRecordFromResultSet).orElse(null);
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from kyber_pre_key store", e);
+        }
+    }
+
+    private KyberPreKeyRecord getKyberPreKeyRecordFromResultSet(ResultSet resultSet) throws SQLException {
+        try {
+            final var serialized = resultSet.getBytes("serialized");
+            return new KyberPreKeyRecord(serialized);
+        } catch (InvalidMessageException e) {
+            return null;
+        }
+    }
+
+    public void removeOldLastResortKyberPreKeys(int activeLastResortKyberPreKeyId) {
+        final var sql = (
+                """
+                DELETE FROM %s AS p
+                WHERE p._id IN (
+                    SELECT p._id
+                    FROM %s AS p
+                    WHERE p.account_id_type = ?
+                        AND p.is_last_resort = TRUE
+                        AND p.key_id != ?
+                        AND p.timestamp < ?
+                    ORDER BY p.timestamp DESC
+                    LIMIT -1 OFFSET 1
+                )
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY, TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setInt(2, activeLastResortKyberPreKeyId);
+                statement.setLong(3, System.currentTimeMillis() - PREKEY_ARCHIVE_AGE);
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update kyber_pre_key store", e);
+        }
+    }
+
+    @Override
+    public void deleteAllStaleOneTimeKyberPreKeys(final long threshold, final int minCount) {
+        final var sql = (
+                """
+                DELETE FROM %s AS p
+                WHERE p.account_id_type = ?1
+                    AND p.stale_timestamp < ?2
+                    AND p.is_last_resort = FALSE
+                    AND p._id NOT IN (
+                        SELECT _id
+                        FROM %s p2
+                        WHERE p2.account_id_type = ?1
+                        ORDER BY
+                          CASE WHEN p2.stale_timestamp IS NULL THEN 1 ELSE 0 END DESC,
+                          p2.stale_timestamp DESC,
+                          p2._id DESC
+                        LIMIT ?3
+                    )
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY, TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setLong(2, threshold);
+                statement.setInt(3, minCount);
+                final var rowCount = statement.executeUpdate();
+                if (rowCount > 0) {
+                    logger.debug("Deleted {} stale one time kyber pre keys", rowCount);
+                }
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update kyber_pre_key store", e);
+        }
+    }
+
+    @Override
+    public void markAllOneTimeKyberPreKeysStaleIfNecessary(final long staleTime) {
+        final var sql = (
+                """
+                UPDATE %s
+                SET stale_timestamp = ?
+                WHERE account_id_type = ? AND stale_timestamp IS NULL AND is_last_resort = FALSE
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setLong(1, staleTime);
+                statement.setInt(2, accountIdType);
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update kyber_pre_key store", e);
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacyPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacyPreKeyStore.java
new file mode 100644
index 00000000..c2c236df
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacyPreKeyStore.java
@@ -0,0 +1,61 @@
+package org.asamk.signal.manager.storage.prekeys;
+
+import org.signal.libsignal.protocol.InvalidMessageException;
+import org.signal.libsignal.protocol.state.PreKeyRecord;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.regex.Pattern;
+
+public class LegacyPreKeyStore {
+
+    private static final Logger logger = LoggerFactory.getLogger(LegacyPreKeyStore.class);
+    static final Pattern preKeyFileNamePattern = Pattern.compile("(\\d+)");
+
+    public static void migrate(File preKeysPath, PreKeyStore preKeyStore) {
+        final var files = preKeysPath.listFiles();
+        if (files == null) {
+            return;
+        }
+        final var preKeyRecords = Arrays.stream(files)
+                .filter(f -> preKeyFileNamePattern.matcher(f.getName()).matches())
+                .map(LegacyPreKeyStore::loadPreKeyRecord)
+                .toList();
+        preKeyStore.addLegacyPreKeys(preKeyRecords);
+        removeAllPreKeys(preKeysPath);
+    }
+
+    private static void removeAllPreKeys(File preKeysPath) {
+        final var files = preKeysPath.listFiles();
+        if (files == null) {
+            return;
+        }
+
+        for (var file : files) {
+            try {
+                Files.delete(file.toPath());
+            } catch (IOException e) {
+                logger.error("Failed to delete pre key file {}: {}", file, e.getMessage());
+            }
+        }
+        try {
+            Files.delete(preKeysPath.toPath());
+        } catch (IOException e) {
+            logger.error("Failed to delete pre key directory {}: {}", preKeysPath, e.getMessage());
+        }
+    }
+
+    private static PreKeyRecord loadPreKeyRecord(final File file) {
+        try (var inputStream = new FileInputStream(file)) {
+            return new PreKeyRecord(inputStream.readAllBytes());
+        } catch (IOException | InvalidMessageException e) {
+            logger.error("Failed to load pre key: {}", e.getMessage());
+            throw new AssertionError(e);
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacySignedPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacySignedPreKeyStore.java
new file mode 100644
index 00000000..a7133223
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacySignedPreKeyStore.java
@@ -0,0 +1,61 @@
+package org.asamk.signal.manager.storage.prekeys;
+
+import org.signal.libsignal.protocol.InvalidMessageException;
+import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.regex.Pattern;
+
+public class LegacySignedPreKeyStore {
+
+    private static final Logger logger = LoggerFactory.getLogger(LegacySignedPreKeyStore.class);
+    static final Pattern signedPreKeyFileNamePattern = Pattern.compile("(\\d+)");
+
+    public static void migrate(File signedPreKeysPath, SignedPreKeyStore signedPreKeyStore) {
+        final var files = signedPreKeysPath.listFiles();
+        if (files == null) {
+            return;
+        }
+        final var signedPreKeyRecords = Arrays.stream(files)
+                .filter(f -> signedPreKeyFileNamePattern.matcher(f.getName()).matches())
+                .map(LegacySignedPreKeyStore::loadSignedPreKeyRecord)
+                .toList();
+        signedPreKeyStore.addLegacySignedPreKeys(signedPreKeyRecords);
+        removeAllSignedPreKeys(signedPreKeysPath);
+    }
+
+    private static void removeAllSignedPreKeys(File signedPreKeysPath) {
+        final var files = signedPreKeysPath.listFiles();
+        if (files == null) {
+            return;
+        }
+
+        for (var file : files) {
+            try {
+                Files.delete(file.toPath());
+            } catch (IOException e) {
+                logger.error("Failed to delete signed pre key file {}: {}", file, e.getMessage());
+            }
+        }
+        try {
+            Files.delete(signedPreKeysPath.toPath());
+        } catch (IOException e) {
+            logger.error("Failed to delete signed pre key directory {}: {}", signedPreKeysPath, e.getMessage());
+        }
+    }
+
+    private static SignedPreKeyRecord loadSignedPreKeyRecord(final File file) {
+        try (var inputStream = new FileInputStream(file)) {
+            return new SignedPreKeyRecord(inputStream.readAllBytes());
+        } catch (IOException | InvalidMessageException e) {
+            logger.error("Failed to load signed pre key: {}", e.getMessage());
+            throw new AssertionError(e);
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
index 020c9109..8e8bd2ab 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
@@ -1,105 +1,241 @@
 package org.asamk.signal.manager.storage.prekeys;
 
-import org.asamk.signal.manager.util.IOUtils;
+import org.asamk.signal.manager.storage.Database;
+import org.asamk.signal.manager.storage.Utils;
+import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.InvalidKeyIdException;
-import org.signal.libsignal.protocol.InvalidMessageException;
+import org.signal.libsignal.protocol.ecc.ECKeyPair;
+import org.signal.libsignal.protocol.ecc.ECPrivateKey;
+import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.signal.libsignal.protocol.state.PreKeyRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.SignalServicePreKeyStore;
+import org.whispersystems.signalservice.api.push.ServiceIdType;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collection;
 
-public class PreKeyStore implements org.signal.libsignal.protocol.state.PreKeyStore {
+public class PreKeyStore implements SignalServicePreKeyStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(PreKeyStore.class);
+    private static final String TABLE_PRE_KEY = "pre_key";
+    private static final Logger logger = LoggerFactory.getLogger(PreKeyStore.class);
 
-    private final File preKeysPath;
+    private final Database database;
+    private final int accountIdType;
 
-    public PreKeyStore(final File preKeysPath) {
-        this.preKeysPath = preKeysPath;
+    public static void createSql(Connection connection) throws SQLException {
+        // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
+        try (final var statement = connection.createStatement()) {
+            statement.executeUpdate("""
+                                    CREATE TABLE pre_key (
+                                      _id INTEGER PRIMARY KEY,
+                                      account_id_type INTEGER NOT NULL,
+                                      key_id INTEGER NOT NULL,
+                                      public_key BLOB NOT NULL,
+                                      private_key BLOB NOT NULL,
+                                      stale_timestamp INTEGER,
+                                      UNIQUE(account_id_type, key_id)
+                                    ) STRICT;
+                                    """);
+        }
+    }
+
+    public PreKeyStore(final Database database, final ServiceIdType serviceIdType) {
+        this.database = database;
+        this.accountIdType = Utils.getAccountIdType(serviceIdType);
     }
 
     @Override
     public PreKeyRecord loadPreKey(int preKeyId) throws InvalidKeyIdException {
-        final var file = getPreKeyFile(preKeyId);
-
-        if (!file.exists()) {
-            throw new InvalidKeyIdException("No such pre key record!");
-        }
-        try (var inputStream = new FileInputStream(file)) {
-            return new PreKeyRecord(inputStream.readAllBytes());
-        } catch (IOException | InvalidMessageException e) {
-            logger.error("Failed to load pre key: {}", e.getMessage());
-            throw new AssertionError(e);
+        final var preKey = getPreKey(preKeyId);
+        if (preKey == null) {
+            throw new InvalidKeyIdException("No such pre key record: " + preKeyId);
         }
+        return preKey;
     }
 
     @Override
     public void storePreKey(int preKeyId, PreKeyRecord record) {
-        final var file = getPreKeyFile(preKeyId);
-        try {
-            try (var outputStream = new FileOutputStream(file)) {
-                outputStream.write(record.serialize());
-            }
-        } catch (IOException e) {
-            logger.warn("Failed to store pre key, trying to delete file and retry: {}", e.getMessage());
-            try {
-                Files.delete(file.toPath());
-                try (var outputStream = new FileOutputStream(file)) {
-                    outputStream.write(record.serialize());
-                }
-            } catch (IOException e2) {
-                logger.error("Failed to store pre key file {}: {}", file, e2.getMessage());
+        final var sql = (
+                """
+                INSERT INTO %s (account_id_type, key_id, public_key, private_key)
+                VALUES (?, ?, ?, ?)
+                """
+        ).formatted(TABLE_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setInt(2, preKeyId);
+                final var keyPair = record.getKeyPair();
+                statement.setBytes(3, keyPair.getPublicKey().serialize());
+                statement.setBytes(4, keyPair.getPrivateKey().serialize());
+                statement.executeUpdate();
+            } catch (InvalidKeyException ignored) {
             }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update pre_key store", e);
         }
     }
 
     @Override
     public boolean containsPreKey(int preKeyId) {
-        final var file = getPreKeyFile(preKeyId);
-
-        return file.exists();
+        return getPreKey(preKeyId) != null;
     }
 
     @Override
     public void removePreKey(int preKeyId) {
-        final var file = getPreKeyFile(preKeyId);
-
-        if (!file.exists()) {
-            return;
-        }
-        try {
-            Files.delete(file.toPath());
-        } catch (IOException e) {
-            logger.error("Failed to delete pre key file {}: {}", file, e.getMessage());
+        final var sql = (
+                """
+                DELETE FROM %s AS p
+                WHERE p.account_id_type = ? AND p.key_id = ?
+                """
+        ).formatted(TABLE_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setInt(2, preKeyId);
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update pre_key store", e);
         }
     }
 
     public void removeAllPreKeys() {
-        final var files = preKeysPath.listFiles();
-        if (files == null) {
-            return;
-        }
-
-        for (var file : files) {
-            try {
-                Files.delete(file.toPath());
-            } catch (IOException e) {
-                logger.error("Failed to delete pre key file {}: {}", file, e.getMessage());
+        final var sql = (
+                """
+                DELETE FROM %s AS p
+                WHERE p.account_id_type = ?
+                """
+        ).formatted(TABLE_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.executeUpdate();
             }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update pre_key store", e);
         }
     }
 
-    private File getPreKeyFile(int preKeyId) {
-        try {
-            IOUtils.createPrivateDirectories(preKeysPath);
-        } catch (IOException e) {
-            throw new AssertionError("Failed to create pre keys path", e);
+    void addLegacyPreKeys(final Collection<PreKeyRecord> preKeys) {
+        logger.debug("Migrating legacy preKeys to database");
+        long start = System.nanoTime();
+        final var sql = (
+                """
+                INSERT INTO %s (account_id_type, key_id, public_key, private_key)
+                VALUES (?, ?, ?, ?)
+                """
+        ).formatted(TABLE_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            final var deleteSql = "DELETE FROM %s AS p WHERE p.account_id_type = ?".formatted(TABLE_PRE_KEY);
+            try (final var statement = connection.prepareStatement(deleteSql)) {
+                statement.setInt(1, accountIdType);
+                statement.executeUpdate();
+            }
+            try (final var statement = connection.prepareStatement(sql)) {
+                for (final var record : preKeys) {
+                    statement.setInt(1, accountIdType);
+                    statement.setInt(2, record.getId());
+                    final var keyPair = record.getKeyPair();
+                    statement.setBytes(3, keyPair.getPublicKey().serialize());
+                    statement.setBytes(4, keyPair.getPrivateKey().serialize());
+                    statement.executeUpdate();
+                }
+            } catch (InvalidKeyException ignored) {
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update preKey store", e);
+        }
+        logger.debug("Complete preKeys migration took {}ms", (System.nanoTime() - start) / 1000000);
+    }
+
+    private PreKeyRecord getPreKey(int preKeyId) {
+        final var sql = (
+                """
+                SELECT p.key_id, p.public_key, p.private_key
+                FROM %s p
+                WHERE p.account_id_type = ? AND p.key_id = ?
+                """
+        ).formatted(TABLE_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setInt(2, preKeyId);
+                return Utils.executeQueryForOptional(statement, this::getPreKeyRecordFromResultSet).orElse(null);
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from pre_key store", e);
+        }
+    }
+
+    private PreKeyRecord getPreKeyRecordFromResultSet(ResultSet resultSet) throws SQLException {
+        try {
+            final var keyId = resultSet.getInt("key_id");
+            final var publicKey = new ECPublicKey(resultSet.getBytes("public_key"));
+            final var privateKey = new ECPrivateKey(resultSet.getBytes("private_key"));
+            return new PreKeyRecord(keyId, new ECKeyPair(publicKey, privateKey));
+        } catch (InvalidKeyException e) {
+            return null;
+        }
+    }
+
+    @Override
+    public void deleteAllStaleOneTimeEcPreKeys(final long threshold, final int minCount) {
+        final var sql = (
+                """
+                DELETE FROM %s AS p
+                WHERE p.account_id_type = ?1
+                    AND p.stale_timestamp < ?2
+                    AND p._id NOT IN (
+                        SELECT _id
+                        FROM %s AS p2
+                        WHERE p2.account_id_type = ?1
+                        ORDER BY
+                          CASE WHEN p2.stale_timestamp IS NULL THEN 1 ELSE 0 END DESC,
+                          p2.stale_timestamp DESC,
+                          p2._id DESC
+                        LIMIT ?3
+                    )
+                """
+        ).formatted(TABLE_PRE_KEY, TABLE_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setLong(2, threshold);
+                statement.setInt(3, minCount);
+                final var rowCount = statement.executeUpdate();
+                if (rowCount > 0) {
+                    logger.debug("Deleted {} stale one time pre keys", rowCount);
+                }
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update pre_key store", e);
+        }
+    }
+
+    @Override
+    public void markAllOneTimeEcPreKeysStaleIfNecessary(final long staleTime) {
+        final var sql = (
+                """
+                UPDATE %s
+                SET stale_timestamp = ?
+                WHERE account_id_type = ? AND stale_timestamp IS NULL
+                """
+        ).formatted(TABLE_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setLong(1, staleTime);
+                statement.setInt(2, accountIdType);
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update pre_key store", e);
         }
-        return new File(preKeysPath, String.valueOf(preKeyId));
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
index bacc9f3b..4644c3ba 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
@@ -1,126 +1,251 @@
 package org.asamk.signal.manager.storage.prekeys;
 
-import org.asamk.signal.manager.util.IOUtils;
+import org.asamk.signal.manager.storage.Database;
+import org.asamk.signal.manager.storage.Utils;
+import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.InvalidKeyIdException;
-import org.signal.libsignal.protocol.InvalidMessageException;
+import org.signal.libsignal.protocol.ecc.ECKeyPair;
+import org.signal.libsignal.protocol.ecc.ECPrivateKey;
+import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.ServiceIdType;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Arrays;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collection;
 import java.util.List;
-import java.util.regex.Pattern;
+import java.util.Objects;
+
+import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_ARCHIVE_AGE;
 
 public class SignedPreKeyStore implements org.signal.libsignal.protocol.state.SignedPreKeyStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(SignedPreKeyStore.class);
+    private static final String TABLE_SIGNED_PRE_KEY = "signed_pre_key";
+    private static final Logger logger = LoggerFactory.getLogger(SignedPreKeyStore.class);
 
-    private final File signedPreKeysPath;
+    private final Database database;
+    private final int accountIdType;
 
-    public SignedPreKeyStore(final File signedPreKeysPath) {
-        this.signedPreKeysPath = signedPreKeysPath;
+    public static void createSql(Connection connection) throws SQLException {
+        // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
+        try (final var statement = connection.createStatement()) {
+            statement.executeUpdate("""
+                                    CREATE TABLE signed_pre_key (
+                                      _id INTEGER PRIMARY KEY,
+                                      account_id_type INTEGER NOT NULL,
+                                      key_id INTEGER NOT NULL,
+                                      public_key BLOB NOT NULL,
+                                      private_key BLOB NOT NULL,
+                                      signature BLOB NOT NULL,
+                                      timestamp INTEGER DEFAULT 0,
+                                      UNIQUE(account_id_type, key_id)
+                                    ) STRICT;
+                                    """);
+        }
+    }
+
+    public SignedPreKeyStore(final Database database, final ServiceIdType serviceIdType) {
+        this.database = database;
+        this.accountIdType = Utils.getAccountIdType(serviceIdType);
     }
 
     @Override
     public SignedPreKeyRecord loadSignedPreKey(int signedPreKeyId) throws InvalidKeyIdException {
-        final var file = getSignedPreKeyFile(signedPreKeyId);
-
-        if (!file.exists()) {
-            throw new InvalidKeyIdException("No such signed pre key record!");
+        final SignedPreKeyRecord signedPreKeyRecord = getSignedPreKey(signedPreKeyId);
+        if (signedPreKeyRecord == null) {
+            throw new InvalidKeyIdException("No such signed pre key record: " + signedPreKeyId);
         }
-        return loadSignedPreKeyRecord(file);
+        return signedPreKeyRecord;
     }
 
-    final Pattern signedPreKeyFileNamePattern = Pattern.compile("(\\d+)");
-
     @Override
     public List<SignedPreKeyRecord> loadSignedPreKeys() {
-        final var files = signedPreKeysPath.listFiles();
-        if (files == null) {
-            return List.of();
+        final var sql = (
+                """
+                SELECT p.key_id, p.public_key, p.private_key, p.signature, p.timestamp
+                FROM %s p
+                WHERE p.account_id_type = ?
+                """
+        ).formatted(TABLE_SIGNED_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                return Utils.executeQueryForStream(statement, this::getSignedPreKeyRecordFromResultSet)
+                        .filter(Objects::nonNull)
+                        .toList();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from signed_pre_key store", e);
         }
-        return Arrays.stream(files)
-                .filter(f -> signedPreKeyFileNamePattern.matcher(f.getName()).matches())
-                .map(this::loadSignedPreKeyRecord)
-                .toList();
     }
 
     @Override
     public void storeSignedPreKey(int signedPreKeyId, SignedPreKeyRecord record) {
-        final var file = getSignedPreKeyFile(signedPreKeyId);
-        try {
-            try (var outputStream = new FileOutputStream(file)) {
-                outputStream.write(record.serialize());
-            }
-        } catch (IOException e) {
-            logger.warn("Failed to store signed pre key, trying to delete file and retry: {}", e.getMessage());
-            try {
-                Files.delete(file.toPath());
-                try (var outputStream = new FileOutputStream(file)) {
-                    outputStream.write(record.serialize());
+        final var sql = (
+                """
+                INSERT INTO %s (account_id_type, key_id, public_key, private_key, signature, timestamp)
+                VALUES (?, ?, ?, ?, ?, ?)
+                """
+        ).formatted(TABLE_SIGNED_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setInt(2, signedPreKeyId);
+                try {
+                    final var keyPair = record.getKeyPair();
+                    statement.setBytes(3, keyPair.getPublicKey().serialize());
+                    statement.setBytes(4, keyPair.getPrivateKey().serialize());
+                } catch (InvalidKeyException e) {
+                    throw new AssertionError("unexpected invalid key", e);
                 }
-            } catch (IOException e2) {
-                logger.error("Failed to store signed pre key file {}: {}", file, e2.getMessage());
+                statement.setBytes(5, record.getSignature());
+                statement.setLong(6, record.getTimestamp());
+                statement.executeUpdate();
             }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update signed_pre_key store", e);
         }
     }
 
     @Override
     public boolean containsSignedPreKey(int signedPreKeyId) {
-        final var file = getSignedPreKeyFile(signedPreKeyId);
-
-        return file.exists();
+        return getSignedPreKey(signedPreKeyId) != null;
     }
 
     @Override
     public void removeSignedPreKey(int signedPreKeyId) {
-        final var file = getSignedPreKeyFile(signedPreKeyId);
-
-        if (!file.exists()) {
-            return;
-        }
-        try {
-            Files.delete(file.toPath());
-        } catch (IOException e) {
-            logger.error("Failed to delete signed pre key file {}: {}", file, e.getMessage());
+        final var sql = (
+                """
+                DELETE FROM %s AS p
+                WHERE p.account_id_type = ? AND p.key_id = ?
+                """
+        ).formatted(TABLE_SIGNED_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setInt(2, signedPreKeyId);
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update signed_pre_key store", e);
         }
     }
 
     public void removeAllSignedPreKeys() {
-        final var files = signedPreKeysPath.listFiles();
-        if (files == null) {
-            return;
-        }
-
-        for (var file : files) {
-            try {
-                Files.delete(file.toPath());
-            } catch (IOException e) {
-                logger.error("Failed to delete signed pre key file {}: {}", file, e.getMessage());
+        final var sql = (
+                """
+                DELETE FROM %s AS p
+                WHERE p.account_id_type = ?
+                """
+        ).formatted(TABLE_SIGNED_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.executeUpdate();
             }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update signed_pre_key store", e);
         }
     }
 
-    private File getSignedPreKeyFile(int signedPreKeyId) {
+    public void removeOldSignedPreKeys(int activePreKeyId) {
+        final var sql = (
+                """
+                DELETE FROM %s AS p
+                WHERE p._id IN (
+                    SELECT p._id
+                    FROM %s AS p
+                    WHERE p.account_id_type = ?
+                        AND p.key_id != ?
+                        AND p.timestamp < ?
+                    ORDER BY p.timestamp DESC
+                    LIMIT -1 OFFSET 1
+                )
+                """
+        ).formatted(TABLE_SIGNED_PRE_KEY, TABLE_SIGNED_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setInt(2, activePreKeyId);
+                statement.setLong(3, System.currentTimeMillis() - PREKEY_ARCHIVE_AGE);
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update signed_pre_key store", e);
+        }
+    }
+
+    void addLegacySignedPreKeys(final Collection<SignedPreKeyRecord> signedPreKeys) {
+        logger.debug("Migrating legacy signedPreKeys to database");
+        long start = System.nanoTime();
+        final var sql = (
+                """
+                INSERT INTO %s (account_id_type, key_id, public_key, private_key, signature, timestamp)
+                VALUES (?, ?, ?, ?, ?, ?)
+                """
+        ).formatted(TABLE_SIGNED_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            final var deleteSql = "DELETE FROM %s AS p WHERE p.account_id_type = ?".formatted(TABLE_SIGNED_PRE_KEY);
+            try (final var statement = connection.prepareStatement(deleteSql)) {
+                statement.setInt(1, accountIdType);
+                statement.executeUpdate();
+            }
+            try (final var statement = connection.prepareStatement(sql)) {
+                for (final var record : signedPreKeys) {
+                    statement.setInt(1, accountIdType);
+                    statement.setInt(2, record.getId());
+                    try {
+                        final var keyPair = record.getKeyPair();
+                        statement.setBytes(3, keyPair.getPublicKey().serialize());
+                        statement.setBytes(4, keyPair.getPrivateKey().serialize());
+                    } catch (InvalidKeyException e) {
+                        throw new AssertionError("unexpected invalid key", e);
+                    }
+                    statement.setBytes(5, record.getSignature());
+                    statement.setLong(6, record.getTimestamp());
+                    statement.executeUpdate();
+                }
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update signedPreKey store", e);
+        }
+        logger.debug("Complete signedPreKeys migration took {}ms", (System.nanoTime() - start) / 1000000);
+    }
+
+    private SignedPreKeyRecord getSignedPreKey(int signedPreKeyId) {
+        final var sql = (
+                """
+                SELECT p.key_id, p.public_key, p.private_key, p.signature, p.timestamp
+                FROM %s p
+                WHERE p.account_id_type = ? AND p.key_id = ?
+                """
+        ).formatted(TABLE_SIGNED_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setInt(2, signedPreKeyId);
+                return Utils.executeQueryForOptional(statement, this::getSignedPreKeyRecordFromResultSet).orElse(null);
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from signed_pre_key store", e);
+        }
+    }
+
+    private SignedPreKeyRecord getSignedPreKeyRecordFromResultSet(ResultSet resultSet) throws SQLException {
         try {
-            IOUtils.createPrivateDirectories(signedPreKeysPath);
-        } catch (IOException e) {
-            throw new AssertionError("Failed to create signed pre keys path", e);
-        }
-        return new File(signedPreKeysPath, String.valueOf(signedPreKeyId));
-    }
-
-    private SignedPreKeyRecord loadSignedPreKeyRecord(final File file) {
-        try (var inputStream = new FileInputStream(file)) {
-            return new SignedPreKeyRecord(inputStream.readAllBytes());
-        } catch (IOException | InvalidMessageException e) {
-            logger.error("Failed to load signed pre key: {}", e.getMessage());
-            throw new AssertionError(e);
+            final var keyId = resultSet.getInt("key_id");
+            final var publicKey = new ECPublicKey(resultSet.getBytes("public_key"));
+            final var privateKey = new ECPrivateKey(resultSet.getBytes("private_key"));
+            final var signature = resultSet.getBytes("signature");
+            final var timestamp = resultSet.getLong("timestamp");
+            return new SignedPreKeyRecord(keyId, timestamp, new ECKeyPair(publicKey, privateKey), signature);
+        } catch (InvalidKeyException e) {
+            return null;
         }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java
index b3aa4f8c..39d6b7fb 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java
@@ -11,8 +11,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
-import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential;
-import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.signalservice.api.push.ServiceId;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -35,7 +34,8 @@ public class LegacyProfileStore {
 
         @Override
         public List<LegacySignalProfileEntry> deserialize(
-                JsonParser jsonParser, DeserializationContext deserializationContext
+                JsonParser jsonParser,
+                DeserializationContext deserializationContext
         ) throws IOException {
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
@@ -44,28 +44,18 @@ public class LegacyProfileStore {
             if (node.isArray()) {
                 for (var entry : node) {
                     var name = entry.hasNonNull("name") ? entry.get("name").asText() : null;
-                    var uuid = entry.hasNonNull("uuid") ? UuidUtil.parseOrNull(entry.get("uuid").asText()) : null;
-                    final var address = new RecipientAddress(uuid, name);
+                    var serviceId = entry.hasNonNull("uuid")
+                            ? ServiceId.ACI.parseOrNull(entry.get("uuid").asText())
+                            : null;
+                    final var address = new RecipientAddress(serviceId, name);
                     ProfileKey profileKey = null;
                     try {
                         profileKey = new ProfileKey(Base64.getDecoder().decode(entry.get("profileKey").asText()));
                     } catch (InvalidInputException ignored) {
                     }
-                    ProfileKeyCredential profileKeyCredential = null;
-                    if (entry.hasNonNull("profileKeyCredential")) {
-                        try {
-                            profileKeyCredential = new ProfileKeyCredential(Base64.getDecoder()
-                                    .decode(entry.get("profileKeyCredential").asText()));
-                        } catch (Throwable ignored) {
-                        }
-                    }
                     var lastUpdateTimestamp = entry.get("lastUpdateTimestamp").asLong();
-                    var profile = jsonProcessor.treeToValue(entry.get("profile"), SignalProfile.class);
-                    profileEntries.add(new LegacySignalProfileEntry(address,
-                            profileKey,
-                            lastUpdateTimestamp,
-                            profile,
-                            profileKeyCredential));
+                    var profile = jsonProcessor.treeToValue(entry.get("profile"), LegacySignalProfile.class);
+                    profileEntries.add(new LegacySignalProfileEntry(address, profileKey, lastUpdateTimestamp, profile));
                 }
             }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfile.java
similarity index 94%
rename from lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java
rename to lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfile.java
index ed5f0160..4114df60 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfile.java
@@ -3,7 +3,7 @@ package org.asamk.signal.manager.storage.profiles;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class SignalProfile {
+public class LegacySignalProfile {
 
     @JsonProperty
     @JsonIgnore
@@ -27,7 +27,7 @@ public class SignalProfile {
     @JsonProperty
     private final Capabilities capabilities;
 
-    public SignalProfile(
+    public LegacySignalProfile(
             @JsonProperty("name") final String name,
             @JsonProperty("about") final String about,
             @JsonProperty("aboutEmoji") final String aboutEmoji,
@@ -88,10 +88,13 @@ public class SignalProfile {
         @JsonIgnore
         public boolean uuid;
 
+        @JsonIgnore
+        public boolean gv2;
+
         @JsonProperty
         public boolean storage;
 
-        @JsonProperty
+        @JsonIgnore
         public boolean gv1Migration;
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java
index 7571146e..d4a81183 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java
@@ -2,51 +2,7 @@ package org.asamk.signal.manager.storage.profiles;
 
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
-import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential;
 
-public class LegacySignalProfileEntry {
-
-    private final RecipientAddress address;
-
-    private final ProfileKey profileKey;
-
-    private final long lastUpdateTimestamp;
-
-    private final SignalProfile profile;
-
-    private final ProfileKeyCredential profileKeyCredential;
-
-    public LegacySignalProfileEntry(
-            final RecipientAddress address,
-            final ProfileKey profileKey,
-            final long lastUpdateTimestamp,
-            final SignalProfile profile,
-            final ProfileKeyCredential profileKeyCredential
-    ) {
-        this.address = address;
-        this.profileKey = profileKey;
-        this.lastUpdateTimestamp = lastUpdateTimestamp;
-        this.profile = profile;
-        this.profileKeyCredential = profileKeyCredential;
-    }
-
-    public RecipientAddress getAddress() {
-        return address;
-    }
-
-    public ProfileKey getProfileKey() {
-        return profileKey;
-    }
-
-    public long getLastUpdateTimestamp() {
-        return lastUpdateTimestamp;
-    }
-
-    public SignalProfile getProfile() {
-        return profile;
-    }
-
-    public ProfileKeyCredential getProfileKeyCredential() {
-        return profileKeyCredential;
-    }
-}
+public record LegacySignalProfileEntry(
+        RecipientAddress address, ProfileKey profileKey, long lastUpdateTimestamp, LegacySignalProfile profile
+) {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java
index df65db0d..ec91a628 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java
@@ -1,9 +1,9 @@
 package org.asamk.signal.manager.storage.profiles;
 
-import org.asamk.signal.manager.storage.recipients.Profile;
+import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
+import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
-import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential;
 
 public interface ProfileStore {
 
@@ -11,13 +11,14 @@ public interface ProfileStore {
 
     ProfileKey getProfileKey(RecipientId recipientId);
 
-    ProfileKeyCredential getProfileKeyCredential(RecipientId recipientId);
+    ExpiringProfileKeyCredential getExpiringProfileKeyCredential(RecipientId recipientId);
 
     void storeProfile(RecipientId recipientId, Profile profile);
 
-    void storeSelfProfileKey(RecipientId recipientId, ProfileKey profileKey);
-
     void storeProfileKey(RecipientId recipientId, ProfileKey profileKey);
 
-    void storeProfileKeyCredential(RecipientId recipientId, ProfileKeyCredential profileKeyCredential);
+    void storeExpiringProfileKeyCredential(
+            RecipientId recipientId,
+            ExpiringProfileKeyCredential expiringProfileKeyCredential
+    );
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyIdentityInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyIdentityInfo.java
index 85ebcd2b..0d555291 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyIdentityInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyIdentityInfo.java
@@ -9,9 +9,9 @@ import java.util.Date;
 public class LegacyIdentityInfo {
 
     RecipientAddress address;
-    IdentityKey identityKey;
-    TrustLevel trustLevel;
-    Date added;
+    final IdentityKey identityKey;
+    final TrustLevel trustLevel;
+    final Date added;
 
     LegacyIdentityInfo(RecipientAddress address, IdentityKey identityKey, TrustLevel trustLevel, Date added) {
         this.address = address;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
index de5062e4..632efc7e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
@@ -13,6 +13,7 @@ import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.io.IOException;
@@ -24,14 +25,16 @@ import java.util.stream.Collectors;
 
 public class LegacyJsonIdentityKeyStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(LegacyJsonIdentityKeyStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(LegacyJsonIdentityKeyStore.class);
 
     private final List<LegacyIdentityInfo> identities;
     private final IdentityKeyPair identityKeyPair;
     private final int localRegistrationId;
 
     private LegacyJsonIdentityKeyStore(
-            final List<LegacyIdentityInfo> identities, IdentityKeyPair identityKeyPair, int localRegistrationId
+            final List<LegacyIdentityInfo> identities,
+            IdentityKeyPair identityKeyPair,
+            int localRegistrationId
     ) {
         this.identities = identities;
         this.identityKeyPair = identityKeyPair;
@@ -76,7 +79,8 @@ public class LegacyJsonIdentityKeyStore {
 
         @Override
         public LegacyJsonIdentityKeyStore deserialize(
-                JsonParser jsonParser, DeserializationContext deserializationContext
+                JsonParser jsonParser,
+                DeserializationContext deserializationContext
         ) throws IOException {
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
@@ -99,8 +103,8 @@ public class LegacyJsonIdentityKeyStore {
                             ? UuidUtil.parseOrNull(trustedKey.get("uuid").asText())
                             : null;
                     final var address = uuid == null
-                            ? Utils.getRecipientAddressFromIdentifier(trustedKeyName)
-                            : new RecipientAddress(uuid, trustedKeyName);
+                            ? Utils.getRecipientAddressFromLegacyIdentifier(trustedKeyName)
+                            : new RecipientAddress(ACI.from(uuid), trustedKeyName);
                     try {
                         var id = new IdentityKey(Base64.getDecoder().decode(trustedKey.get("identityKey").asText()), 0);
                         var trustLevel = trustedKey.hasNonNull("trustLevel") ? TrustLevel.fromInt(trustedKey.get(
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonPreKeyStore.java
index 7412f95a..feb27e97 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonPreKeyStore.java
@@ -26,7 +26,8 @@ public class LegacyJsonPreKeyStore {
 
         @Override
         public LegacyJsonPreKeyStore deserialize(
-                JsonParser jsonParser, DeserializationContext deserializationContext
+                JsonParser jsonParser,
+                DeserializationContext deserializationContext
         ) throws IOException {
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java
index 9ee0cf87..b971078c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 
 import org.asamk.signal.manager.storage.Utils;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.io.IOException;
@@ -30,7 +31,8 @@ public class LegacyJsonSessionStore {
 
         @Override
         public LegacyJsonSessionStore deserialize(
-                JsonParser jsonParser, DeserializationContext deserializationContext
+                JsonParser jsonParser,
+                DeserializationContext deserializationContext
         ) throws IOException {
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
@@ -46,8 +48,8 @@ public class LegacyJsonSessionStore {
 
                     var uuid = session.hasNonNull("uuid") ? UuidUtil.parseOrNull(session.get("uuid").asText()) : null;
                     final var address = uuid == null
-                            ? Utils.getRecipientAddressFromIdentifier(sessionName)
-                            : new RecipientAddress(uuid, sessionName);
+                            ? Utils.getRecipientAddressFromLegacyIdentifier(sessionName)
+                            : new RecipientAddress(ACI.from(uuid), sessionName);
                     final var deviceId = session.get("deviceId").asInt();
                     final var record = Base64.getDecoder().decode(session.get("record").asText());
                     var sessionInfo = new LegacySessionInfo(address, deviceId, record);
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSignedPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSignedPreKeyStore.java
index cdcba916..ed1b5d95 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSignedPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSignedPreKeyStore.java
@@ -26,7 +26,8 @@ public class LegacyJsonSignedPreKeyStore {
 
         @Override
         public LegacyJsonSignedPreKeyStore deserialize(
-                JsonParser jsonParser, DeserializationContext deserializationContext
+                JsonParser jsonParser,
+                DeserializationContext deserializationContext
         ) throws IOException {
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacySessionInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacySessionInfo.java
index 2cb984fb..c6097cd9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacySessionInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacySessionInfo.java
@@ -4,11 +4,11 @@ import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 
 public class LegacySessionInfo {
 
-    public RecipientAddress address;
+    public final RecipientAddress address;
 
-    public int deviceId;
+    public final int deviceId;
 
-    public byte[] sessionRecord;
+    public final byte[] sessionRecord;
 
     LegacySessionInfo(final RecipientAddress address, final int deviceId, final byte[] sessionRecord) {
         this.address = address;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
index f804bc6d..e1cf9a88 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
@@ -7,34 +7,39 @@ import org.signal.libsignal.protocol.NoSessionException;
 import org.signal.libsignal.protocol.SignalProtocolAddress;
 import org.signal.libsignal.protocol.groups.state.SenderKeyRecord;
 import org.signal.libsignal.protocol.state.IdentityKeyStore;
+import org.signal.libsignal.protocol.state.KyberPreKeyRecord;
 import org.signal.libsignal.protocol.state.PreKeyRecord;
-import org.signal.libsignal.protocol.state.PreKeyStore;
 import org.signal.libsignal.protocol.state.SessionRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyStore;
 import org.whispersystems.signalservice.api.SignalServiceAccountDataStore;
+import org.whispersystems.signalservice.api.SignalServiceKyberPreKeyStore;
+import org.whispersystems.signalservice.api.SignalServicePreKeyStore;
 import org.whispersystems.signalservice.api.SignalServiceSenderKeyStore;
 import org.whispersystems.signalservice.api.SignalServiceSessionStore;
 import org.whispersystems.signalservice.api.push.DistributionId;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.function.Supplier;
 
 public class SignalProtocolStore implements SignalServiceAccountDataStore {
 
-    private final PreKeyStore preKeyStore;
+    private final SignalServicePreKeyStore preKeyStore;
     private final SignedPreKeyStore signedPreKeyStore;
+    private final SignalServiceKyberPreKeyStore kyberPreKeyStore;
     private final SignalServiceSessionStore sessionStore;
     private final IdentityKeyStore identityKeyStore;
     private final SignalServiceSenderKeyStore senderKeyStore;
     private final Supplier<Boolean> isMultiDevice;
 
     public SignalProtocolStore(
-            final PreKeyStore preKeyStore,
+            final SignalServicePreKeyStore preKeyStore,
             final SignedPreKeyStore signedPreKeyStore,
+            final SignalServiceKyberPreKeyStore kyberPreKeyStore,
             final SignalServiceSessionStore sessionStore,
             final IdentityKeyStore identityKeyStore,
             final SignalServiceSenderKeyStore senderKeyStore,
@@ -42,6 +47,7 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
     ) {
         this.preKeyStore = preKeyStore;
         this.signedPreKeyStore = signedPreKeyStore;
+        this.kyberPreKeyStore = kyberPreKeyStore;
         this.sessionStore = sessionStore;
         this.identityKeyStore = identityKeyStore;
         this.senderKeyStore = senderKeyStore;
@@ -59,7 +65,7 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
     }
 
     @Override
-    public boolean saveIdentity(SignalProtocolAddress address, IdentityKey identityKey) {
+    public IdentityChange saveIdentity(SignalProtocolAddress address, IdentityKey identityKey) {
         return identityKeyStore.saveIdentity(address, identityKey);
     }
 
@@ -135,7 +141,7 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
     }
 
     @Override
-    public Set<SignalProtocolAddress> getAllAddressesWithActiveSessions(final List<String> addressNames) {
+    public Map<SignalProtocolAddress, SessionRecord> getAllAddressesWithActiveSessions(final List<String> addressNames) {
         return sessionStore.getAllAddressesWithActiveSessions(addressNames);
     }
 
@@ -166,7 +172,9 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
 
     @Override
     public void storeSenderKey(
-            final SignalProtocolAddress sender, final UUID distributionId, final SenderKeyRecord record
+            final SignalProtocolAddress sender,
+            final UUID distributionId,
+            final SenderKeyRecord record
     ) {
         senderKeyStore.storeSenderKey(sender, distributionId, record);
     }
@@ -183,7 +191,8 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
 
     @Override
     public void markSenderKeySharedWith(
-            final DistributionId distributionId, final Collection<SignalProtocolAddress> addresses
+            final DistributionId distributionId,
+            final Collection<SignalProtocolAddress> addresses
     ) {
         senderKeyStore.markSenderKeySharedWith(distributionId, addresses);
     }
@@ -197,4 +206,64 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
     public boolean isMultiDevice() {
         return isMultiDevice.get();
     }
+
+    @Override
+    public KyberPreKeyRecord loadKyberPreKey(final int kyberPreKeyId) throws InvalidKeyIdException {
+        return kyberPreKeyStore.loadKyberPreKey(kyberPreKeyId);
+    }
+
+    @Override
+    public List<KyberPreKeyRecord> loadKyberPreKeys() {
+        return kyberPreKeyStore.loadKyberPreKeys();
+    }
+
+    @Override
+    public void storeKyberPreKey(final int kyberPreKeyId, final KyberPreKeyRecord record) {
+        kyberPreKeyStore.storeKyberPreKey(kyberPreKeyId, record);
+    }
+
+    @Override
+    public boolean containsKyberPreKey(final int kyberPreKeyId) {
+        return kyberPreKeyStore.containsKyberPreKey(kyberPreKeyId);
+    }
+
+    @Override
+    public void markKyberPreKeyUsed(final int kyberPreKeyId) {
+        kyberPreKeyStore.markKyberPreKeyUsed(kyberPreKeyId);
+    }
+
+    @Override
+    public List<KyberPreKeyRecord> loadLastResortKyberPreKeys() {
+        return kyberPreKeyStore.loadLastResortKyberPreKeys();
+    }
+
+    @Override
+    public void removeKyberPreKey(final int i) {
+        kyberPreKeyStore.removeKyberPreKey(i);
+    }
+
+    @Override
+    public void storeLastResortKyberPreKey(final int i, final KyberPreKeyRecord kyberPreKeyRecord) {
+        kyberPreKeyStore.storeLastResortKyberPreKey(i, kyberPreKeyRecord);
+    }
+
+    @Override
+    public void deleteAllStaleOneTimeKyberPreKeys(final long threshold, final int minCount) {
+        kyberPreKeyStore.deleteAllStaleOneTimeKyberPreKeys(threshold, minCount);
+    }
+
+    @Override
+    public void markAllOneTimeKyberPreKeysStaleIfNecessary(final long staleTime) {
+        kyberPreKeyStore.markAllOneTimeKyberPreKeysStaleIfNecessary(staleTime);
+    }
+
+    @Override
+    public void deleteAllStaleOneTimeEcPreKeys(final long threshold, final int minCount) {
+        preKeyStore.deleteAllStaleOneTimeEcPreKeys(threshold, minCount);
+    }
+
+    @Override
+    public void markAllOneTimeEcPreKeysStaleIfNecessary(final long staleTime) {
+        preKeyStore.markAllOneTimeEcPreKeysStaleIfNecessary(staleTime);
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/CdsiStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/CdsiStore.java
new file mode 100644
index 00000000..4b68adbe
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/CdsiStore.java
@@ -0,0 +1,172 @@
+package org.asamk.signal.manager.storage.recipients;
+
+import org.asamk.signal.manager.storage.Database;
+import org.asamk.signal.manager.storage.Utils;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class CdsiStore {
+
+    private static final String TABLE_CDSI = "cdsi";
+
+    private final Database database;
+
+    public static void createSql(Connection connection) throws SQLException {
+        // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
+        try (final var statement = connection.createStatement()) {
+            statement.executeUpdate("""
+                                    CREATE TABLE cdsi (
+                                      _id INTEGER PRIMARY KEY,
+                                      number TEXT NOT NULL UNIQUE,
+                                      last_seen_at INTEGER NOT NULL
+                                    ) STRICT;
+                                    """);
+        }
+    }
+
+    public CdsiStore(final Database database) {
+        this.database = database;
+    }
+
+    public Set<String> getAllNumbers() {
+        try (final var connection = database.getConnection()) {
+            return getAllNumbers(connection);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from cdsi store", e);
+        }
+    }
+
+    /**
+     * Saves the set of e164 numbers used after a full refresh.
+     *
+     * @param fullNumbers All the e164 numbers used in the last CDS query (previous and new).
+     * @param seenNumbers The E164 numbers that were seen in either the system contacts or recipients table. This is different from fullNumbers in that fullNumbers
+     *                    includes every number we've ever seen, even if it's not in our contacts anymore.
+     */
+    public void updateAfterFullCdsQuery(Set<String> fullNumbers, Set<String> seenNumbers) {
+        final var lastSeen = System.currentTimeMillis();
+        try (final var connection = database.getConnection()) {
+            final var existingNumbers = getAllNumbers(connection);
+
+            final var removedNumbers = new HashSet<>(existingNumbers) {{
+                removeAll(fullNumbers);
+            }};
+            removeNumbers(connection, removedNumbers);
+
+            final var addedNumbers = new HashSet<>(fullNumbers) {{
+                removeAll(existingNumbers);
+            }};
+            addNumbers(connection, addedNumbers, lastSeen);
+
+            updateLastSeen(connection, seenNumbers, lastSeen);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update cdsi store", e);
+        }
+    }
+
+    /**
+     * Updates after a partial CDS query. Will not insert new entries.
+     * Instead, this will simply update the lastSeen timestamp of any entry we already have.
+     *
+     * @param seenNumbers The newly-added E164 numbers that we hadn't previously queried for.
+     */
+    public void updateAfterPartialCdsQuery(Set<String> seenNumbers) {
+        final var lastSeen = System.currentTimeMillis();
+
+        try (final var connection = database.getConnection()) {
+            updateLastSeen(connection, seenNumbers, lastSeen);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update cdsi store", e);
+        }
+    }
+
+    private static Set<String> getAllNumbers(final Connection connection) throws SQLException {
+        final var sql = (
+                """
+                SELECT c.number
+                FROM %s c
+                """
+        ).formatted(TABLE_CDSI);
+        try (final var statement = connection.prepareStatement(sql)) {
+            try (var result = Utils.executeQueryForStream(statement, r -> r.getString("number"))) {
+                return result.collect(Collectors.toSet());
+            }
+        }
+    }
+
+    private static void removeNumbers(final Connection connection, final Set<String> numbers) throws SQLException {
+        final var sql = (
+                """
+                DELETE FROM %s
+                WHERE number = ?
+                """
+        ).formatted(TABLE_CDSI);
+        try (final var statement = connection.prepareStatement(sql)) {
+            for (final var number : numbers) {
+                statement.setString(1, number);
+                statement.executeUpdate();
+            }
+        }
+    }
+
+    private static void addNumbers(
+            final Connection connection,
+            final Set<String> numbers,
+            final long lastSeen
+    ) throws SQLException {
+        final var sql = (
+                """
+                INSERT INTO %s (number, last_seen_at)
+                VALUES (?, ?)
+                ON CONFLICT (number) DO UPDATE SET last_seen_at = excluded.last_seen_at
+                """
+        ).formatted(TABLE_CDSI);
+        try (final var statement = connection.prepareStatement(sql)) {
+            for (final var number : numbers) {
+                statement.setString(1, number);
+                statement.setLong(2, lastSeen);
+                statement.executeUpdate();
+            }
+        }
+    }
+
+    private static void updateLastSeen(
+            final Connection connection,
+            final Set<String> numbers,
+            final long lastSeen
+    ) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET last_seen_at = ?
+                WHERE number = ?
+                """
+        ).formatted(TABLE_CDSI);
+        try (final var statement = connection.prepareStatement(sql)) {
+            for (final var number : numbers) {
+                statement.setLong(1, lastSeen);
+                statement.setString(2, number);
+                statement.executeUpdate();
+            }
+        }
+    }
+
+    public void clearAll() {
+        final var sql = (
+                """
+                DELETE FROM %s
+                """
+        ).formatted(TABLE_CDSI);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update cdsi store", e);
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Contact.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Contact.java
deleted file mode 100644
index a1091b45..00000000
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Contact.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package org.asamk.signal.manager.storage.recipients;
-
-import org.whispersystems.signalservice.internal.util.Util;
-
-import java.util.Objects;
-
-public class Contact {
-
-    private final String givenName;
-
-    private final String familyName;
-
-    private final String color;
-
-    private final int messageExpirationTime;
-
-    private final boolean blocked;
-
-    private final boolean archived;
-
-    private final boolean profileSharingEnabled;
-
-    public Contact(
-            final String givenName,
-            final String familyName,
-            final String color,
-            final int messageExpirationTime,
-            final boolean blocked,
-            final boolean archived,
-            final boolean profileSharingEnabled
-    ) {
-        this.givenName = givenName;
-        this.familyName = familyName;
-        this.color = color;
-        this.messageExpirationTime = messageExpirationTime;
-        this.blocked = blocked;
-        this.archived = archived;
-        this.profileSharingEnabled = profileSharingEnabled;
-    }
-
-    private Contact(final Builder builder) {
-        givenName = builder.givenName;
-        familyName = builder.familyName;
-        color = builder.color;
-        messageExpirationTime = builder.messageExpirationTime;
-        blocked = builder.blocked;
-        archived = builder.archived;
-        profileSharingEnabled = builder.profileSharingEnabled;
-    }
-
-    public static Builder newBuilder() {
-        return new Builder();
-    }
-
-    public static Builder newBuilder(final Contact copy) {
-        Builder builder = new Builder();
-        builder.givenName = copy.getGivenName();
-        builder.familyName = copy.getFamilyName();
-        builder.color = copy.getColor();
-        builder.messageExpirationTime = copy.getMessageExpirationTime();
-        builder.blocked = copy.isBlocked();
-        builder.archived = copy.isArchived();
-        builder.profileSharingEnabled = copy.isProfileSharingEnabled();
-        return builder;
-    }
-
-    public String getName() {
-        final var noGivenName = Util.isEmpty(givenName);
-        final var noFamilyName = Util.isEmpty(familyName);
-
-        if (noGivenName && noFamilyName) {
-            return "";
-        } else if (noGivenName) {
-            return familyName;
-        } else if (noFamilyName) {
-            return givenName;
-        }
-
-        return givenName + " " + familyName;
-    }
-
-    public String getGivenName() {
-        return givenName;
-    }
-
-    public String getFamilyName() {
-        return familyName;
-    }
-
-    public String getColor() {
-        return color;
-    }
-
-    public int getMessageExpirationTime() {
-        return messageExpirationTime;
-    }
-
-    public boolean isBlocked() {
-        return blocked;
-    }
-
-    public boolean isArchived() {
-        return archived;
-    }
-
-    public boolean isProfileSharingEnabled() {
-        return profileSharingEnabled;
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        final Contact contact = (Contact) o;
-        return messageExpirationTime == contact.messageExpirationTime
-                && blocked == contact.blocked
-                && archived == contact.archived
-                && profileSharingEnabled == contact.profileSharingEnabled
-                && Objects.equals(givenName, contact.givenName)
-                && Objects.equals(familyName, contact.familyName)
-                && Objects.equals(color, contact.color);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(givenName,
-                familyName,
-                color,
-                messageExpirationTime,
-                blocked,
-                archived,
-                profileSharingEnabled);
-    }
-
-    public static final class Builder {
-
-        private String givenName;
-        private String familyName;
-        private String color;
-        private int messageExpirationTime;
-        private boolean blocked;
-        private boolean archived;
-        private boolean profileSharingEnabled;
-
-        private Builder() {
-        }
-
-        public Builder withGivenName(final String val) {
-            givenName = val;
-            return this;
-        }
-
-        public Builder withFamilyName(final String val) {
-            familyName = val;
-            return this;
-        }
-
-        public Builder withColor(final String val) {
-            color = val;
-            return this;
-        }
-
-        public Builder withMessageExpirationTime(final int val) {
-            messageExpirationTime = val;
-            return this;
-        }
-
-        public Builder withBlocked(final boolean val) {
-            blocked = val;
-            return this;
-        }
-
-        public Builder withArchived(final boolean val) {
-            archived = val;
-            return this;
-        }
-
-        public Builder withProfileSharingEnabled(final boolean val) {
-            profileSharingEnabled = val;
-            return this;
-        }
-
-        public Contact build() {
-            return new Contact(this);
-        }
-    }
-}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/InvalidAddress.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/InvalidAddress.java
new file mode 100644
index 00000000..991bc166
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/InvalidAddress.java
@@ -0,0 +1,8 @@
+package org.asamk.signal.manager.storage.recipients;
+
+public class InvalidAddress extends AssertionError {
+
+    InvalidAddress(String message) {
+        super(message);
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore.java
index 2aeb349f..907aafe4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore.java
@@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
-import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.signalservice.api.push.ServiceId;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -27,7 +27,8 @@ public class LegacyRecipientStore {
 
         @Override
         public List<RecipientAddress> deserialize(
-                JsonParser jsonParser, DeserializationContext deserializationContext
+                JsonParser jsonParser,
+                DeserializationContext deserializationContext
         ) throws IOException {
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
@@ -36,8 +37,8 @@ public class LegacyRecipientStore {
             if (node.isArray()) {
                 for (var recipient : node) {
                     var recipientName = recipient.get("name").asText();
-                    var uuid = UuidUtil.parseOrThrow(recipient.get("uuid").asText());
-                    addresses.add(new RecipientAddress(uuid, recipientName));
+                    var serviceId = ServiceId.ACI.parseOrThrow(recipient.get("uuid").asText());
+                    addresses.add(new RecipientAddress(serviceId, recipientName));
                 }
             }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
new file mode 100644
index 00000000..e8d44ab9
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
@@ -0,0 +1,154 @@
+package org.asamk.signal.manager.storage.recipients;
+
+import org.asamk.signal.manager.api.Contact;
+import org.asamk.signal.manager.api.Profile;
+import org.asamk.signal.manager.storage.Utils;
+import org.signal.libsignal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.ServiceId;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Base64;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class LegacyRecipientStore2 {
+
+    private static final Logger logger = LoggerFactory.getLogger(LegacyRecipientStore2.class);
+
+    public static void migrate(File file, RecipientStore recipientStore) {
+        final var objectMapper = Utils.createStorageObjectMapper();
+        try (var inputStream = new FileInputStream(file)) {
+            final var storage = objectMapper.readValue(inputStream, Storage.class);
+
+            final var recipients = storage.recipients.stream().map(r -> {
+                final var recipientId = new RecipientId(r.id, recipientStore);
+                final var address = new RecipientAddress(Optional.ofNullable(r.uuid).map(ServiceId::parseOrThrow),
+                        Optional.ofNullable(r.number));
+
+                Contact contact = null;
+                if (r.contact != null) {
+                    contact = new Contact(r.contact.name,
+                            null,
+                            null,
+                            null,
+                            null,
+                            null,
+                            r.contact.color,
+                            r.contact.messageExpirationTime,
+                            1,
+                            0,
+                            false,
+                            r.contact.blocked,
+                            r.contact.archived,
+                            r.contact.profileSharingEnabled,
+                            false,
+                            null);
+                }
+
+                ProfileKey profileKey = null;
+                if (r.profileKey != null) {
+                    try {
+                        profileKey = new ProfileKey(Base64.getDecoder().decode(r.profileKey));
+                    } catch (InvalidInputException ignored) {
+                    }
+                }
+
+                ExpiringProfileKeyCredential expiringProfileKeyCredential = null;
+                if (r.expiringProfileKeyCredential != null) {
+                    try {
+                        expiringProfileKeyCredential = new ExpiringProfileKeyCredential(Base64.getDecoder()
+                                .decode(r.expiringProfileKeyCredential));
+                    } catch (Throwable ignored) {
+                    }
+                }
+
+                Profile profile = null;
+                if (r.profile != null) {
+                    profile = new Profile(r.profile.lastUpdateTimestamp,
+                            r.profile.givenName,
+                            r.profile.familyName,
+                            r.profile.about,
+                            r.profile.aboutEmoji,
+                            r.profile.avatarUrlPath,
+                            r.profile.mobileCoinAddress == null
+                                    ? null
+                                    : Base64.getDecoder().decode(r.profile.mobileCoinAddress),
+                            Profile.UnidentifiedAccessMode.valueOfOrUnknown(r.profile.unidentifiedAccessMode),
+                            r.profile.capabilities.stream()
+                                    .map(Profile.Capability::valueOfOrNull)
+                                    .filter(Objects::nonNull)
+                                    .collect(Collectors.toSet()),
+                            null);
+                }
+
+                return new Recipient(recipientId,
+                        address,
+                        contact,
+                        profileKey,
+                        expiringProfileKeyCredential,
+                        profile,
+                        null,
+                        null);
+            }).collect(Collectors.toMap(Recipient::getRecipientId, r -> r));
+
+            recipientStore.addLegacyRecipients(recipients);
+        } catch (FileNotFoundException e) {
+            // nothing to migrate
+        } catch (IOException e) {
+            logger.warn("Failed to load recipient store", e);
+            throw new RuntimeException(e);
+        }
+        try {
+            Files.delete(file.toPath());
+        } catch (IOException e) {
+            logger.warn("Failed to load recipient store", e);
+            throw new RuntimeException(e);
+        }
+    }
+
+    public record Storage(List<Recipient> recipients, long lastId) {
+
+        public record Recipient(
+                long id,
+                String number,
+                String uuid,
+                String profileKey,
+                String expiringProfileKeyCredential,
+                Contact contact,
+                Profile profile
+        ) {
+
+            public record Contact(
+                    String name,
+                    String color,
+                    int messageExpirationTime,
+                    boolean blocked,
+                    boolean archived,
+                    boolean profileSharingEnabled
+            ) {}
+
+            public record Profile(
+                    long lastUpdateTimestamp,
+                    String givenName,
+                    String familyName,
+                    String about,
+                    String aboutEmoji,
+                    String avatarUrlPath,
+                    String mobileCoinAddress,
+                    String unidentifiedAccessMode,
+                    Set<String> capabilities
+            ) {}
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
new file mode 100644
index 00000000..1454c8a7
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
@@ -0,0 +1,134 @@
+package org.asamk.signal.manager.storage.recipients;
+
+import org.asamk.signal.manager.api.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.SQLException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class MergeRecipientHelper {
+
+    private static final Logger logger = LoggerFactory.getLogger(MergeRecipientHelper.class);
+
+    static Pair<RecipientId, List<RecipientId>> resolveRecipientTrustedLocked(
+            Store store,
+            RecipientAddress address
+    ) throws SQLException {
+        // address has at least one of serviceId/pni and optionally number/username
+
+        final var recipients = store.findAllByAddress(address);
+
+        if (recipients.isEmpty()) {
+            logger.debug("Got new recipient, serviceId, PNI, number, username are unknown");
+            return new Pair<>(store.addNewRecipient(address), List.of());
+        }
+
+        if (recipients.size() == 1) {
+            final var recipient = recipients.stream().findFirst().get();
+            if (recipient.address().hasIdentifiersOf(address)) {
+                return new Pair<>(recipient.id(), List.of());
+            }
+
+            if (recipient.address().aci().isEmpty() || (
+                    address.aci().isEmpty() && (
+                            address.pni().isEmpty() || recipient.address().pni().equals(address.pni())
+                    )
+            ) || recipient.address().aci().equals(address.aci())) {
+                logger.debug("Got existing recipient {}, updating with high trust address", recipient.id());
+                store.updateRecipientAddress(recipient.id(), address.withOtherIdentifiersFrom(recipient.address()));
+                return new Pair<>(recipient.id(), List.of());
+            }
+
+            logger.debug(
+                    "Got recipient {} existing with number/pni/username, but different aci, so stripping its number and adding new recipient",
+                    recipient.id());
+            store.updateRecipientAddress(recipient.id(), recipient.address().removeIdentifiersFrom(address));
+
+            return new Pair<>(store.addNewRecipient(address), List.of());
+        }
+
+        var resultingRecipient = recipients.stream()
+                .filter(r -> r.address().aci().isPresent() && r.address().aci().equals(address.aci()))
+                .findFirst();
+        if (resultingRecipient.isEmpty() && address.pni().isPresent()) {
+            resultingRecipient = recipients.stream().filter(r -> r.address().pni().equals(address.pni())).findFirst();
+        }
+
+        final Set<RecipientWithAddress> remainingRecipients;
+        if (resultingRecipient.isEmpty()) {
+            remainingRecipients = recipients;
+        } else {
+            remainingRecipients = new HashSet<>(recipients);
+            remainingRecipients.remove(resultingRecipient.get());
+        }
+
+        final var recipientsToBeMerged = new HashSet<RecipientWithAddress>();
+        final var recipientsToBeStripped = new HashSet<RecipientWithAddress>();
+        for (final var recipient : remainingRecipients) {
+            if (!recipient.address().hasAdditionalIdentifiersThan(address)) {
+                recipientsToBeMerged.add(recipient);
+                continue;
+            }
+
+            if (recipient.address().hasOnlyPniAndNumber()) {
+                // PNI and phone number are linked by the server
+                recipientsToBeMerged.add(recipient);
+                continue;
+            }
+
+            recipientsToBeStripped.add(recipient);
+        }
+
+        logger.debug("Got separate recipients for high trust identifiers {}, need to merge ({}, {}) and strip ({})",
+                address,
+                resultingRecipient.map(RecipientWithAddress::address),
+                recipientsToBeMerged.stream().map(r -> r.address().toString()).collect(Collectors.joining(", ")),
+                recipientsToBeStripped.stream().map(r -> r.address().toString()).collect(Collectors.joining(", ")));
+
+        RecipientAddress finalAddress = resultingRecipient.map(RecipientWithAddress::address).orElse(null);
+        for (final var recipient : recipientsToBeMerged) {
+            if (finalAddress == null) {
+                finalAddress = recipient.address();
+            } else {
+                finalAddress = finalAddress.withOtherIdentifiersFrom(recipient.address());
+            }
+            store.removeRecipientAddress(recipient.id());
+        }
+        if (finalAddress == null) {
+            finalAddress = address;
+        } else {
+            finalAddress = address.withOtherIdentifiersFrom(finalAddress);
+        }
+
+        for (final var recipient : recipientsToBeStripped) {
+            store.updateRecipientAddress(recipient.id(), recipient.address().removeIdentifiersFrom(finalAddress));
+        }
+
+        // Create fixed RecipientIds that won't update its id after merged
+        final var toBeMergedRecipientIds = recipientsToBeMerged.stream()
+                .map(r -> new RecipientId(r.id().id(), null))
+                .toList();
+
+        if (resultingRecipient.isPresent()) {
+            store.updateRecipientAddress(resultingRecipient.get().id(), finalAddress);
+            return new Pair<>(resultingRecipient.get().id(), toBeMergedRecipientIds);
+        }
+
+        return new Pair<>(store.addNewRecipient(finalAddress), toBeMergedRecipientIds);
+    }
+
+    public interface Store {
+
+        Set<RecipientWithAddress> findAllByAddress(final RecipientAddress address) throws SQLException;
+
+        RecipientId addNewRecipient(final RecipientAddress address) throws SQLException;
+
+        void updateRecipientAddress(RecipientId recipientId, final RecipientAddress address) throws SQLException;
+
+        void removeRecipientAddress(RecipientId recipientId) throws SQLException;
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java
index d5c68315..c5e1181b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java
@@ -1,7 +1,9 @@
 package org.asamk.signal.manager.storage.recipients;
 
+import org.asamk.signal.manager.api.Contact;
+import org.asamk.signal.manager.api.Profile;
+import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
-import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential;
 
 import java.util.Objects;
 
@@ -15,24 +17,32 @@ public class Recipient {
 
     private final ProfileKey profileKey;
 
-    private final ProfileKeyCredential profileKeyCredential;
+    private final ExpiringProfileKeyCredential expiringProfileKeyCredential;
 
     private final Profile profile;
 
+    private final Boolean discoverable;
+
+    private final byte[] storageRecord;
+
     public Recipient(
             final RecipientId recipientId,
             final RecipientAddress address,
             final Contact contact,
             final ProfileKey profileKey,
-            final ProfileKeyCredential profileKeyCredential,
-            final Profile profile
+            final ExpiringProfileKeyCredential expiringProfileKeyCredential,
+            final Profile profile,
+            final Boolean discoverable,
+            final byte[] storageRecord
     ) {
         this.recipientId = recipientId;
         this.address = address;
         this.contact = contact;
         this.profileKey = profileKey;
-        this.profileKeyCredential = profileKeyCredential;
+        this.expiringProfileKeyCredential = expiringProfileKeyCredential;
         this.profile = profile;
+        this.discoverable = discoverable;
+        this.storageRecord = storageRecord;
     }
 
     private Recipient(final Builder builder) {
@@ -40,8 +50,10 @@ public class Recipient {
         address = builder.address;
         contact = builder.contact;
         profileKey = builder.profileKey;
-        profileKeyCredential = builder.profileKeyCredential;
+        expiringProfileKeyCredential = builder.expiringProfileKeyCredential;
         profile = builder.profile;
+        discoverable = builder.discoverable;
+        storageRecord = builder.storageRecord;
     }
 
     public static Builder newBuilder() {
@@ -54,8 +66,9 @@ public class Recipient {
         builder.address = copy.getAddress();
         builder.contact = copy.getContact();
         builder.profileKey = copy.getProfileKey();
-        builder.profileKeyCredential = copy.getProfileKeyCredential();
+        builder.expiringProfileKeyCredential = copy.getExpiringProfileKeyCredential();
         builder.profile = copy.getProfile();
+        builder.storageRecord = copy.getStorageRecord();
         return builder;
     }
 
@@ -75,14 +88,22 @@ public class Recipient {
         return profileKey;
     }
 
-    public ProfileKeyCredential getProfileKeyCredential() {
-        return profileKeyCredential;
+    public ExpiringProfileKeyCredential getExpiringProfileKeyCredential() {
+        return expiringProfileKeyCredential;
     }
 
     public Profile getProfile() {
         return profile;
     }
 
+    public Boolean getDiscoverable() {
+        return discoverable;
+    }
+
+    public byte[] getStorageRecord() {
+        return storageRecord;
+    }
+
     @Override
     public boolean equals(final Object o) {
         if (this == o) return true;
@@ -92,13 +113,13 @@ public class Recipient {
                 && Objects.equals(address, recipient.address)
                 && Objects.equals(contact, recipient.contact)
                 && Objects.equals(profileKey, recipient.profileKey)
-                && Objects.equals(profileKeyCredential, recipient.profileKeyCredential)
+                && Objects.equals(expiringProfileKeyCredential, recipient.expiringProfileKeyCredential)
                 && Objects.equals(profile, recipient.profile);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(recipientId, address, contact, profileKey, profileKeyCredential, profile);
+        return Objects.hash(recipientId, address, contact, profileKey, expiringProfileKeyCredential, profile);
     }
 
     public static final class Builder {
@@ -107,8 +128,10 @@ public class Recipient {
         private RecipientAddress address;
         private Contact contact;
         private ProfileKey profileKey;
-        private ProfileKeyCredential profileKeyCredential;
+        private ExpiringProfileKeyCredential expiringProfileKeyCredential;
         private Profile profile;
+        private Boolean discoverable;
+        private byte[] storageRecord;
 
         private Builder() {
         }
@@ -133,8 +156,8 @@ public class Recipient {
             return this;
         }
 
-        public Builder withProfileKeyCredential(final ProfileKeyCredential val) {
-            profileKeyCredential = val;
+        public Builder withExpiringProfileKeyCredential(final ExpiringProfileKeyCredential val) {
+            expiringProfileKeyCredential = val;
             return this;
         }
 
@@ -143,6 +166,16 @@ public class Recipient {
             return this;
         }
 
+        public Builder withDiscoverable(final Boolean val) {
+            discoverable = val;
+            return this;
+        }
+
+        public Builder withStorageRecord(final byte[] val) {
+            storageRecord = val;
+            return this;
+        }
+
         public Recipient build() {
             return new Recipient(this);
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientAddress.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientAddress.java
index 0ab8c8f5..25dc3a3f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientAddress.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientAddress.java
@@ -1,43 +1,107 @@
 package org.asamk.signal.manager.storage.recipients;
 
 import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.util.Optional;
-import java.util.UUID;
 
-public record RecipientAddress(Optional<UUID> uuid, Optional<String> number) {
-
-    public static final UUID UNKNOWN_UUID = ServiceId.UNKNOWN.uuid();
+public record RecipientAddress(
+        Optional<ACI> aci, Optional<PNI> pni, Optional<String> number, Optional<String> username
+) {
 
     /**
      * Construct a RecipientAddress.
      *
-     * @param uuid   The UUID of the user, if available.
-     * @param number The phone number of the user, if available.
+     * @param aci      The ACI of the user, if available.
+     * @param pni      The PNI of the user, if available.
+     * @param number   The phone number of the user, if available.
+     * @param username The username of the user, if available.
      */
     public RecipientAddress {
-        uuid = uuid.isPresent() && uuid.get().equals(UNKNOWN_UUID) ? Optional.empty() : uuid;
-        if (uuid.isEmpty() && number.isEmpty()) {
-            throw new AssertionError("Must have either a UUID or E164 number!");
+        if (aci.isPresent() && aci.get().isUnknown()) {
+            aci = Optional.empty();
+        }
+        if (pni.isPresent() && pni.get().isUnknown()) {
+            pni = Optional.empty();
+        }
+        if (aci.isEmpty() && pni.isEmpty() && number.isEmpty() && username.isEmpty()) {
+            throw new InvalidAddress("Must have either a ServiceId, username or E164 number!");
         }
     }
 
-    public RecipientAddress(UUID uuid, String e164) {
-        this(Optional.ofNullable(uuid), Optional.ofNullable(e164));
+    public RecipientAddress(Optional<ServiceId> serviceId, Optional<String> number) {
+        this(serviceId.filter(s -> s instanceof ACI).map(s -> (ACI) s),
+                serviceId.filter(s -> s instanceof PNI).map(s -> (PNI) s),
+                number,
+                Optional.empty());
+    }
+
+    public RecipientAddress(ACI aci, String e164) {
+        this(Optional.ofNullable(aci), Optional.empty(), Optional.ofNullable(e164), Optional.empty());
+    }
+
+    public RecipientAddress(PNI pni, String e164) {
+        this(Optional.empty(), Optional.ofNullable(pni), Optional.ofNullable(e164), Optional.empty());
+    }
+
+    public RecipientAddress(String e164) {
+        this(Optional.empty(), Optional.empty(), Optional.ofNullable(e164), Optional.empty());
+    }
+
+    public RecipientAddress(ACI aci, PNI pni, String e164) {
+        this(Optional.ofNullable(aci), Optional.ofNullable(pni), Optional.ofNullable(e164), Optional.empty());
+    }
+
+    public RecipientAddress(ACI aci, PNI pni, String e164, String username) {
+        this(Optional.ofNullable(aci),
+                Optional.ofNullable(pni),
+                Optional.ofNullable(e164),
+                Optional.ofNullable(username));
     }
 
     public RecipientAddress(SignalServiceAddress address) {
-        this(Optional.of(address.getServiceId().uuid()), address.getNumber());
+        this(address.getServiceId() instanceof ACI ? Optional.of((ACI) address.getServiceId()) : Optional.empty(),
+                address.getServiceId() instanceof PNI ? Optional.of((PNI) address.getServiceId()) : Optional.empty(),
+                address.getNumber(),
+                Optional.empty());
     }
 
-    public RecipientAddress(UUID uuid) {
-        this(Optional.of(uuid), Optional.empty());
+    public RecipientAddress(org.asamk.signal.manager.api.RecipientAddress address) {
+        this(address.aci().map(ACI::parseOrThrow),
+                address.pni().map(PNI::parseOrThrow),
+                address.number(),
+                address.username());
+    }
+
+    public RecipientAddress(ServiceId serviceId) {
+        this(Optional.of(serviceId), Optional.empty());
+    }
+
+    public RecipientAddress withOtherIdentifiersFrom(RecipientAddress address) {
+        return new RecipientAddress(this.aci.or(address::aci),
+                this.pni.or(address::pni),
+                this.number.or(address::number),
+                this.username.or(address::username));
+    }
+
+    public RecipientAddress removeIdentifiersFrom(RecipientAddress address) {
+        return new RecipientAddress(address.aci.equals(this.aci) ? Optional.empty() : this.aci,
+                address.pni.equals(this.pni) ? Optional.empty() : this.pni,
+                address.number.equals(this.number) ? Optional.empty() : this.number,
+                address.username.equals(this.username) ? Optional.empty() : this.username);
+    }
+
+    public Optional<ServiceId> serviceId() {
+        return aci.map(aci -> (ServiceId) aci).or(this::pni);
     }
 
     public String getIdentifier() {
-        if (uuid.isPresent()) {
-            return uuid.get().toString();
+        if (aci.isPresent()) {
+            return aci.get().toString();
+        } else if (pni.isPresent()) {
+            return pni.get().toString();
         } else if (number.isPresent()) {
             return number.get();
         } else {
@@ -48,20 +112,69 @@ public record RecipientAddress(Optional<UUID> uuid, Optional<String> number) {
     public String getLegacyIdentifier() {
         if (number.isPresent()) {
             return number.get();
-        } else if (uuid.isPresent()) {
-            return uuid.get().toString();
+        } else if (aci.isPresent()) {
+            return aci.get().toString();
+        } else if (pni.isPresent()) {
+            return pni.get().toString();
         } else {
             throw new AssertionError("Given the checks in the constructor, this should not be possible.");
         }
     }
 
     public boolean matches(RecipientAddress other) {
-        return (uuid.isPresent() && other.uuid.isPresent() && uuid.get().equals(other.uuid.get())) || (
+        return (aci.isPresent() && other.aci.isPresent() && aci.get().equals(other.aci.get())) || (
+                pni.isPresent() && other.pni.isPresent() && pni.get().equals(other.pni.get())
+        ) || (
                 number.isPresent() && other.number.isPresent() && number.get().equals(other.number.get())
         );
     }
 
+    public boolean hasSingleIdentifier() {
+        final var identifiersCount = aci().map(s -> 1).orElse(0) + pni().map(s -> 1).orElse(0) + number().map(s -> 1)
+                .orElse(0) + username().map(s -> 1).orElse(0);
+        return identifiersCount == 1;
+    }
+
+    public boolean hasIdentifiersOf(RecipientAddress address) {
+        return (address.aci.isEmpty() || address.aci.equals(aci))
+                && (address.pni.isEmpty() || address.pni.equals(pni))
+                && (address.number.isEmpty() || address.number.equals(number))
+                && (address.username.isEmpty() || address.username.equals(username));
+    }
+
+    public boolean hasAdditionalIdentifiersThan(RecipientAddress address) {
+        return (
+                aci.isPresent() && (
+                        address.aci.isEmpty() || !address.aci.equals(aci)
+
+                )
+        ) || (
+                pni.isPresent() && (
+                        address.pni.isEmpty() || !address.pni.equals(pni)
+                )
+        ) || (
+                number.isPresent() && (
+                        address.number.isEmpty() || !address.number.equals(number)
+                )
+        ) || (
+                username.isPresent() && (
+                        address.username.isEmpty() || !address.username.equals(username)
+                )
+        );
+    }
+
+    public boolean hasOnlyPniAndNumber() {
+        return pni.isPresent() && aci.isEmpty() && number.isPresent();
+    }
+
     public SignalServiceAddress toSignalServiceAddress() {
-        return new SignalServiceAddress(ServiceId.from(uuid.orElse(UNKNOWN_UUID)), number);
+        return new SignalServiceAddress(serviceId().orElse(ACI.UNKNOWN), number);
+    }
+
+    public org.asamk.signal.manager.api.RecipientAddress toApiRecipientAddress() {
+        return new org.asamk.signal.manager.api.RecipientAddress(aci().map(ServiceId::toString),
+                pni().map(ServiceId::toString),
+                number(),
+                username());
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientIdCreator.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientIdCreator.java
new file mode 100644
index 00000000..c385cd6e
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientIdCreator.java
@@ -0,0 +1,6 @@
+package org.asamk.signal.manager.storage.recipients;
+
+public interface RecipientIdCreator {
+
+    RecipientId create(long recipientId);
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientResolver.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientResolver.java
index 8744eeb9..00c532f2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientResolver.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientResolver.java
@@ -3,15 +3,48 @@ package org.asamk.signal.manager.storage.recipients;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
-public interface RecipientResolver {
+import java.util.function.Supplier;
 
-    RecipientId resolveRecipient(String identifier);
+public interface RecipientResolver {
 
     RecipientId resolveRecipient(RecipientAddress address);
 
-    RecipientId resolveRecipient(SignalServiceAddress address);
-
-    RecipientId resolveRecipient(ServiceId aci);
-
     RecipientId resolveRecipient(long recipientId);
+
+    RecipientId resolveRecipient(String identifier);
+
+    default RecipientId resolveRecipient(SignalServiceAddress address) {
+        return resolveRecipient(new RecipientAddress(address));
+    }
+
+    RecipientId resolveRecipient(ServiceId serviceId);
+
+    class RecipientResolverWrapper implements RecipientResolver {
+
+        private final Supplier<RecipientResolver> recipientResolverSupplier;
+
+        public RecipientResolverWrapper(final Supplier<RecipientResolver> recipientResolverSupplier) {
+            this.recipientResolverSupplier = recipientResolverSupplier;
+        }
+
+        @Override
+        public RecipientId resolveRecipient(final RecipientAddress address) {
+            return recipientResolverSupplier.get().resolveRecipient(address);
+        }
+
+        @Override
+        public RecipientId resolveRecipient(final long recipientId) {
+            return recipientResolverSupplier.get().resolveRecipient(recipientId);
+        }
+
+        @Override
+        public RecipientId resolveRecipient(final String identifier) {
+            return recipientResolverSupplier.get().resolveRecipient(identifier);
+        }
+
+        @Override
+        public RecipientId resolveRecipient(final ServiceId serviceId) {
+            return recipientResolverSupplier.get().resolveRecipient(serviceId);
+        }
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index cc9db862..442cbf4e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -1,31 +1,32 @@
 package org.asamk.signal.manager.storage.recipients;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
+import org.asamk.signal.manager.api.Contact;
 import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.PhoneNumberSharingMode;
+import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
+import org.asamk.signal.manager.storage.Database;
 import org.asamk.signal.manager.storage.Utils;
 import org.asamk.signal.manager.storage.contacts.ContactsStore;
 import org.asamk.signal.manager.storage.profiles.ProfileStore;
+import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.libsignal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
-import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.push.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.signalservice.api.storage.StorageId;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
 import java.util.ArrayList;
-import java.util.Base64;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -33,479 +34,794 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.UUID;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-public class RecipientStore implements RecipientResolver, RecipientTrustedResolver, ContactsStore, ProfileStore {
+public class RecipientStore implements RecipientIdCreator, RecipientResolver, RecipientTrustedResolver, ContactsStore, ProfileStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(RecipientStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(RecipientStore.class);
+    private static final String TABLE_RECIPIENT = "recipient";
+    private static final String SQL_IS_CONTACT = "r.given_name IS NOT NULL OR r.family_name IS NOT NULL OR r.nick_name IS NOT NULL OR r.nick_name_given_name IS NOT NULL OR r.nick_name_family_name IS NOT NULL OR r.note IS NOT NULL OR r.expiration_time > 0 OR r.profile_sharing = TRUE OR r.color IS NOT NULL OR r.blocked = TRUE OR r.archived = TRUE";
 
-    private final ObjectMapper objectMapper;
-    private final File file;
     private final RecipientMergeHandler recipientMergeHandler;
     private final SelfAddressProvider selfAddressProvider;
+    private final SelfProfileKeyProvider selfProfileKeyProvider;
+    private final Database database;
 
-    private final Map<RecipientId, Recipient> recipients;
     private final Map<Long, Long> recipientsMerged = new HashMap<>();
 
-    private long lastId;
-    private boolean isBulkUpdating;
+    private final Map<ServiceId, RecipientWithAddress> recipientAddressCache = new HashMap<>();
 
-    public static RecipientStore load(
-            File file, RecipientMergeHandler recipientMergeHandler, SelfAddressProvider selfAddressProvider
-    ) {
-        final var objectMapper = Utils.createStorageObjectMapper();
-        try (var inputStream = new FileInputStream(file)) {
-            final var storage = objectMapper.readValue(inputStream, Storage.class);
-
-            final var recipientStore = new RecipientStore(objectMapper,
-                    file,
-                    recipientMergeHandler,
-                    selfAddressProvider,
-                    new HashMap<>(),
-                    storage.lastId);
-            final var recipients = storage.recipients.stream().map(r -> {
-                final var recipientId = new RecipientId(r.id, recipientStore);
-                final var address = new RecipientAddress(Optional.ofNullable(r.uuid).map(UuidUtil::parseOrThrow),
-                        Optional.ofNullable(r.number));
-
-                Contact contact = null;
-                if (r.contact != null) {
-                    contact = new Contact(r.contact.name,
-                            r.contact.familyName,
-                            r.contact.color,
-                            r.contact.messageExpirationTime,
-                            r.contact.blocked,
-                            r.contact.archived,
-                            r.contact.profileSharingEnabled);
-                }
-
-                ProfileKey profileKey = null;
-                if (r.profileKey != null) {
-                    try {
-                        profileKey = new ProfileKey(Base64.getDecoder().decode(r.profileKey));
-                    } catch (InvalidInputException ignored) {
-                    }
-                }
-
-                ProfileKeyCredential profileKeyCredential = null;
-                if (r.profileKeyCredential != null) {
-                    try {
-                        profileKeyCredential = new ProfileKeyCredential(Base64.getDecoder()
-                                .decode(r.profileKeyCredential));
-                    } catch (Throwable ignored) {
-                    }
-                }
-
-                Profile profile = null;
-                if (r.profile != null) {
-                    profile = new Profile(r.profile.lastUpdateTimestamp,
-                            r.profile.givenName,
-                            r.profile.familyName,
-                            r.profile.about,
-                            r.profile.aboutEmoji,
-                            r.profile.avatarUrlPath,
-                            r.profile.mobileCoinAddress == null
-                                    ? null
-                                    : Base64.getDecoder().decode(r.profile.mobileCoinAddress),
-                            Profile.UnidentifiedAccessMode.valueOfOrUnknown(r.profile.unidentifiedAccessMode),
-                            r.profile.capabilities.stream()
-                                    .map(Profile.Capability::valueOfOrNull)
-                                    .filter(Objects::nonNull)
-                                    .collect(Collectors.toSet()));
-                }
-
-                return new Recipient(recipientId, address, contact, profileKey, profileKeyCredential, profile);
-            }).collect(Collectors.toMap(Recipient::getRecipientId, r -> r));
-
-            recipientStore.addRecipients(recipients);
-
-            return recipientStore;
-        } catch (FileNotFoundException e) {
-            logger.trace("Creating new recipient store.");
-            return new RecipientStore(objectMapper,
-                    file,
-                    recipientMergeHandler,
-                    selfAddressProvider,
-                    new HashMap<>(),
-                    0);
-        } catch (IOException e) {
-            logger.warn("Failed to load recipient store", e);
-            throw new RuntimeException(e);
+    public static void createSql(Connection connection) throws SQLException {
+        // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
+        try (final var statement = connection.createStatement()) {
+            statement.executeUpdate("""
+                                    CREATE TABLE recipient (
+                                      _id INTEGER PRIMARY KEY AUTOINCREMENT,
+                                      storage_id BLOB UNIQUE,
+                                      storage_record BLOB,
+                                      number TEXT UNIQUE,
+                                      username TEXT UNIQUE,
+                                      aci TEXT UNIQUE,
+                                      pni TEXT UNIQUE,
+                                      unregistered_timestamp INTEGER,
+                                      discoverable INTEGER,
+                                      profile_key BLOB,
+                                      profile_key_credential BLOB,
+                                      needs_pni_signature INTEGER NOT NULL DEFAULT FALSE,
+                                    
+                                      given_name TEXT,
+                                      family_name TEXT,
+                                      nick_name TEXT,
+                                      nick_name_given_name TEXT,
+                                      nick_name_family_name TEXT,
+                                      note TEXT,
+                                      color TEXT,
+                                    
+                                      expiration_time INTEGER NOT NULL DEFAULT 0,
+                                      expiration_time_version INTEGER DEFAULT 1 NOT NULL,
+                                      mute_until INTEGER NOT NULL DEFAULT 0,
+                                      blocked INTEGER NOT NULL DEFAULT FALSE,
+                                      archived INTEGER NOT NULL DEFAULT FALSE,
+                                      profile_sharing INTEGER NOT NULL DEFAULT FALSE,
+                                      hide_story INTEGER NOT NULL DEFAULT FALSE,
+                                      hidden INTEGER NOT NULL DEFAULT FALSE,
+                                    
+                                      profile_last_update_timestamp INTEGER NOT NULL DEFAULT 0,
+                                      profile_given_name TEXT,
+                                      profile_family_name TEXT,
+                                      profile_about TEXT,
+                                      profile_about_emoji TEXT,
+                                      profile_avatar_url_path TEXT,
+                                      profile_mobile_coin_address BLOB,
+                                      profile_unidentified_access_mode TEXT,
+                                      profile_capabilities TEXT,
+                                      profile_phone_number_sharing TEXT
+                                    ) STRICT;
+                                    """);
         }
     }
 
-    private RecipientStore(
-            final ObjectMapper objectMapper,
-            final File file,
+    public RecipientStore(
             final RecipientMergeHandler recipientMergeHandler,
             final SelfAddressProvider selfAddressProvider,
-            final Map<RecipientId, Recipient> recipients,
-            final long lastId
+            final SelfProfileKeyProvider selfProfileKeyProvider,
+            final Database database
     ) {
-        this.objectMapper = objectMapper;
-        this.file = file;
         this.recipientMergeHandler = recipientMergeHandler;
         this.selfAddressProvider = selfAddressProvider;
-        this.recipients = recipients;
-        this.lastId = lastId;
-    }
-
-    public void setBulkUpdating(final boolean bulkUpdating) {
-        isBulkUpdating = bulkUpdating;
-        if (!bulkUpdating) {
-            synchronized (recipients) {
-                saveLocked();
-            }
-        }
+        this.selfProfileKeyProvider = selfProfileKeyProvider;
+        this.database = database;
     }
 
     public RecipientAddress resolveRecipientAddress(RecipientId recipientId) {
-        synchronized (recipients) {
-            return getRecipient(recipientId).getAddress();
-        }
-    }
-
-    public Recipient getRecipient(RecipientId recipientId) {
-        synchronized (recipients) {
-            return recipients.get(recipientId);
+        try (final var connection = database.getConnection()) {
+            return resolveRecipientAddress(connection, recipientId);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from recipient store", e);
         }
     }
 
     public Collection<RecipientId> getRecipientIdsWithEnabledProfileSharing() {
-        synchronized (recipients) {
-            return recipients.values().stream().filter(r -> {
-                final var contact = r.getContact();
-                return contact != null && !contact.isBlocked() && contact.isProfileSharingEnabled();
-            }).map(Recipient::getRecipientId).toList();
+        final var sql = (
+                """
+                SELECT r._id
+                FROM %s r
+                WHERE r.blocked = FALSE AND r.profile_sharing = TRUE
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                try (var result = Utils.executeQueryForStream(statement, this::getRecipientIdFromResultSet)) {
+                    return result.toList();
+                }
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from recipient store", e);
         }
     }
 
     @Override
-    public RecipientId resolveRecipient(ServiceId serviceId) {
-        return resolveRecipient(new RecipientAddress(serviceId.uuid()), false, false);
-    }
-
-    @Override
-    public RecipientId resolveRecipient(final long recipientId) {
-        final var recipient = getRecipient(new RecipientId(recipientId, this));
-        return recipient == null ? null : recipient.getRecipientId();
+    public RecipientId resolveRecipient(final long rawRecipientId) {
+        final var sql = (
+                """
+                SELECT r._id
+                FROM %s r
+                WHERE r._id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setLong(1, rawRecipientId);
+                return Utils.executeQueryForOptional(statement, this::getRecipientIdFromResultSet).orElse(null);
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from recipient store", e);
+        }
     }
 
     @Override
     public RecipientId resolveRecipient(final String identifier) {
-        return resolveRecipient(Utils.getRecipientAddressFromIdentifier(identifier), false, false);
+        final var serviceId = ServiceId.parseOrNull(identifier);
+        if (serviceId != null) {
+            return resolveRecipient(serviceId);
+        } else {
+            return resolveRecipientByNumber(identifier);
+        }
     }
 
-    public RecipientId resolveRecipient(
-            final String number, Supplier<ACI> aciSupplier
-    ) throws UnregisteredRecipientException {
-        final Optional<Recipient> byNumber;
-        synchronized (recipients) {
-            byNumber = findByNumberLocked(number);
+    private RecipientId resolveRecipientByNumber(final String number) {
+        final RecipientId recipientId;
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            recipientId = resolveRecipientLocked(connection, number);
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read recipient store", e);
         }
-        if (byNumber.isEmpty() || byNumber.get().getAddress().uuid().isEmpty()) {
-            final var aci = aciSupplier.get();
-            if (aci == null) {
-                throw new UnregisteredRecipientException(new RecipientAddress(null, number));
-            }
-
-            return resolveRecipient(new RecipientAddress(aci.uuid(), number), false, false);
-        }
-        return byNumber.get().getRecipientId();
-    }
-
-    public RecipientId resolveRecipient(RecipientAddress address) {
-        return resolveRecipient(address, false, false);
+        return recipientId;
     }
 
     @Override
-    public RecipientId resolveRecipient(final SignalServiceAddress address) {
-        return resolveRecipient(new RecipientAddress(address), false, false);
+    public RecipientId resolveRecipient(final ServiceId serviceId) {
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            final var recipientWithAddress = recipientAddressCache.get(serviceId);
+            if (recipientWithAddress != null) {
+                return recipientWithAddress.id();
+            }
+            final var recipientId = resolveRecipientLocked(connection, serviceId);
+            connection.commit();
+            return recipientId;
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read recipient store", e);
+        }
+    }
+
+    /**
+     * Should only be used for recipientIds from the database.
+     * Where the foreign key relations ensure a valid recipientId.
+     */
+    @Override
+    public RecipientId create(final long recipientId) {
+        return new RecipientId(recipientId, this);
+    }
+
+    public RecipientId resolveRecipientByNumber(
+            final String number,
+            Supplier<ServiceId> serviceIdSupplier
+    ) throws UnregisteredRecipientException {
+        final Optional<RecipientWithAddress> byNumber;
+        try (final var connection = database.getConnection()) {
+            byNumber = findByNumber(connection, number);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from recipient store", e);
+        }
+        if (byNumber.isEmpty() || byNumber.get().address().serviceId().isEmpty()) {
+            final var serviceId = serviceIdSupplier.get();
+            if (serviceId == null) {
+                throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(number));
+            }
+
+            return resolveRecipient(serviceId);
+        }
+        return byNumber.get().id();
+    }
+
+    public Optional<RecipientId> resolveRecipientByNumberOptional(final String number) {
+        final Optional<RecipientWithAddress> byNumber;
+        try (final var connection = database.getConnection()) {
+            byNumber = findByNumber(connection, number);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from recipient store", e);
+        }
+        return byNumber.map(RecipientWithAddress::id);
+    }
+
+    public RecipientId resolveRecipientByUsername(
+            final String username,
+            Supplier<ACI> aciSupplier
+    ) throws UnregisteredRecipientException {
+        final Optional<RecipientWithAddress> byUsername;
+        try (final var connection = database.getConnection()) {
+            byUsername = findByUsername(connection, username);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from recipient store", e);
+        }
+        if (byUsername.isEmpty() || byUsername.get().address().serviceId().isEmpty()) {
+            final var aci = aciSupplier.get();
+            if (aci == null) {
+                throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(null,
+                        null,
+                        null,
+                        username));
+            }
+
+            return resolveRecipientTrusted(aci, username);
+        }
+        return byUsername.get().id();
+    }
+
+    public RecipientId resolveRecipient(RecipientAddress address) {
+        final RecipientId recipientId;
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            recipientId = resolveRecipientLocked(connection, address);
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read recipient store", e);
+        }
+        return recipientId;
+    }
+
+    public RecipientId resolveRecipient(Connection connection, RecipientAddress address) throws SQLException {
+        return resolveRecipientLocked(connection, address);
     }
 
     @Override
     public RecipientId resolveSelfRecipientTrusted(RecipientAddress address) {
-        return resolveRecipient(address, true, true);
+        return resolveRecipientTrusted(address, true);
     }
 
+    @Override
     public RecipientId resolveRecipientTrusted(RecipientAddress address) {
-        return resolveRecipient(address, true, false);
+        return resolveRecipientTrusted(address, false);
+    }
+
+    public RecipientId resolveRecipientTrusted(Connection connection, RecipientAddress address) throws SQLException {
+        final var pair = resolveRecipientTrustedLocked(connection, address, false);
+        if (!pair.second().isEmpty()) {
+            mergeRecipients(connection, pair.first(), pair.second());
+        }
+        return pair.first();
     }
 
     @Override
     public RecipientId resolveRecipientTrusted(SignalServiceAddress address) {
-        return resolveRecipient(new RecipientAddress(address), true, false);
+        return resolveRecipientTrusted(new RecipientAddress(address));
     }
 
-    public List<RecipientId> resolveRecipientsTrusted(List<RecipientAddress> addresses) {
-        final List<RecipientId> recipientIds;
-        final List<Pair<RecipientId, RecipientId>> toBeMerged = new ArrayList<>();
-        synchronized (recipients) {
-            recipientIds = addresses.stream().map(address -> {
-                final var pair = resolveRecipientLocked(address, true, false);
-                if (pair.second().isPresent()) {
-                    toBeMerged.add(new Pair<>(pair.first(), pair.second().get()));
-                }
-                return pair.first();
-            }).toList();
-        }
-        for (var pair : toBeMerged) {
-            recipientMergeHandler.mergeRecipients(pair.first(), pair.second());
-        }
-        return recipientIds;
+    @Override
+    public RecipientId resolveRecipientTrusted(
+            final Optional<ACI> aci,
+            final Optional<PNI> pni,
+            final Optional<String> number
+    ) {
+        return resolveRecipientTrusted(new RecipientAddress(aci, pni, number, Optional.empty()));
+    }
+
+    @Override
+    public RecipientId resolveRecipientTrusted(final ACI aci, final String username) {
+        return resolveRecipientTrusted(new RecipientAddress(aci, null, null, username));
     }
 
     @Override
     public void storeContact(RecipientId recipientId, final Contact contact) {
-        synchronized (recipients) {
-            final var recipient = recipients.get(recipientId);
-            storeRecipientLocked(recipientId, Recipient.newBuilder(recipient).withContact(contact).build());
+        try (final var connection = database.getConnection()) {
+            storeContact(connection, recipientId, contact);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
         }
     }
 
     @Override
     public Contact getContact(RecipientId recipientId) {
-        final var recipient = getRecipient(recipientId);
-        return recipient == null ? null : recipient.getContact();
+        try (final var connection = database.getConnection()) {
+            return getContact(connection, recipientId);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from recipient store", e);
+        }
     }
 
     @Override
     public List<Pair<RecipientId, Contact>> getContacts() {
-        return recipients.entrySet()
-                .stream()
-                .filter(e -> e.getValue().getContact() != null)
-                .map(e -> new Pair<>(e.getKey(), e.getValue().getContact()))
-                .toList();
+        final var sql = (
+                """
+                SELECT r._id, r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp
+                FROM %s r
+                WHERE (r.number IS NOT NULL OR r.pni IS NOT NULL OR r.aci IS NOT NULL) AND %s AND r.hidden = FALSE
+                """
+        ).formatted(TABLE_RECIPIENT, SQL_IS_CONTACT);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                try (var result = Utils.executeQueryForStream(statement,
+                        resultSet -> new Pair<>(getRecipientIdFromResultSet(resultSet),
+                                getContactFromResultSet(resultSet)))) {
+                    return result.toList();
+                }
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from recipient store", e);
+        }
+    }
+
+    public Recipient getRecipient(Connection connection, RecipientId recipientId) throws SQLException {
+        final var sql = (
+                """
+                SELECT r._id,
+                       r.number, r.aci, r.pni, r.username,
+                       r.profile_key, r.profile_key_credential,
+                       r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
+                       r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities, r.profile_phone_number_sharing,
+                       r.discoverable,
+                       r.storage_record
+                FROM %s r
+                WHERE r._id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, recipientId.id());
+            return Utils.executeQuerySingleRow(statement, this::getRecipientFromResultSet);
+        }
+    }
+
+    public Recipient getRecipient(Connection connection, StorageId storageId) throws SQLException {
+        final var sql = (
+                """
+                SELECT r._id,
+                       r.number, r.aci, r.pni, r.username,
+                       r.profile_key, r.profile_key_credential,
+                       r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
+                       r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities, r.profile_phone_number_sharing,
+                       r.discoverable,
+                       r.storage_record
+                FROM %s r
+                WHERE r.storage_id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, storageId.getRaw());
+            return Utils.executeQuerySingleRow(statement, this::getRecipientFromResultSet);
+        } catch (InvalidAddress e) {
+            try (final var statement = connection.prepareStatement("""
+                                                                   UPDATE %s SET aci=NULL, pni=NULL, username=NULL, number=NULL, storage_id=NULL WHERE storage_id = ?
+                                                                   """.formatted(TABLE_RECIPIENT))) {
+                statement.setBytes(1, storageId.getRaw());
+                statement.executeUpdate();
+            }
+            connection.commit();
+            throw e;
+        }
     }
 
     public List<Recipient> getRecipients(
-            boolean onlyContacts, Optional<Boolean> blocked, Set<RecipientId> recipientIds, Optional<String> name
+            boolean onlyContacts,
+            Optional<Boolean> blocked,
+            Set<RecipientId> recipientIds,
+            Optional<String> name
     ) {
-        return recipients.values()
-                .stream()
-                .filter(r -> !onlyContacts || r.getContact() != null)
-                .filter(r -> blocked.isEmpty() || (
-                        blocked.get() == (
-                                r.getContact() != null && r.getContact().isBlocked()
-                        )
-                ))
-                .filter(r -> recipientIds.isEmpty() || (recipientIds.contains(r.getRecipientId())))
-                .filter(r -> name.isEmpty()
-                        || (r.getContact() != null && name.get().equals(r.getContact().getName()))
-                        || (r.getProfile() != null && name.get().equals(r.getProfile().getDisplayName())))
-                .toList();
+        final var sqlWhere = new ArrayList<String>();
+        if (onlyContacts) {
+            sqlWhere.add("r.unregistered_timestamp IS NULL");
+            sqlWhere.add("(" + SQL_IS_CONTACT + ")");
+            sqlWhere.add("r.hidden = FALSE");
+        }
+        if (blocked.isPresent()) {
+            sqlWhere.add("r.blocked = ?");
+        }
+        if (!recipientIds.isEmpty()) {
+            final var recipientIdsCommaSeparated = recipientIds.stream()
+                    .map(recipientId -> String.valueOf(recipientId.id()))
+                    .collect(Collectors.joining(","));
+            sqlWhere.add("r._id IN (" + recipientIdsCommaSeparated + ")");
+        }
+        final var sql = (
+                """
+                SELECT r._id,
+                       r.number, r.aci, r.pni, r.username,
+                       r.profile_key, r.profile_key_credential,
+                       r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
+                       r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities, r.profile_phone_number_sharing,
+                       r.discoverable,
+                       r.storage_record
+                FROM %s r
+                WHERE (r.number IS NOT NULL OR r.pni IS NOT NULL OR r.aci IS NOT NULL) AND %s
+                """
+        ).formatted(TABLE_RECIPIENT, sqlWhere.isEmpty() ? "TRUE" : String.join(" AND ", sqlWhere));
+        final var selfAddress = selfAddressProvider.getSelfAddress();
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                if (blocked.isPresent()) {
+                    statement.setBoolean(1, blocked.get());
+                }
+                try (var result = Utils.executeQueryForStream(statement, this::getRecipientFromResultSet)) {
+                    return result.filter(r -> name.isEmpty() || (
+                            r.getContact() != null && name.get().equals(r.getContact().getName())
+                    ) || (r.getProfile() != null && name.get().equals(r.getProfile().getDisplayName()))).map(r -> {
+                        if (r.getAddress().matches(selfAddress)) {
+                            return Recipient.newBuilder(r)
+                                    .withProfileKey(selfProfileKeyProvider.getSelfProfileKey())
+                                    .build();
+                        }
+                        return r;
+                    }).toList();
+                }
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from recipient store", e);
+        }
+    }
+
+    public Set<String> getAllNumbers() {
+        final var sql = (
+                """
+                SELECT r.number
+                FROM %s r
+                WHERE r.number IS NOT NULL
+                """
+        ).formatted(TABLE_RECIPIENT);
+        final var selfNumber = selfAddressProvider.getSelfAddress().number().orElse(null);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                return Utils.executeQueryForStream(statement, resultSet -> resultSet.getString("number"))
+                        .filter(Objects::nonNull)
+                        .filter(n -> !n.equals(selfNumber))
+                        .filter(n -> {
+                            try {
+                                Long.parseLong(n);
+                                return true;
+                            } catch (NumberFormatException e) {
+                                return false;
+                            }
+                        })
+                        .collect(Collectors.toSet());
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from recipient store", e);
+        }
+    }
+
+    public Map<ServiceId, ProfileKey> getServiceIdToProfileKeyMap() {
+        final var sql = (
+                """
+                SELECT r.aci, r.profile_key
+                FROM %s r
+                WHERE r.aci IS NOT NULL AND r.profile_key IS NOT NULL
+                """
+        ).formatted(TABLE_RECIPIENT);
+        final var selfAci = selfAddressProvider.getSelfAddress().aci().orElse(null);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                return Utils.executeQueryForStream(statement, resultSet -> {
+                    final var aci = ACI.parseOrThrow(resultSet.getString("aci"));
+                    if (aci.equals(selfAci)) {
+                        return new Pair<>(aci, selfProfileKeyProvider.getSelfProfileKey());
+                    }
+                    final var profileKey = getProfileKeyFromResultSet(resultSet);
+                    return new Pair<>(aci, profileKey);
+                }).filter(Objects::nonNull).collect(Collectors.toMap(Pair::first, Pair::second));
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from recipient store", e);
+        }
+    }
+
+    public List<RecipientId> getRecipientIds(Connection connection) throws SQLException {
+        final var sql = (
+                """
+                SELECT r._id
+                FROM %s r
+                WHERE (r.aci IS NOT NULL OR r.pni IS NOT NULL)
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            return Utils.executeQueryForStream(statement, this::getRecipientIdFromResultSet).toList();
+        }
+    }
+
+    public void setMissingStorageIds() {
+        final var selectSql = (
+                """
+                SELECT r._id
+                FROM %s r
+                WHERE r.storage_id IS NULL AND r.unregistered_timestamp IS NULL AND (r.aci IS NOT NULL OR r.pni IS NOT NULL)
+                """
+        ).formatted(TABLE_RECIPIENT);
+        final var updateSql = (
+                """
+                UPDATE %s
+                SET storage_id = ?
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            try (final var selectStmt = connection.prepareStatement(selectSql)) {
+                final var recipientIds = Utils.executeQueryForStream(selectStmt, this::getRecipientIdFromResultSet)
+                        .toList();
+                try (final var updateStmt = connection.prepareStatement(updateSql)) {
+                    for (final var recipientId : recipientIds) {
+                        updateStmt.setBytes(1, KeyUtils.createRawStorageId());
+                        updateStmt.setLong(2, recipientId.id());
+                        updateStmt.executeUpdate();
+                    }
+                }
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
+        }
     }
 
     @Override
     public void deleteContact(RecipientId recipientId) {
-        synchronized (recipients) {
-            final var recipient = recipients.get(recipientId);
-            storeRecipientLocked(recipientId, Recipient.newBuilder(recipient).withContact(null).build());
-        }
+        storeContact(recipientId, null);
     }
 
     public void deleteRecipientData(RecipientId recipientId) {
-        synchronized (recipients) {
-            logger.debug("Deleting recipient data for {}", recipientId);
-            final var recipient = recipients.get(recipientId);
-            recipient.getAddress()
-                    .uuid()
-                    .ifPresent(uuid -> storeRecipientLocked(recipientId,
-                            Recipient.newBuilder()
-                                    .withRecipientId(recipientId)
-                                    .withAddress(new RecipientAddress(uuid))
-                                    .build()));
+        logger.debug("Deleting recipient data for {}", recipientId);
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(recipientId));
+            storeContact(connection, recipientId, null);
+            storeProfile(connection, recipientId, null);
+            storeProfileKey(connection, recipientId, null, false);
+            storeExpiringProfileKeyCredential(connection, recipientId, null);
+            deleteRecipient(connection, recipientId);
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
         }
     }
 
     @Override
     public Profile getProfile(final RecipientId recipientId) {
-        final var recipient = getRecipient(recipientId);
-        return recipient == null ? null : recipient.getProfile();
+        try (final var connection = database.getConnection()) {
+            return getProfile(connection, recipientId);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from recipient store", e);
+        }
     }
 
     @Override
     public ProfileKey getProfileKey(final RecipientId recipientId) {
-        final var recipient = getRecipient(recipientId);
-        return recipient == null ? null : recipient.getProfileKey();
+        try (final var connection = database.getConnection()) {
+            return getProfileKey(connection, recipientId);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from recipient store", e);
+        }
     }
 
     @Override
-    public ProfileKeyCredential getProfileKeyCredential(final RecipientId recipientId) {
-        final var recipient = getRecipient(recipientId);
-        return recipient == null ? null : recipient.getProfileKeyCredential();
+    public ExpiringProfileKeyCredential getExpiringProfileKeyCredential(final RecipientId recipientId) {
+        try (final var connection = database.getConnection()) {
+            return getExpiringProfileKeyCredential(connection, recipientId);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from recipient store", e);
+        }
     }
 
     @Override
     public void storeProfile(RecipientId recipientId, final Profile profile) {
-        synchronized (recipients) {
-            final var recipient = recipients.get(recipientId);
-            storeRecipientLocked(recipientId, Recipient.newBuilder(recipient).withProfile(profile).build());
+        try (final var connection = database.getConnection()) {
+            storeProfile(connection, recipientId, profile);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
         }
     }
 
-    @Override
-    public void storeSelfProfileKey(final RecipientId recipientId, final ProfileKey profileKey) {
-        storeProfileKey(recipientId, profileKey, false);
-    }
-
     @Override
     public void storeProfileKey(RecipientId recipientId, final ProfileKey profileKey) {
-        storeProfileKey(recipientId, profileKey, true);
+        try (final var connection = database.getConnection()) {
+            storeProfileKey(connection, recipientId, profileKey);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
+        }
     }
 
-    private void storeProfileKey(RecipientId recipientId, final ProfileKey profileKey, boolean resetProfile) {
-        synchronized (recipients) {
-            final var recipient = recipients.get(recipientId);
-            if (profileKey != null && profileKey.equals(recipient.getProfileKey()) && (
-                    recipient.getProfile() == null || (
-                            recipient.getProfile().getUnidentifiedAccessMode() != Profile.UnidentifiedAccessMode.UNKNOWN
-                                    && recipient.getProfile().getUnidentifiedAccessMode()
-                                    != Profile.UnidentifiedAccessMode.DISABLED
-                    )
-            )) {
-                return;
-            }
-
-            final var builder = Recipient.newBuilder(recipient)
-                    .withProfileKey(profileKey)
-                    .withProfileKeyCredential(null);
-            if (resetProfile) {
-                builder.withProfile(recipient.getProfile() == null
-                        ? null
-                        : Profile.newBuilder(recipient.getProfile()).withLastUpdateTimestamp(0).build());
-            }
-            final var newRecipient = builder.build();
-            storeRecipientLocked(recipientId, newRecipient);
-        }
+    public void storeProfileKey(
+            Connection connection,
+            RecipientId recipientId,
+            final ProfileKey profileKey
+    ) throws SQLException {
+        storeProfileKey(connection, recipientId, profileKey, true);
     }
 
     @Override
-    public void storeProfileKeyCredential(RecipientId recipientId, final ProfileKeyCredential profileKeyCredential) {
-        synchronized (recipients) {
-            final var recipient = recipients.get(recipientId);
-            storeRecipientLocked(recipientId,
-                    Recipient.newBuilder(recipient).withProfileKeyCredential(profileKeyCredential).build());
-        }
-    }
-
-    public boolean isEmpty() {
-        synchronized (recipients) {
-            return recipients.isEmpty();
-        }
-    }
-
-    private void addRecipients(final Map<RecipientId, Recipient> recipients) {
-        this.recipients.putAll(recipients);
-    }
-
-    /**
-     * @param isHighTrust true, if the number/uuid connection was obtained from a trusted source.
-     *                    Has no effect, if the address contains only a number or a uuid.
-     */
-    private RecipientId resolveRecipient(RecipientAddress address, boolean isHighTrust, boolean isSelf) {
-        final Pair<RecipientId, Optional<RecipientId>> pair;
-        synchronized (recipients) {
-            pair = resolveRecipientLocked(address, isHighTrust, isSelf);
-        }
-
-        if (pair.second().isPresent()) {
-            recipientMergeHandler.mergeRecipients(pair.first(), pair.second().get());
-        }
-        return pair.first();
-    }
-
-    private Pair<RecipientId, Optional<RecipientId>> resolveRecipientLocked(
-            RecipientAddress address, boolean isHighTrust, boolean isSelf
+    public void storeExpiringProfileKeyCredential(
+            RecipientId recipientId,
+            final ExpiringProfileKeyCredential profileKeyCredential
     ) {
-        if (isHighTrust && !isSelf) {
-            if (selfAddressProvider.getSelfAddress().matches(address)) {
-                isHighTrust = false;
-            }
+        try (final var connection = database.getConnection()) {
+            storeExpiringProfileKeyCredential(connection, recipientId, profileKeyCredential);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
         }
-        final var byNumber = address.number().isEmpty()
-                ? Optional.<Recipient>empty()
-                : findByNumberLocked(address.number().get());
-        final var byUuid = address.uuid().isEmpty()
-                ? Optional.<Recipient>empty()
-                : findByUuidLocked(address.uuid().get());
-
-        if (byNumber.isEmpty() && byUuid.isEmpty()) {
-            logger.debug("Got new recipient, both uuid and number are unknown");
-
-            if (isHighTrust || address.uuid().isEmpty() || address.number().isEmpty()) {
-                return new Pair<>(addNewRecipientLocked(address), Optional.empty());
-            }
-
-            return new Pair<>(addNewRecipientLocked(new RecipientAddress(address.uuid().get())), Optional.empty());
-        }
-
-        if (!isHighTrust || address.uuid().isEmpty() || address.number().isEmpty() || byNumber.equals(byUuid)) {
-            return new Pair<>(byUuid.or(() -> byNumber).map(Recipient::getRecipientId).get(), Optional.empty());
-        }
-
-        if (byNumber.isEmpty()) {
-            logger.debug("Got recipient {} existing with uuid, updating with high trust number",
-                    byUuid.get().getRecipientId());
-            updateRecipientAddressLocked(byUuid.get().getRecipientId(), address);
-            return new Pair<>(byUuid.get().getRecipientId(), Optional.empty());
-        }
-
-        final var byNumberRecipient = byNumber.get();
-
-        if (byUuid.isEmpty()) {
-            if (byNumberRecipient.getAddress().uuid().isPresent()) {
-                logger.debug(
-                        "Got recipient {} existing with number, but different uuid, so stripping its number and adding new recipient",
-                        byNumberRecipient.getRecipientId());
-
-                updateRecipientAddressLocked(byNumberRecipient.getRecipientId(),
-                        new RecipientAddress(byNumberRecipient.getAddress().uuid().get()));
-                return new Pair<>(addNewRecipientLocked(address), Optional.empty());
-            }
-
-            logger.debug("Got recipient {} existing with number and no uuid, updating with high trust uuid",
-                    byNumberRecipient.getRecipientId());
-            updateRecipientAddressLocked(byNumberRecipient.getRecipientId(), address);
-            return new Pair<>(byNumberRecipient.getRecipientId(), Optional.empty());
-        }
-
-        final var byUuidRecipient = byUuid.get();
-
-        if (byNumberRecipient.getAddress().uuid().isPresent()) {
-            logger.debug(
-                    "Got separate recipients for high trust number {} and uuid {}, recipient for number has different uuid, so stripping its number",
-                    byNumberRecipient.getRecipientId(),
-                    byUuidRecipient.getRecipientId());
-
-            updateRecipientAddressLocked(byNumberRecipient.getRecipientId(),
-                    new RecipientAddress(byNumberRecipient.getAddress().uuid().get()));
-            updateRecipientAddressLocked(byUuidRecipient.getRecipientId(), address);
-            return new Pair<>(byUuidRecipient.getRecipientId(), Optional.empty());
-        }
-
-        logger.debug("Got separate recipients for high trust number {} and uuid {}, need to merge them",
-                byNumberRecipient.getRecipientId(),
-                byUuidRecipient.getRecipientId());
-        updateRecipientAddressLocked(byUuidRecipient.getRecipientId(), address);
-        // Create a fixed RecipientId that won't update its id after merge
-        final var toBeMergedRecipientId = new RecipientId(byNumberRecipient.getRecipientId().id(), null);
-        mergeRecipientsLocked(byUuidRecipient.getRecipientId(), toBeMergedRecipientId);
-        return new Pair<>(byUuidRecipient.getRecipientId(), Optional.of(toBeMergedRecipientId));
     }
 
-    private RecipientId addNewRecipientLocked(final RecipientAddress address) {
-        final var nextRecipientId = nextIdLocked();
-        logger.debug("Adding new recipient {} with address {}", nextRecipientId, address);
-        storeRecipientLocked(nextRecipientId, new Recipient(nextRecipientId, address, null, null, null, null));
-        return nextRecipientId;
+    public void rotateSelfStorageId() {
+        try (final var connection = database.getConnection()) {
+            rotateSelfStorageId(connection);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
+        }
     }
 
-    private void updateRecipientAddressLocked(RecipientId recipientId, final RecipientAddress address) {
-        final var recipient = recipients.get(recipientId);
-        storeRecipientLocked(recipientId, Recipient.newBuilder(recipient).withAddress(address).build());
+    public void rotateSelfStorageId(final Connection connection) throws SQLException {
+        final var selfRecipientId = resolveRecipient(connection, selfAddressProvider.getSelfAddress());
+        rotateStorageId(connection, selfRecipientId);
+    }
+
+    public StorageId rotateStorageId(final Connection connection, final ServiceId serviceId) throws SQLException {
+        final var selfRecipientId = resolveRecipient(connection, new RecipientAddress(serviceId));
+        return rotateStorageId(connection, selfRecipientId);
+    }
+
+    public List<StorageId> getStorageIds(Connection connection) throws SQLException {
+        final var sql = """
+                        SELECT r.storage_id
+                        FROM %s r WHERE r.storage_id IS NOT NULL AND r._id != ? AND (r.aci IS NOT NULL OR r.pni IS NOT NULL)
+                        """.formatted(TABLE_RECIPIENT);
+        final var selfRecipientId = resolveRecipient(connection, selfAddressProvider.getSelfAddress());
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, selfRecipientId.id());
+            return Utils.executeQueryForStream(statement, this::getContactStorageIdFromResultSet).toList();
+        }
+    }
+
+    public void updateStorageId(
+            Connection connection,
+            RecipientId recipientId,
+            StorageId storageId
+    ) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET storage_id = ?
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, storageId.getRaw());
+            statement.setLong(2, recipientId.id());
+            statement.executeUpdate();
+        }
+    }
+
+    public void updateStorageIds(Connection connection, Map<RecipientId, StorageId> storageIdMap) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET storage_id = ?
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            for (final var entry : storageIdMap.entrySet()) {
+                statement.setBytes(1, entry.getValue().getRaw());
+                statement.setLong(2, entry.getKey().id());
+                statement.executeUpdate();
+            }
+        }
+    }
+
+    public StorageId getSelfStorageId(final Connection connection) throws SQLException {
+        final var selfRecipientId = resolveRecipient(connection, selfAddressProvider.getSelfAddress());
+        return StorageId.forAccount(getStorageId(connection, selfRecipientId).getRaw());
+    }
+
+    public StorageId getStorageId(final Connection connection, final RecipientId recipientId) throws SQLException {
+        final var sql = """
+                        SELECT r.storage_id
+                        FROM %s r WHERE r._id = ? AND r.storage_id IS NOT NULL
+                        """.formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, recipientId.id());
+            final var storageId = Utils.executeQueryForOptional(statement, this::getContactStorageIdFromResultSet);
+            if (storageId.isPresent()) {
+                return storageId.get();
+            }
+        }
+        return rotateStorageId(connection, recipientId);
+    }
+
+    private StorageId rotateStorageId(final Connection connection, final RecipientId recipientId) throws SQLException {
+        final var newStorageId = StorageId.forAccount(KeyUtils.createRawStorageId());
+        updateStorageId(connection, recipientId, newStorageId);
+        return newStorageId;
+    }
+
+    public void storeStorageRecord(
+            final Connection connection,
+            final RecipientId recipientId,
+            final StorageId storageId,
+            final byte[] storageRecord
+    ) throws SQLException {
+        final var deleteSql = (
+                """
+                UPDATE %s
+                SET storage_id = NULL
+                WHERE storage_id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(deleteSql)) {
+            statement.setBytes(1, storageId.getRaw());
+            statement.executeUpdate();
+        }
+        final var insertSql = (
+                """
+                UPDATE %s
+                SET storage_id = ?, storage_record = ?
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(insertSql)) {
+            statement.setBytes(1, storageId.getRaw());
+            if (storageRecord == null) {
+                statement.setNull(2, Types.BLOB);
+            } else {
+                statement.setBytes(2, storageRecord);
+            }
+            statement.setLong(3, recipientId.id());
+            statement.executeUpdate();
+        }
+    }
+
+    void addLegacyRecipients(final Map<RecipientId, Recipient> recipients) {
+        logger.debug("Migrating legacy recipients to database");
+        long start = System.nanoTime();
+        final var sql = (
+                """
+                INSERT INTO %s (_id, number, aci)
+                VALUES (?, ?, ?)
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            try (final var statement = connection.prepareStatement("DELETE FROM %s".formatted(TABLE_RECIPIENT))) {
+                statement.executeUpdate();
+            }
+            try (final var statement = connection.prepareStatement(sql)) {
+                for (final var recipient : recipients.values()) {
+                    statement.setLong(1, recipient.getRecipientId().id());
+                    statement.setString(2, recipient.getAddress().number().orElse(null));
+                    statement.setString(3, recipient.getAddress().aci().map(ACI::toString).orElse(null));
+                    statement.executeUpdate();
+                }
+            }
+            logger.debug("Initial inserts took {}ms", (System.nanoTime() - start) / 1000000);
+
+            for (final var recipient : recipients.values()) {
+                if (recipient.getContact() != null) {
+                    storeContact(connection, recipient.getRecipientId(), recipient.getContact());
+                }
+                if (recipient.getProfile() != null) {
+                    storeProfile(connection, recipient.getRecipientId(), recipient.getProfile());
+                }
+                if (recipient.getProfileKey() != null) {
+                    storeProfileKey(connection, recipient.getRecipientId(), recipient.getProfileKey(), false);
+                }
+                if (recipient.getExpiringProfileKeyCredential() != null) {
+                    storeExpiringProfileKeyCredential(connection,
+                            recipient.getRecipientId(),
+                            recipient.getExpiringProfileKeyCredential());
+                }
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
+        }
+        logger.debug("Complete recipients migration took {}ms", (System.nanoTime() - start) / 1000000);
     }
 
     long getActualRecipientId(long recipientId) {
@@ -517,154 +833,847 @@ public class RecipientStore implements RecipientResolver, RecipientTrustedResolv
         return recipientId;
     }
 
-    private void storeRecipientLocked(final RecipientId recipientId, final Recipient recipient) {
-        final var existingRecipient = recipients.get(recipientId);
-        if (existingRecipient == null || !existingRecipient.equals(recipient)) {
-            recipients.put(recipientId, recipient);
-            saveLocked();
-        }
-    }
-
-    private void mergeRecipientsLocked(RecipientId recipientId, RecipientId toBeMergedRecipientId) {
-        final var recipient = recipients.get(recipientId);
-        final var toBeMergedRecipient = recipients.get(toBeMergedRecipientId);
-        recipients.put(recipientId,
-                new Recipient(recipientId,
-                        recipient.getAddress(),
-                        recipient.getContact() != null ? recipient.getContact() : toBeMergedRecipient.getContact(),
-                        recipient.getProfileKey() != null
-                                ? recipient.getProfileKey()
-                                : toBeMergedRecipient.getProfileKey(),
-                        recipient.getProfileKeyCredential() != null
-                                ? recipient.getProfileKeyCredential()
-                                : toBeMergedRecipient.getProfileKeyCredential(),
-                        recipient.getProfile() != null ? recipient.getProfile() : toBeMergedRecipient.getProfile()));
-        recipients.remove(toBeMergedRecipientId);
-        recipientsMerged.put(toBeMergedRecipientId.id(), recipientId.id());
-        saveLocked();
-    }
-
-    private Optional<Recipient> findByNumberLocked(final String number) {
-        return recipients.entrySet()
-                .stream()
-                .filter(entry -> entry.getValue().getAddress().number().isPresent() && number.equals(entry.getValue()
-                        .getAddress()
-                        .number()
-                        .get()))
-                .findFirst()
-                .map(Map.Entry::getValue);
-    }
-
-    private Optional<Recipient> findByUuidLocked(final UUID uuid) {
-        return recipients.entrySet()
-                .stream()
-                .filter(entry -> entry.getValue().getAddress().uuid().isPresent() && uuid.equals(entry.getValue()
-                        .getAddress()
-                        .uuid()
-                        .get()))
-                .findFirst()
-                .map(Map.Entry::getValue);
-    }
-
-    private RecipientId nextIdLocked() {
-        return new RecipientId(++this.lastId, this);
-    }
-
-    private void saveLocked() {
-        if (isBulkUpdating) {
-            return;
-        }
-        final var base64 = Base64.getEncoder();
-        var storage = new Storage(recipients.entrySet().stream().map(pair -> {
-            final var recipient = pair.getValue();
-            final var recipientContact = recipient.getContact();
-            final var contact = recipientContact == null
-                    ? null
-                    : new Storage.Recipient.Contact(recipientContact.getGivenName(),
-                            recipientContact.getFamilyName(),
-                            recipientContact.getColor(),
-                            recipientContact.getMessageExpirationTime(),
-                            recipientContact.isBlocked(),
-                            recipientContact.isArchived(),
-                            recipientContact.isProfileSharingEnabled());
-            final var recipientProfile = recipient.getProfile();
-            final var profile = recipientProfile == null
-                    ? null
-                    : new Storage.Recipient.Profile(recipientProfile.getLastUpdateTimestamp(),
-                            recipientProfile.getGivenName(),
-                            recipientProfile.getFamilyName(),
-                            recipientProfile.getAbout(),
-                            recipientProfile.getAboutEmoji(),
-                            recipientProfile.getAvatarUrlPath(),
-                            recipientProfile.getMobileCoinAddress() == null
-                                    ? null
-                                    : base64.encodeToString(recipientProfile.getMobileCoinAddress()),
-                            recipientProfile.getUnidentifiedAccessMode().name(),
-                            recipientProfile.getCapabilities().stream().map(Enum::name).collect(Collectors.toSet()));
-            return new Storage.Recipient(pair.getKey().id(),
-                    recipient.getAddress().number().orElse(null),
-                    recipient.getAddress().uuid().map(UUID::toString).orElse(null),
-                    recipient.getProfileKey() == null
-                            ? null
-                            : base64.encodeToString(recipient.getProfileKey().serialize()),
-                    recipient.getProfileKeyCredential() == null
-                            ? null
-                            : base64.encodeToString(recipient.getProfileKeyCredential().serialize()),
-                    contact,
-                    profile);
-        }).toList(), lastId);
-
-        // Write to memory first to prevent corrupting the file in case of serialization errors
-        try (var inMemoryOutput = new ByteArrayOutputStream()) {
-            objectMapper.writeValue(inMemoryOutput, storage);
-
-            var input = new ByteArrayInputStream(inMemoryOutput.toByteArray());
-            try (var outputStream = new FileOutputStream(file)) {
-                input.transferTo(outputStream);
+    public void storeContact(
+            final Connection connection,
+            final RecipientId recipientId,
+            final Contact contact
+    ) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET given_name = ?, family_name = ?, nick_name = ?, expiration_time = ?, expiration_time_version = ?, mute_until = ?, hide_story = ?, profile_sharing = ?, color = ?, blocked = ?, archived = ?, unregistered_timestamp = ?, nick_name_given_name = ?, nick_name_family_name = ?, note = ?
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setString(1, contact == null ? null : contact.givenName());
+            statement.setString(2, contact == null ? null : contact.familyName());
+            statement.setString(3, contact == null ? null : contact.nickName());
+            statement.setInt(4, contact == null ? 0 : contact.messageExpirationTime());
+            statement.setInt(5, contact == null ? 0 : Math.max(1, contact.messageExpirationTimeVersion()));
+            statement.setLong(6, contact == null ? 0 : contact.muteUntil());
+            statement.setBoolean(7, contact != null && contact.hideStory());
+            statement.setBoolean(8, contact != null && contact.isProfileSharingEnabled());
+            statement.setString(9, contact == null ? null : contact.color());
+            statement.setBoolean(10, contact != null && contact.isBlocked());
+            statement.setBoolean(11, contact != null && contact.isArchived());
+            if (contact == null || contact.unregisteredTimestamp() == null) {
+                statement.setNull(12, Types.INTEGER);
+            } else {
+                statement.setLong(12, contact.unregisteredTimestamp());
             }
-        } catch (Exception e) {
-            logger.error("Error saving recipient store file: {}", e.getMessage());
+            statement.setString(13, contact == null ? null : contact.nickNameGivenName());
+            statement.setString(14, contact == null ? null : contact.nickNameFamilyName());
+            statement.setString(15, contact == null ? null : contact.note());
+            statement.setLong(16, recipientId.id());
+            statement.executeUpdate();
+        }
+        if (contact != null && contact.unregisteredTimestamp() != null) {
+            markUnregisteredAndSplitIfNecessary(connection, recipientId);
+        }
+        rotateStorageId(connection, recipientId);
+    }
+
+    public int removeStorageIdsFromLocalOnlyUnregisteredRecipients(
+            final Connection connection,
+            final List<StorageId> storageIds
+    ) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET storage_id = NULL
+                WHERE storage_id = ? AND unregistered_timestamp IS NOT NULL
+                """
+        ).formatted(TABLE_RECIPIENT);
+        var count = 0;
+        try (final var statement = connection.prepareStatement(sql)) {
+            for (final var storageId : storageIds) {
+                statement.setBytes(1, storageId.getRaw());
+                count += statement.executeUpdate();
+            }
+        }
+        return count;
+    }
+
+    public void markNeedsPniSignature(final RecipientId recipientId, final boolean value) {
+        logger.debug("Marking {} numbers as need pni signature = {}", recipientId, value);
+        try (final var connection = database.getConnection()) {
+            final var sql = (
+                    """
+                    UPDATE %s
+                    SET needs_pni_signature = ?
+                    WHERE _id = ?
+                    """
+            ).formatted(TABLE_RECIPIENT);
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setBoolean(1, value);
+                statement.setLong(2, recipientId.id());
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
         }
     }
 
-    private record Storage(List<Recipient> recipients, long lastId) {
-
-        private record Recipient(
-                long id,
-                String number,
-                String uuid,
-                String profileKey,
-                String profileKeyCredential,
-                Storage.Recipient.Contact contact,
-                Storage.Recipient.Profile profile
-        ) {
-
-            private record Contact(
-                    String name,
-                    String familyName,
-                    String color,
-                    int messageExpirationTime,
-                    boolean blocked,
-                    boolean archived,
-                    boolean profileSharingEnabled
-            ) {}
-
-            private record Profile(
-                    long lastUpdateTimestamp,
-                    String givenName,
-                    String familyName,
-                    String about,
-                    String aboutEmoji,
-                    String avatarUrlPath,
-                    String mobileCoinAddress,
-                    String unidentifiedAccessMode,
-                    Set<String> capabilities
-            ) {}
+    public boolean needsPniSignature(final RecipientId recipientId) {
+        try (final var connection = database.getConnection()) {
+            final var sql = (
+                    """
+                    SELECT needs_pni_signature
+                    FROM %s
+                    WHERE _id = ?
+                    """
+            ).formatted(TABLE_RECIPIENT);
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setLong(1, recipientId.id());
+                return Utils.executeQuerySingleRow(statement, resultSet -> resultSet.getBoolean("needs_pni_signature"));
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read recipient store", e);
         }
     }
 
+    public void markUndiscoverablePossiblyUnregistered(final Set<String> numbers) {
+        logger.debug("Marking {} numbers as undiscoverable", numbers.size());
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            for (final var number : numbers) {
+                final var recipientAddress = findByNumber(connection, number);
+                if (recipientAddress.isPresent()) {
+                    final var recipientId = recipientAddress.get().id();
+                    markDiscoverable(connection, recipientId, false);
+                    final var contact = getContact(connection, recipientId);
+                    if (recipientAddress.get().address().aci().isEmpty() || (
+                            contact != null && contact.unregisteredTimestamp() != null
+                    )) {
+                        markUnregisteredAndSplitIfNecessary(connection, recipientId);
+                    }
+                }
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
+        }
+    }
+
+    public void markDiscoverable(final Set<String> numbers) {
+        logger.debug("Marking {} numbers as discoverable", numbers.size());
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            for (final var number : numbers) {
+                final var recipientAddress = findByNumber(connection, number);
+                if (recipientAddress.isPresent()) {
+                    final var recipientId = recipientAddress.get().id();
+                    markDiscoverable(connection, recipientId, true);
+                }
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
+        }
+    }
+
+    public void markRegistered(final RecipientId recipientId, final boolean registered) {
+        logger.debug("Marking {} as registered={}", recipientId, registered);
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            if (registered) {
+                markRegistered(connection, recipientId);
+            } else {
+                markUnregistered(connection, recipientId);
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
+        }
+    }
+
+    private void markUnregisteredAndSplitIfNecessary(
+            final Connection connection,
+            final RecipientId recipientId
+    ) throws SQLException {
+        markUnregistered(connection, recipientId);
+        final var address = resolveRecipientAddress(connection, recipientId);
+        final var needSplit = address.aci().isPresent() && address.pni().isPresent();
+        logger.trace("Marking unregistered recipient {} as unregistered (and split={}): {}",
+                recipientId,
+                needSplit,
+                address);
+        if (needSplit) {
+            final var numberAddress = new RecipientAddress(address.pni().get(), address.number().orElse(null));
+            updateRecipientAddress(connection, recipientId, address.removeIdentifiersFrom(numberAddress));
+            addNewRecipient(connection, numberAddress);
+        }
+    }
+
+    private void markDiscoverable(
+            final Connection connection,
+            final RecipientId recipientId,
+            final boolean discoverable
+    ) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET discoverable = ?
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBoolean(1, discoverable);
+            statement.setLong(2, recipientId.id());
+            statement.executeUpdate();
+        }
+    }
+
+    private void markRegistered(final Connection connection, final RecipientId recipientId) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET unregistered_timestamp = NULL
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, recipientId.id());
+            statement.executeUpdate();
+        }
+    }
+
+    private void markUnregistered(final Connection connection, final RecipientId recipientId) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET unregistered_timestamp = ?, discoverable = FALSE
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, System.currentTimeMillis());
+            statement.setLong(2, recipientId.id());
+            statement.executeUpdate();
+        }
+    }
+
+    private void storeExpiringProfileKeyCredential(
+            final Connection connection,
+            final RecipientId recipientId,
+            final ExpiringProfileKeyCredential profileKeyCredential
+    ) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET profile_key_credential = ?
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, profileKeyCredential == null ? null : profileKeyCredential.serialize());
+            statement.setLong(2, recipientId.id());
+            statement.executeUpdate();
+        }
+    }
+
+    public void storeProfile(
+            final Connection connection,
+            final RecipientId recipientId,
+            final Profile profile
+    ) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET profile_last_update_timestamp = ?, profile_given_name = ?, profile_family_name = ?, profile_about = ?, profile_about_emoji = ?, profile_avatar_url_path = ?, profile_mobile_coin_address = ?, profile_unidentified_access_mode = ?, profile_capabilities = ?, profile_phone_number_sharing = ?
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, profile == null ? 0 : profile.getLastUpdateTimestamp());
+            statement.setString(2, profile == null ? null : profile.getGivenName());
+            statement.setString(3, profile == null ? null : profile.getFamilyName());
+            statement.setString(4, profile == null ? null : profile.getAbout());
+            statement.setString(5, profile == null ? null : profile.getAboutEmoji());
+            statement.setString(6, profile == null ? null : profile.getAvatarUrlPath());
+            statement.setBytes(7, profile == null ? null : profile.getMobileCoinAddress());
+            statement.setString(8, profile == null ? null : profile.getUnidentifiedAccessMode().name());
+            statement.setString(9,
+                    profile == null
+                            ? null
+                            : profile.getCapabilities().stream().map(Enum::name).collect(Collectors.joining(",")));
+            statement.setString(10,
+                    profile == null || profile.getPhoneNumberSharingMode() == null
+                            ? null
+                            : profile.getPhoneNumberSharingMode().name());
+            statement.setLong(11, recipientId.id());
+            statement.executeUpdate();
+        }
+        rotateStorageId(connection, recipientId);
+    }
+
+    private void storeProfileKey(
+            Connection connection,
+            RecipientId recipientId,
+            final ProfileKey profileKey,
+            boolean resetProfile
+    ) throws SQLException {
+        if (profileKey != null) {
+            final var recipientProfileKey = getProfileKey(connection, recipientId);
+            if (profileKey.equals(recipientProfileKey)) {
+                final var recipientProfile = getProfile(connection, recipientId);
+                if (recipientProfile == null || (
+                        recipientProfile.getUnidentifiedAccessMode() != Profile.UnidentifiedAccessMode.UNKNOWN
+                                && recipientProfile.getUnidentifiedAccessMode()
+                                != Profile.UnidentifiedAccessMode.DISABLED
+                )) {
+                    return;
+                }
+            }
+        }
+
+        final var sql = (
+                """
+                UPDATE %s
+                SET profile_key = ?, profile_key_credential = NULL%s
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT, resetProfile ? ", profile_last_update_timestamp = 0" : "");
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, profileKey == null ? null : profileKey.serialize());
+            statement.setLong(2, recipientId.id());
+            statement.executeUpdate();
+        }
+        rotateStorageId(connection, recipientId);
+    }
+
+    private RecipientAddress resolveRecipientAddress(
+            final Connection connection,
+            final RecipientId recipientId
+    ) throws SQLException {
+        final var sql = (
+                """
+                SELECT r.number, r.aci, r.pni, r.username
+                FROM %s r
+                WHERE r._id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, recipientId.id());
+            return Utils.executeQuerySingleRow(statement, this::getRecipientAddressFromResultSet);
+        }
+    }
+
+    private RecipientId resolveRecipientTrusted(RecipientAddress address, boolean isSelf) {
+        final Pair<RecipientId, List<RecipientId>> pair;
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            pair = resolveRecipientTrustedLocked(connection, address, isSelf);
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
+        }
+
+        if (!pair.second().isEmpty()) {
+            logger.debug("Resolved address {}, merging {} other recipients", address, pair.second().size());
+            try (final var connection = database.getConnection()) {
+                connection.setAutoCommit(false);
+                mergeRecipients(connection, pair.first(), pair.second());
+                connection.commit();
+            } catch (SQLException e) {
+                throw new RuntimeException("Failed update recipient store", e);
+            }
+        }
+        return pair.first();
+    }
+
+    private Pair<RecipientId, List<RecipientId>> resolveRecipientTrustedLocked(
+            final Connection connection,
+            final RecipientAddress address,
+            final boolean isSelf
+    ) throws SQLException {
+        if (address.hasSingleIdentifier() || (
+                !isSelf && selfAddressProvider.getSelfAddress().matches(address)
+        )) {
+            return new Pair<>(resolveRecipientLocked(connection, address), List.of());
+        } else {
+            final var pair = MergeRecipientHelper.resolveRecipientTrustedLocked(new HelperStore(connection), address);
+            markRegistered(connection, pair.first());
+
+            for (final var toBeMergedRecipientId : pair.second()) {
+                mergeRecipientsLocked(connection, pair.first(), toBeMergedRecipientId);
+            }
+            return pair;
+        }
+    }
+
+    private void mergeRecipients(
+            final Connection connection,
+            final RecipientId recipientId,
+            final List<RecipientId> toBeMergedRecipientIds
+    ) throws SQLException {
+        for (final var toBeMergedRecipientId : toBeMergedRecipientIds) {
+            recipientMergeHandler.mergeRecipients(connection, recipientId, toBeMergedRecipientId);
+            deleteRecipient(connection, toBeMergedRecipientId);
+            recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(toBeMergedRecipientId));
+        }
+    }
+
+    private RecipientId resolveRecipientLocked(Connection connection, RecipientAddress address) throws SQLException {
+        final var byAci = address.aci().isEmpty()
+                ? Optional.<RecipientWithAddress>empty()
+                : findByServiceId(connection, address.aci().get());
+
+        if (byAci.isPresent()) {
+            return byAci.get().id();
+        }
+
+        final var byPni = address.pni().isEmpty()
+                ? Optional.<RecipientWithAddress>empty()
+                : findByServiceId(connection, address.pni().get());
+
+        if (byPni.isPresent()) {
+            return byPni.get().id();
+        }
+
+        final var byNumber = address.number().isEmpty()
+                ? Optional.<RecipientWithAddress>empty()
+                : findByNumber(connection, address.number().get());
+
+        if (byNumber.isPresent()) {
+            return byNumber.get().id();
+        }
+
+        logger.debug("Got new recipient, both serviceId and number are unknown");
+
+        if (address.serviceId().isEmpty()) {
+            return addNewRecipient(connection, address);
+        }
+
+        return addNewRecipient(connection, new RecipientAddress(address.serviceId().get()));
+    }
+
+    private RecipientId resolveRecipientLocked(Connection connection, ServiceId serviceId) throws SQLException {
+        final var recipient = findByServiceId(connection, serviceId);
+
+        if (recipient.isEmpty()) {
+            logger.debug("Got new recipient, serviceId is unknown");
+            return addNewRecipient(connection, new RecipientAddress(serviceId));
+        }
+
+        return recipient.get().id();
+    }
+
+    private RecipientId resolveRecipientLocked(Connection connection, String number) throws SQLException {
+        final var recipient = findByNumber(connection, number);
+
+        if (recipient.isEmpty()) {
+            logger.debug("Got new recipient, number is unknown");
+            return addNewRecipient(connection, new RecipientAddress(number));
+        }
+
+        return recipient.get().id();
+    }
+
+    private RecipientId addNewRecipient(
+            final Connection connection,
+            final RecipientAddress address
+    ) throws SQLException {
+        final var sql = (
+                """
+                INSERT INTO %s (number, aci, pni, username)
+                VALUES (?, ?, ?, ?)
+                RETURNING _id
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setString(1, address.number().orElse(null));
+            statement.setString(2, address.aci().map(ACI::toString).orElse(null));
+            statement.setString(3, address.pni().map(PNI::toString).orElse(null));
+            statement.setString(4, address.username().orElse(null));
+            final var generatedKey = Utils.executeQueryForOptional(statement, Utils::getIdMapper);
+            if (generatedKey.isPresent()) {
+                final var recipientId = new RecipientId(generatedKey.get(), this);
+                logger.debug("Added new recipient {} with address {}", recipientId, address);
+                return recipientId;
+            } else {
+                throw new RuntimeException("Failed to add new recipient to database");
+            }
+        }
+    }
+
+    private void removeRecipientAddress(Connection connection, RecipientId recipientId) throws SQLException {
+        recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(recipientId));
+        final var sql = (
+                """
+                UPDATE %s
+                SET number = NULL, aci = NULL, pni = NULL, username = NULL, storage_id = NULL
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, recipientId.id());
+            statement.executeUpdate();
+        }
+    }
+
+    private void updateRecipientAddress(
+            Connection connection,
+            RecipientId recipientId,
+            final RecipientAddress address
+    ) throws SQLException {
+        recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(recipientId));
+        final var sql = (
+                """
+                UPDATE %s
+                SET number = ?, aci = ?, pni = ?, username = ?
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setString(1, address.number().orElse(null));
+            statement.setString(2, address.aci().map(ACI::toString).orElse(null));
+            statement.setString(3, address.pni().map(PNI::toString).orElse(null));
+            statement.setString(4, address.username().orElse(null));
+            statement.setLong(5, recipientId.id());
+            statement.executeUpdate();
+        }
+        rotateStorageId(connection, recipientId);
+    }
+
+    private void deleteRecipient(final Connection connection, final RecipientId recipientId) throws SQLException {
+        final var sql = (
+                """
+                DELETE FROM %s
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, recipientId.id());
+            statement.executeUpdate();
+        }
+    }
+
+    private void mergeRecipientsLocked(
+            Connection connection,
+            RecipientId recipientId,
+            RecipientId toBeMergedRecipientId
+    ) throws SQLException {
+        final var contact = getContact(connection, recipientId);
+        if (contact == null) {
+            final var toBeMergedContact = getContact(connection, toBeMergedRecipientId);
+            storeContact(connection, recipientId, toBeMergedContact);
+        }
+
+        final var profileKey = getProfileKey(connection, recipientId);
+        if (profileKey == null) {
+            final var toBeMergedProfileKey = getProfileKey(connection, toBeMergedRecipientId);
+            storeProfileKey(connection, recipientId, toBeMergedProfileKey, false);
+        }
+
+        final var profileKeyCredential = getExpiringProfileKeyCredential(connection, recipientId);
+        if (profileKeyCredential == null) {
+            final var toBeMergedProfileKeyCredential = getExpiringProfileKeyCredential(connection,
+                    toBeMergedRecipientId);
+            storeExpiringProfileKeyCredential(connection, recipientId, toBeMergedProfileKeyCredential);
+        }
+
+        final var profile = getProfile(connection, recipientId);
+        if (profile == null) {
+            final var toBeMergedProfile = getProfile(connection, toBeMergedRecipientId);
+            storeProfile(connection, recipientId, toBeMergedProfile);
+        }
+
+        recipientsMerged.put(toBeMergedRecipientId.id(), recipientId.id());
+    }
+
+    private Optional<RecipientWithAddress> findByNumber(
+            final Connection connection,
+            final String number
+    ) throws SQLException {
+        final var sql = """
+                        SELECT r._id, r.number, r.aci, r.pni, r.username
+                        FROM %s r
+                        WHERE r.number = ?
+                        LIMIT 1
+                        """.formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setString(1, number);
+            return Utils.executeQueryForOptional(statement, this::getRecipientWithAddressFromResultSet);
+        }
+    }
+
+    private Optional<RecipientWithAddress> findByUsername(
+            final Connection connection,
+            final String username
+    ) throws SQLException {
+        final var sql = """
+                        SELECT r._id, r.number, r.aci, r.pni, r.username
+                        FROM %s r
+                        WHERE r.username = ?
+                        LIMIT 1
+                        """.formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setString(1, username);
+            return Utils.executeQueryForOptional(statement, this::getRecipientWithAddressFromResultSet);
+        }
+    }
+
+    private Optional<RecipientWithAddress> findByServiceId(
+            final Connection connection,
+            final ServiceId serviceId
+    ) throws SQLException {
+        var recipientWithAddress = Optional.ofNullable(recipientAddressCache.get(serviceId));
+        if (recipientWithAddress.isPresent()) {
+            return recipientWithAddress;
+        }
+        final var sql = """
+                        SELECT r._id, r.number, r.aci, r.pni, r.username
+                        FROM %s r
+                        WHERE %s = ?1
+                        LIMIT 1
+                        """.formatted(TABLE_RECIPIENT, serviceId instanceof ACI ? "r.aci" : "r.pni");
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setString(1, serviceId.toString());
+            recipientWithAddress = Utils.executeQueryForOptional(statement, this::getRecipientWithAddressFromResultSet);
+            recipientWithAddress.ifPresent(r -> recipientAddressCache.put(serviceId, r));
+            return recipientWithAddress;
+        }
+    }
+
+    private Set<RecipientWithAddress> findAllByAddress(
+            final Connection connection,
+            final RecipientAddress address
+    ) throws SQLException {
+        final var sql = """
+                        SELECT r._id, r.number, r.aci, r.pni, r.username
+                        FROM %s r
+                        WHERE r.aci = ?1 OR
+                              r.pni = ?2 OR
+                              r.number = ?3 OR
+                              r.username = ?4
+                        """.formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setString(1, address.aci().map(ServiceId::toString).orElse(null));
+            statement.setString(2, address.pni().map(ServiceId::toString).orElse(null));
+            statement.setString(3, address.number().orElse(null));
+            statement.setString(4, address.username().orElse(null));
+            return Utils.executeQueryForStream(statement, this::getRecipientWithAddressFromResultSet)
+                    .collect(Collectors.toSet());
+        }
+    }
+
+    private Contact getContact(final Connection connection, final RecipientId recipientId) throws SQLException {
+        final var sql = (
+                """
+                SELECT r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp
+                FROM %s r
+                WHERE r._id = ? AND (%s)
+                """
+        ).formatted(TABLE_RECIPIENT, SQL_IS_CONTACT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, recipientId.id());
+            return Utils.executeQueryForOptional(statement, this::getContactFromResultSet).orElse(null);
+        }
+    }
+
+    private ProfileKey getProfileKey(final Connection connection, final RecipientId recipientId) throws SQLException {
+        final var selfRecipientId = resolveRecipientLocked(connection, selfAddressProvider.getSelfAddress());
+        if (recipientId.equals(selfRecipientId)) {
+            return selfProfileKeyProvider.getSelfProfileKey();
+        }
+        final var sql = (
+                """
+                SELECT r.profile_key
+                FROM %s r
+                WHERE r._id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, recipientId.id());
+            return Utils.executeQueryForOptional(statement, this::getProfileKeyFromResultSet).orElse(null);
+        }
+    }
+
+    private ExpiringProfileKeyCredential getExpiringProfileKeyCredential(
+            final Connection connection,
+            final RecipientId recipientId
+    ) throws SQLException {
+        final var sql = (
+                """
+                SELECT r.profile_key_credential
+                FROM %s r
+                WHERE r._id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, recipientId.id());
+            return Utils.executeQueryForOptional(statement, this::getExpiringProfileKeyCredentialFromResultSet)
+                    .orElse(null);
+        }
+    }
+
+    public Profile getProfile(final Connection connection, final RecipientId recipientId) throws SQLException {
+        final var sql = (
+                """
+                SELECT r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities, r.profile_phone_number_sharing
+                FROM %s r
+                WHERE r._id = ? AND r.profile_capabilities IS NOT NULL
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, recipientId.id());
+            return Utils.executeQueryForOptional(statement, this::getProfileFromResultSet).orElse(null);
+        }
+    }
+
+    private RecipientAddress getRecipientAddressFromResultSet(ResultSet resultSet) throws SQLException {
+        final var aci = Optional.ofNullable(resultSet.getString("aci")).map(ACI::parseOrNull);
+        final var pni = Optional.ofNullable(resultSet.getString("pni")).map(PNI::parseOrNull);
+        final var number = Optional.ofNullable(resultSet.getString("number"));
+        final var username = Optional.ofNullable(resultSet.getString("username"));
+        return new RecipientAddress(aci, pni, number, username);
+    }
+
+    private RecipientId getRecipientIdFromResultSet(ResultSet resultSet) throws SQLException {
+        return new RecipientId(resultSet.getLong("_id"), this);
+    }
+
+    private RecipientWithAddress getRecipientWithAddressFromResultSet(final ResultSet resultSet) throws SQLException {
+        return new RecipientWithAddress(getRecipientIdFromResultSet(resultSet),
+                getRecipientAddressFromResultSet(resultSet));
+    }
+
+    private Recipient getRecipientFromResultSet(final ResultSet resultSet) throws SQLException {
+        return new Recipient(getRecipientIdFromResultSet(resultSet),
+                getRecipientAddressFromResultSet(resultSet),
+                getContactFromResultSet(resultSet),
+                getProfileKeyFromResultSet(resultSet),
+                getExpiringProfileKeyCredentialFromResultSet(resultSet),
+                getProfileFromResultSet(resultSet),
+                getDiscoverableFromResultSet(resultSet),
+                getStorageRecordFromResultSet(resultSet));
+    }
+
+    private Contact getContactFromResultSet(ResultSet resultSet) throws SQLException {
+        final var unregisteredTimestamp = resultSet.getLong("unregistered_timestamp");
+        return new Contact(resultSet.getString("given_name"),
+                resultSet.getString("family_name"),
+                resultSet.getString("nick_name"),
+                resultSet.getString("nick_name_given_name"),
+                resultSet.getString("nick_name_family_name"),
+                resultSet.getString("note"),
+                resultSet.getString("color"),
+                resultSet.getInt("expiration_time"),
+                resultSet.getInt("expiration_time_version"),
+                resultSet.getLong("mute_until"),
+                resultSet.getBoolean("hide_story"),
+                resultSet.getBoolean("blocked"),
+                resultSet.getBoolean("archived"),
+                resultSet.getBoolean("profile_sharing"),
+                resultSet.getBoolean("hidden"),
+                unregisteredTimestamp == 0 ? null : unregisteredTimestamp);
+    }
+
+    private static Boolean getDiscoverableFromResultSet(final ResultSet resultSet) throws SQLException {
+        final var discoverable = resultSet.getBoolean("discoverable");
+        if (resultSet.wasNull()) {
+            return null;
+        }
+        return discoverable;
+    }
+
+    private Profile getProfileFromResultSet(ResultSet resultSet) throws SQLException {
+        final var profileCapabilities = resultSet.getString("profile_capabilities");
+        final var profileUnidentifiedAccessMode = resultSet.getString("profile_unidentified_access_mode");
+        return new Profile(resultSet.getLong("profile_last_update_timestamp"),
+                resultSet.getString("profile_given_name"),
+                resultSet.getString("profile_family_name"),
+                resultSet.getString("profile_about"),
+                resultSet.getString("profile_about_emoji"),
+                resultSet.getString("profile_avatar_url_path"),
+                resultSet.getBytes("profile_mobile_coin_address"),
+                profileUnidentifiedAccessMode == null
+                        ? Profile.UnidentifiedAccessMode.UNKNOWN
+                        : Profile.UnidentifiedAccessMode.valueOfOrUnknown(profileUnidentifiedAccessMode),
+                profileCapabilities == null
+                        ? Set.of()
+                        : Arrays.stream(profileCapabilities.split(","))
+                                .map(Profile.Capability::valueOfOrNull)
+                                .filter(Objects::nonNull)
+                                .collect(Collectors.toSet()),
+                PhoneNumberSharingMode.valueOfOrNull(resultSet.getString("profile_phone_number_sharing")));
+    }
+
+    private ProfileKey getProfileKeyFromResultSet(ResultSet resultSet) throws SQLException {
+        final var profileKey = resultSet.getBytes("profile_key");
+
+        if (profileKey == null) {
+            return null;
+        }
+        try {
+            return new ProfileKey(profileKey);
+        } catch (InvalidInputException ignored) {
+            return null;
+        }
+    }
+
+    private ExpiringProfileKeyCredential getExpiringProfileKeyCredentialFromResultSet(ResultSet resultSet) throws SQLException {
+        final var profileKeyCredential = resultSet.getBytes("profile_key_credential");
+
+        if (profileKeyCredential == null) {
+            return null;
+        }
+        try {
+            return new ExpiringProfileKeyCredential(profileKeyCredential);
+        } catch (Throwable ignored) {
+            return null;
+        }
+    }
+
+    private StorageId getContactStorageIdFromResultSet(ResultSet resultSet) throws SQLException {
+        final var storageId = resultSet.getBytes("storage_id");
+        return StorageId.forContact(storageId);
+    }
+
+    private byte[] getStorageRecordFromResultSet(ResultSet resultSet) throws SQLException {
+        return resultSet.getBytes("storage_record");
+    }
+
     public interface RecipientMergeHandler {
 
-        void mergeRecipients(RecipientId recipientId, RecipientId toBeMergedRecipientId);
+        void mergeRecipients(
+                final Connection connection,
+                RecipientId recipientId,
+                RecipientId toBeMergedRecipientId
+        ) throws SQLException;
+    }
+
+    private class HelperStore implements MergeRecipientHelper.Store {
+
+        private final Connection connection;
+
+        public HelperStore(final Connection connection) {
+            this.connection = connection;
+        }
+
+        @Override
+        public Set<RecipientWithAddress> findAllByAddress(final RecipientAddress address) throws SQLException {
+            return RecipientStore.this.findAllByAddress(connection, address);
+        }
+
+        @Override
+        public RecipientId addNewRecipient(final RecipientAddress address) throws SQLException {
+            return RecipientStore.this.addNewRecipient(connection, address);
+        }
+
+        @Override
+        public void updateRecipientAddress(
+                final RecipientId recipientId,
+                final RecipientAddress address
+        ) throws SQLException {
+            RecipientStore.this.updateRecipientAddress(connection, recipientId, address);
+        }
+
+        @Override
+        public void removeRecipientAddress(final RecipientId recipientId) throws SQLException {
+            RecipientStore.this.removeRecipientAddress(connection, recipientId);
+        }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java
index 0bc522e3..06d29060 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java
@@ -1,10 +1,59 @@
 package org.asamk.signal.manager.storage.recipients;
 
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
+import java.util.Optional;
+import java.util.function.Supplier;
+
 public interface RecipientTrustedResolver {
 
     RecipientId resolveSelfRecipientTrusted(RecipientAddress address);
 
+    RecipientId resolveRecipientTrusted(RecipientAddress address);
+
     RecipientId resolveRecipientTrusted(SignalServiceAddress address);
+
+    RecipientId resolveRecipientTrusted(Optional<ACI> aci, Optional<PNI> pni, Optional<String> number);
+
+    RecipientId resolveRecipientTrusted(ACI aci, String username);
+
+    class RecipientTrustedResolverWrapper implements RecipientTrustedResolver {
+
+        private final Supplier<RecipientTrustedResolver> recipientTrustedResolverSupplier;
+
+        public RecipientTrustedResolverWrapper(final Supplier<RecipientTrustedResolver> recipientTrustedResolverSupplier) {
+            this.recipientTrustedResolverSupplier = recipientTrustedResolverSupplier;
+        }
+
+        @Override
+        public RecipientId resolveSelfRecipientTrusted(final RecipientAddress address) {
+            return recipientTrustedResolverSupplier.get().resolveSelfRecipientTrusted(address);
+        }
+
+        @Override
+        public RecipientId resolveRecipientTrusted(final RecipientAddress address) {
+            return recipientTrustedResolverSupplier.get().resolveRecipientTrusted(address);
+        }
+
+        @Override
+        public RecipientId resolveRecipientTrusted(final SignalServiceAddress address) {
+            return recipientTrustedResolverSupplier.get().resolveRecipientTrusted(address);
+        }
+
+        @Override
+        public RecipientId resolveRecipientTrusted(
+                final Optional<ACI> aci,
+                final Optional<PNI> pni,
+                final Optional<String> number
+        ) {
+            return recipientTrustedResolverSupplier.get().resolveRecipientTrusted(aci, pni, number);
+        }
+
+        @Override
+        public RecipientId resolveRecipientTrusted(final ACI aci, final String username) {
+            return recipientTrustedResolverSupplier.get().resolveRecipientTrusted(aci, username);
+        }
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientWithAddress.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientWithAddress.java
new file mode 100644
index 00000000..0fc00113
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientWithAddress.java
@@ -0,0 +1,3 @@
+package org.asamk.signal.manager.storage.recipients;
+
+public record RecipientWithAddress(RecipientId id, RecipientAddress address) {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/SelfProfileKeyProvider.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/SelfProfileKeyProvider.java
new file mode 100644
index 00000000..c3f7f000
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/SelfProfileKeyProvider.java
@@ -0,0 +1,8 @@
+package org.asamk.signal.manager.storage.recipients;
+
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
+
+public interface SelfProfileKeyProvider {
+
+    ProfileKey getSelfProfileKey();
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogEntry.java b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogEntry.java
index 31a4252a..b8d951c1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogEntry.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogEntry.java
@@ -1,11 +1,11 @@
 package org.asamk.signal.manager.storage.sendLog;
 
-import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.api.GroupId;
 import org.whispersystems.signalservice.api.crypto.ContentHint;
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+import org.whispersystems.signalservice.internal.push.Content;
 
 import java.util.Optional;
 
 public record MessageSendLogEntry(
-        Optional<GroupId> groupId, SignalServiceProtos.Content content, ContentHint contentHint
+        Optional<GroupId> groupId, Content content, ContentHint contentHint, boolean urgent
 ) {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
index 79fc28f0..20bfdb6a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
@@ -1,32 +1,26 @@
 package org.asamk.signal.manager.storage.sendLog;
 
-import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.groups.GroupUtils;
 import org.asamk.signal.manager.storage.Database;
-import org.asamk.signal.manager.storage.recipients.RecipientId;
-import org.asamk.signal.manager.storage.recipients.RecipientResolver;
+import org.asamk.signal.manager.storage.Utils;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.crypto.ContentHint;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.internal.push.Content;
 
 import java.io.IOException;
 import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.time.Duration;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.function.Consumer;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 
 public class MessageSendLogStore implements AutoCloseable {
 
@@ -37,22 +31,21 @@ public class MessageSendLogStore implements AutoCloseable {
 
     private static final Duration LOG_DURATION = Duration.ofDays(1);
 
-    private final RecipientResolver recipientResolver;
     private final Database database;
     private final Thread cleanupThread;
+    private final boolean sendLogDisabled;
 
-    public MessageSendLogStore(
-            final RecipientResolver recipientResolver, final Database database
-    ) {
-        this.recipientResolver = recipientResolver;
+    public MessageSendLogStore(final Database database, final boolean disableMessageSendLog) {
         this.database = database;
-        this.cleanupThread = new Thread(() -> {
+        this.sendLogDisabled = disableMessageSendLog;
+        this.cleanupThread = Thread.ofPlatform().name("msl-cleanup").daemon().start(() -> {
             try {
                 final var interval = Duration.ofHours(1).toMillis();
                 while (!Thread.interrupted()) {
                     try (final var connection = database.getConnection()) {
                         deleteOutdatedEntries(connection);
                     } catch (SQLException e) {
+                        logger.debug("MSL", e);
                         logger.warn("Deleting outdated entries failed");
                         break;
                     }
@@ -62,60 +55,53 @@ public class MessageSendLogStore implements AutoCloseable {
                 logger.debug("Stopping msl cleanup thread");
             }
         });
-        cleanupThread.setName("msl-cleanup");
-        cleanupThread.setDaemon(true);
-        cleanupThread.start();
     }
 
     public static void createSql(Connection connection) throws SQLException {
+        // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
         try (final var statement = connection.createStatement()) {
             statement.executeUpdate("""
                                     CREATE TABLE message_send_log (
                                       _id INTEGER PRIMARY KEY,
                                       content_id INTEGER NOT NULL REFERENCES message_send_log_content (_id) ON DELETE CASCADE,
-                                      recipient_id INTEGER NOT NULL,
+                                      address TEXT NOT NULL,
                                       device_id INTEGER NOT NULL
-                                    );
+                                    ) STRICT;
                                     CREATE TABLE message_send_log_content (
                                       _id INTEGER PRIMARY KEY,
                                       group_id BLOB,
                                       timestamp INTEGER NOT NULL,
                                       content BLOB NOT NULL,
-                                      content_hint INTEGER NOT NULL
-                                    );
+                                      content_hint INTEGER NOT NULL,
+                                      urgent INTEGER NOT NULL
+                                    ) STRICT;
                                     CREATE INDEX mslc_timestamp_index ON message_send_log_content (timestamp);
-                                    CREATE INDEX msl_recipient_index ON message_send_log (recipient_id, device_id, content_id);
+                                    CREATE INDEX msl_recipient_index ON message_send_log (address, device_id, content_id);
                                     CREATE INDEX msl_content_index ON message_send_log (content_id);
                                     """);
         }
     }
 
     public List<MessageSendLogEntry> findMessages(
-            final RecipientId recipientId, final int deviceId, final long timestamp, final boolean isSenderKey
+            final ServiceId serviceId,
+            final int deviceId,
+            final long timestamp,
+            final boolean isSenderKey
     ) {
+        final var sql = """
+                        SELECT group_id, content, content_hint, urgent
+                        FROM %s l
+                             INNER JOIN %s lc ON l.content_id = lc._id
+                        WHERE l.address = ? AND l.device_id = ? AND lc.timestamp = ?
+                        """.formatted(TABLE_MESSAGE_SEND_LOG, TABLE_MESSAGE_SEND_LOG_CONTENT);
         try (final var connection = database.getConnection()) {
             deleteOutdatedEntries(connection);
 
-            try (final var statement = connection.prepareStatement(
-                    "SELECT group_id, content, content_hint FROM %s l INNER JOIN %s lc ON l.content_id = lc._id WHERE l.recipient_id = ? AND l.device_id = ? AND lc.timestamp = ?".formatted(
-                            TABLE_MESSAGE_SEND_LOG,
-                            TABLE_MESSAGE_SEND_LOG_CONTENT))) {
-                statement.setLong(1, recipientId.id());
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setString(1, serviceId.toString());
                 statement.setInt(2, deviceId);
                 statement.setLong(3, timestamp);
-                try (var result = executeQueryForStream(statement, resultSet -> {
-                    final var groupId = Optional.ofNullable(resultSet.getBytes("group_id"))
-                            .map(GroupId::unknownVersion);
-                    final SignalServiceProtos.Content content;
-                    try {
-                        content = SignalServiceProtos.Content.parseFrom(resultSet.getBinaryStream("content"));
-                    } catch (IOException e) {
-                        logger.warn("Failed to parse content from message send log", e);
-                        return null;
-                    }
-                    final var contentHint = ContentHint.fromType(resultSet.getInt("content_hint"));
-                    return new MessageSendLogEntry(groupId, content, contentHint);
-                })) {
+                try (var result = Utils.executeQueryForStream(statement, this::getMessageSendLogEntryFromResultSet)) {
                     return result.filter(Objects::nonNull)
                             .filter(e -> !isSenderKey || e.groupId().isPresent())
                             .toList();
@@ -128,8 +114,14 @@ public class MessageSendLogStore implements AutoCloseable {
     }
 
     public long insertIfPossible(
-            long sentTimestamp, SendMessageResult sendMessageResult, ContentHint contentHint
+            long sentTimestamp,
+            SendMessageResult sendMessageResult,
+            ContentHint contentHint,
+            boolean urgent
     ) {
+        if (sendLogDisabled) {
+            return -1;
+        }
         final RecipientDevices recipientDevice = getRecipientDevices(sendMessageResult);
         if (recipientDevice == null) {
             return -1;
@@ -138,12 +130,19 @@ public class MessageSendLogStore implements AutoCloseable {
         return insert(List.of(recipientDevice),
                 sentTimestamp,
                 sendMessageResult.getSuccess().getContent().get(),
-                contentHint);
+                contentHint,
+                urgent);
     }
 
     public long insertIfPossible(
-            long sentTimestamp, List<SendMessageResult> sendMessageResults, ContentHint contentHint
+            long sentTimestamp,
+            List<SendMessageResult> sendMessageResults,
+            ContentHint contentHint,
+            boolean urgent
     ) {
+        if (sendLogDisabled) {
+            return -1;
+        }
         final var recipientDevices = sendMessageResults.stream()
                 .map(this::getRecipientDevices)
                 .filter(Objects::nonNull)
@@ -158,10 +157,13 @@ public class MessageSendLogStore implements AutoCloseable {
                 .findFirst()
                 .get();
 
-        return insert(recipientDevices, sentTimestamp, content, contentHint);
+        return insert(recipientDevices, sentTimestamp, content, contentHint, urgent);
     }
 
     public void addRecipientToExistingEntryIfPossible(final long contentId, final SendMessageResult sendMessageResult) {
+        if (sendLogDisabled) {
+            return;
+        }
         final RecipientDevices recipientDevice = getRecipientDevices(sendMessageResult);
         if (recipientDevice == null) {
             return;
@@ -171,8 +173,12 @@ public class MessageSendLogStore implements AutoCloseable {
     }
 
     public void addRecipientToExistingEntryIfPossible(
-            final long contentId, final List<SendMessageResult> sendMessageResults
+            final long contentId,
+            final List<SendMessageResult> sendMessageResults
     ) {
+        if (sendLogDisabled) {
+            return;
+        }
         final var recipientDevices = sendMessageResults.stream()
                 .map(this::getRecipientDevices)
                 .filter(Objects::nonNull)
@@ -185,10 +191,12 @@ public class MessageSendLogStore implements AutoCloseable {
     }
 
     public void deleteEntryForGroup(long sentTimestamp, GroupId groupId) {
+        final var sql = """
+                        DELETE FROM %s AS lc
+                        WHERE lc.timestamp = ? AND lc.group_id = ?
+                        """.formatted(TABLE_MESSAGE_SEND_LOG_CONTENT);
         try (final var connection = database.getConnection()) {
-            try (final var statement = connection.prepareStatement(
-                    "DELETE FROM %s AS lc WHERE lc.timestamp = ? AND lc.group_id = ?".formatted(
-                            TABLE_MESSAGE_SEND_LOG_CONTENT))) {
+            try (final var statement = connection.prepareStatement(sql)) {
                 statement.setLong(1, sentTimestamp);
                 statement.setBytes(2, groupId.serialize());
                 statement.executeUpdate();
@@ -198,15 +206,16 @@ public class MessageSendLogStore implements AutoCloseable {
         }
     }
 
-    public void deleteEntryForRecipientNonGroup(long sentTimestamp, RecipientId recipientId) {
+    public void deleteEntryForRecipientNonGroup(long sentTimestamp, ServiceId serviceId) {
+        final var sql = """
+                        DELETE FROM %s AS lc
+                        WHERE lc.timestamp = ? AND lc.group_id IS NULL AND lc._id IN (SELECT content_id FROM %s l WHERE l.address = ?)
+                        """.formatted(TABLE_MESSAGE_SEND_LOG_CONTENT, TABLE_MESSAGE_SEND_LOG);
         try (final var connection = database.getConnection()) {
             connection.setAutoCommit(false);
-            try (final var statement = connection.prepareStatement(
-                    "DELETE FROM %s AS lc WHERE lc.timestamp = ? AND lc.group_id IS NULL AND lc._id IN (SELECT content_id FROM %s l WHERE l.recipient_id = ?)".formatted(
-                            TABLE_MESSAGE_SEND_LOG_CONTENT,
-                            TABLE_MESSAGE_SEND_LOG))) {
+            try (final var statement = connection.prepareStatement(sql)) {
                 statement.setLong(1, sentTimestamp);
-                statement.setLong(2, recipientId.id());
+                statement.setString(2, serviceId.toString());
                 statement.executeUpdate();
             }
 
@@ -217,20 +226,21 @@ public class MessageSendLogStore implements AutoCloseable {
         }
     }
 
-    public void deleteEntryForRecipient(long sentTimestamp, RecipientId recipientId, int deviceId) {
-        deleteEntriesForRecipient(List.of(sentTimestamp), recipientId, deviceId);
+    public void deleteEntryForRecipient(long sentTimestamp, ServiceId serviceId, int deviceId) {
+        deleteEntriesForRecipient(List.of(sentTimestamp), serviceId, deviceId);
     }
 
-    public void deleteEntriesForRecipient(List<Long> sentTimestamps, RecipientId recipientId, int deviceId) {
+    public void deleteEntriesForRecipient(List<Long> sentTimestamps, ServiceId serviceId, int deviceId) {
+        final var sql = """
+                        DELETE FROM %s AS l
+                        WHERE l.content_id IN (SELECT _id FROM %s lc WHERE lc.timestamp = ?) AND l.address = ? AND l.device_id = ?
+                        """.formatted(TABLE_MESSAGE_SEND_LOG, TABLE_MESSAGE_SEND_LOG_CONTENT);
         try (final var connection = database.getConnection()) {
             connection.setAutoCommit(false);
-            try (final var statement = connection.prepareStatement(
-                    "DELETE FROM %s AS l WHERE l.content_id IN (SELECT _id FROM %s lc WHERE lc.timestamp = ?) AND l.recipient_id = ? AND l.device_id = ?".formatted(
-                            TABLE_MESSAGE_SEND_LOG,
-                            TABLE_MESSAGE_SEND_LOG_CONTENT))) {
+            try (final var statement = connection.prepareStatement(sql)) {
                 for (final var sentTimestamp : sentTimestamps) {
                     statement.setLong(1, sentTimestamp);
-                    statement.setLong(2, recipientId.id());
+                    statement.setString(2, serviceId.toString());
                     statement.setInt(3, deviceId);
                     statement.executeUpdate();
                 }
@@ -254,8 +264,8 @@ public class MessageSendLogStore implements AutoCloseable {
 
     private RecipientDevices getRecipientDevices(final SendMessageResult sendMessageResult) {
         if (sendMessageResult.isSuccess() && sendMessageResult.getSuccess().getContent().isPresent()) {
-            final var recipientId = recipientResolver.resolveRecipient(sendMessageResult.getAddress());
-            return new RecipientDevices(recipientId, sendMessageResult.getSuccess().getDevices());
+            final var serviceId = sendMessageResult.getAddress().getServiceId();
+            return new RecipientDevices(serviceId, sendMessageResult.getSuccess().getDevices());
         } else {
             return null;
         }
@@ -264,25 +274,29 @@ public class MessageSendLogStore implements AutoCloseable {
     private long insert(
             final List<RecipientDevices> recipientDevices,
             final long sentTimestamp,
-            final SignalServiceProtos.Content content,
-            final ContentHint contentHint
+            final Content content,
+            final ContentHint contentHint,
+            final boolean urgent
     ) {
         byte[] groupId = getGroupId(content);
 
+        final var sql = """
+                        INSERT INTO %s (timestamp, group_id, content, content_hint, urgent)
+                        VALUES (?,?,?,?,?)
+                        RETURNING _id
+                        """.formatted(TABLE_MESSAGE_SEND_LOG_CONTENT);
         try (final var connection = database.getConnection()) {
             connection.setAutoCommit(false);
             final long contentId;
-            try (final var statement = connection.prepareStatement(
-                    "INSERT INTO %s (timestamp, group_id, content, content_hint) VALUES (?,?,?,?)".formatted(
-                            TABLE_MESSAGE_SEND_LOG_CONTENT))) {
+            try (final var statement = connection.prepareStatement(sql)) {
                 statement.setLong(1, sentTimestamp);
                 statement.setBytes(2, groupId);
-                statement.setBytes(3, content.toByteArray());
+                statement.setBytes(3, content.encode());
                 statement.setInt(4, contentHint.getType());
-                statement.executeUpdate();
-                final var generatedKeys = statement.getGeneratedKeys();
-                if (generatedKeys.next()) {
-                    contentId = generatedKeys.getLong(1);
+                statement.setBoolean(5, urgent);
+                final var generatedKey = Utils.executeQueryForOptional(statement, Utils::getIdMapper);
+                if (generatedKey.isPresent()) {
+                    contentId = generatedKey.get();
                 } else {
                     contentId = -1;
                 }
@@ -301,17 +315,15 @@ public class MessageSendLogStore implements AutoCloseable {
         }
     }
 
-    private byte[] getGroupId(final SignalServiceProtos.Content content) {
+    private byte[] getGroupId(final Content content) {
         try {
-            return !content.hasDataMessage()
+            return content.dataMessage == null
                     ? null
-                    : content.getDataMessage().hasGroup()
-                            ? content.getDataMessage().getGroup().getId().toByteArray()
-                            : content.getDataMessage().hasGroupV2()
-                                    ? GroupUtils.getGroupIdV2(new GroupMasterKey(content.getDataMessage()
-                                    .getGroupV2()
-                                    .getMasterKey()
-                                    .toByteArray())).serialize()
+                    : content.dataMessage.group != null && content.dataMessage.group.id != null
+                            ? content.dataMessage.group.id.toByteArray()
+                            : content.dataMessage.groupV2 != null && content.dataMessage.groupV2.masterKey != null
+                                    ? GroupUtils.getGroupIdV2(new GroupMasterKey(content.dataMessage.groupV2.masterKey.toByteArray()))
+                                    .serialize()
                                     : null;
         } catch (InvalidInputException e) {
             logger.warn("Failed to parse groupId id from content");
@@ -320,7 +332,8 @@ public class MessageSendLogStore implements AutoCloseable {
     }
 
     private void insertRecipientsForExistingContent(
-            final long contentId, final List<RecipientDevices> recipientDevices
+            final long contentId,
+            final List<RecipientDevices> recipientDevices
     ) {
         try (final var connection = database.getConnection()) {
             connection.setAutoCommit(false);
@@ -332,13 +345,18 @@ public class MessageSendLogStore implements AutoCloseable {
     }
 
     private void insertRecipientsForExistingContent(
-            final long contentId, final List<RecipientDevices> recipientDevices, final Connection connection
+            final long contentId,
+            final List<RecipientDevices> recipientDevices,
+            final Connection connection
     ) throws SQLException {
-        try (final var statement = connection.prepareStatement(
-                "INSERT INTO %s (recipient_id, device_id, content_id) VALUES (?,?,?)".formatted(TABLE_MESSAGE_SEND_LOG))) {
+        final var sql = """
+                        INSERT INTO %s (address, device_id, content_id)
+                        VALUES (?,?,?)
+                        """.formatted(TABLE_MESSAGE_SEND_LOG);
+        try (final var statement = connection.prepareStatement(sql)) {
             for (final var recipientDevice : recipientDevices) {
                 for (final var deviceId : recipientDevice.deviceIds()) {
-                    statement.setLong(1, recipientDevice.recipientId().id());
+                    statement.setString(1, recipientDevice.serviceId().toString());
                     statement.setInt(2, deviceId);
                     statement.setLong(3, contentId);
                     statement.executeUpdate();
@@ -348,8 +366,11 @@ public class MessageSendLogStore implements AutoCloseable {
     }
 
     private void deleteOutdatedEntries(final Connection connection) throws SQLException {
-        try (final var statement = connection.prepareStatement("DELETE FROM %s WHERE timestamp < ?".formatted(
-                TABLE_MESSAGE_SEND_LOG_CONTENT))) {
+        final var sql = """
+                        DELETE FROM %s
+                        WHERE timestamp < ?
+                        """.formatted(TABLE_MESSAGE_SEND_LOG_CONTENT);
+        try (final var statement = connection.prepareStatement(sql)) {
             statement.setLong(1, System.currentTimeMillis() - LOG_DURATION.toMillis());
             final var rowCount = statement.executeUpdate();
             if (rowCount > 0) {
@@ -361,39 +382,28 @@ public class MessageSendLogStore implements AutoCloseable {
     }
 
     private void deleteOrphanedLogContents(final Connection connection) throws SQLException {
-        try (final var statement = connection.prepareStatement(
-                "DELETE FROM %s WHERE _id NOT IN (SELECT content_id FROM %s)".formatted(TABLE_MESSAGE_SEND_LOG_CONTENT,
-                        TABLE_MESSAGE_SEND_LOG))) {
+        final var sql = """
+                        DELETE FROM %s
+                        WHERE _id NOT IN (SELECT content_id FROM %s)
+                        """.formatted(TABLE_MESSAGE_SEND_LOG_CONTENT, TABLE_MESSAGE_SEND_LOG);
+        try (final var statement = connection.prepareStatement(sql)) {
             statement.executeUpdate();
         }
     }
 
-    private <T> Stream<T> executeQueryForStream(
-            PreparedStatement statement, ResultSetMapper<T> mapper
-    ) throws SQLException {
-        final var resultSet = statement.executeQuery();
-
-        return StreamSupport.stream(new Spliterators.AbstractSpliterator<>(Long.MAX_VALUE, Spliterator.ORDERED) {
-            @Override
-            public boolean tryAdvance(final Consumer<? super T> consumer) {
-                try {
-                    if (!resultSet.next()) {
-                        return false;
-                    }
-                    consumer.accept(mapper.apply(resultSet));
-                    return true;
-                } catch (SQLException e) {
-                    logger.warn("Failed to read from database result", e);
-                    throw new RuntimeException(e);
-                }
-            }
-        }, false);
+    private MessageSendLogEntry getMessageSendLogEntryFromResultSet(ResultSet resultSet) throws SQLException {
+        final var groupId = Optional.ofNullable(resultSet.getBytes("group_id")).map(GroupId::unknownVersion);
+        final Content content;
+        try {
+            content = Content.ADAPTER.decode(resultSet.getBinaryStream("content"));
+        } catch (IOException e) {
+            logger.warn("Failed to parse content from message send log", e);
+            return null;
+        }
+        final var contentHint = ContentHint.fromType(resultSet.getInt("content_hint"));
+        final var urgent = resultSet.getBoolean("urgent");
+        return new MessageSendLogEntry(groupId, content, contentHint, urgent);
     }
 
-    private interface ResultSetMapper<T> {
-
-        T apply(ResultSet resultSet) throws SQLException;
-    }
-
-    private record RecipientDevices(RecipientId recipientId, List<Integer> deviceIds) {}
+    private record RecipientDevices(ServiceId serviceId, List<Integer> deviceIds) {}
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeyRecordStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeyRecordStore.java
new file mode 100644
index 00000000..2a96043d
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeyRecordStore.java
@@ -0,0 +1,109 @@
+package org.asamk.signal.manager.storage.senderKeys;
+
+import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.helper.RecipientAddressResolver;
+import org.asamk.signal.manager.storage.recipients.RecipientId;
+import org.asamk.signal.manager.storage.recipients.RecipientResolver;
+import org.signal.libsignal.protocol.InvalidMessageException;
+import org.signal.libsignal.protocol.groups.state.SenderKeyRecord;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class LegacySenderKeyRecordStore {
+
+    private static final Logger logger = LoggerFactory.getLogger(LegacySenderKeyRecordStore.class);
+
+    public static void migrate(
+            final File senderKeysPath,
+            final RecipientResolver resolver,
+            final RecipientAddressResolver addressResolver,
+            final SenderKeyStore senderKeyStore
+    ) {
+        final var files = senderKeysPath.listFiles();
+        if (files == null) {
+            return;
+        }
+
+        final var senderKeys = parseFileNames(files, resolver).stream().map(key -> {
+            final var record = loadSenderKeyLocked(key, senderKeysPath);
+            final var serviceId = addressResolver.resolveRecipientAddress(key.recipientId).serviceId();
+            if (record == null || serviceId.isEmpty()) {
+                return null;
+            }
+            return new Pair<>(new SenderKeyRecordStore.Key(serviceId.get().toString(),
+                    key.deviceId,
+                    key.distributionId), record);
+        }).filter(Objects::nonNull).toList();
+
+        senderKeyStore.addLegacySenderKeys(senderKeys);
+        deleteAllSenderKeys(senderKeysPath);
+    }
+
+    private static void deleteAllSenderKeys(File senderKeysPath) {
+        final var files = senderKeysPath.listFiles();
+        if (files == null) {
+            return;
+        }
+
+        for (var file : files) {
+            try {
+                Files.delete(file.toPath());
+            } catch (IOException e) {
+                logger.error("Failed to delete sender key file {}: {}", file, e.getMessage());
+            }
+        }
+        try {
+            Files.delete(senderKeysPath.toPath());
+        } catch (IOException e) {
+            logger.error("Failed to delete sender keys directory {}: {}", senderKeysPath, e.getMessage());
+        }
+    }
+
+    static final Pattern senderKeyFileNamePattern = Pattern.compile("(\\d+)_(\\d+)_([\\da-z\\-]+)");
+
+    private static List<Key> parseFileNames(final File[] files, final RecipientResolver resolver) {
+        return Arrays.stream(files)
+                .map(f -> senderKeyFileNamePattern.matcher(f.getName()))
+                .filter(Matcher::matches)
+                .map(matcher -> {
+                    final var recipientId = resolver.resolveRecipient(Long.parseLong(matcher.group(1)));
+                    if (recipientId == null) {
+                        return null;
+                    }
+                    return new Key(recipientId, Integer.parseInt(matcher.group(2)), UUID.fromString(matcher.group(3)));
+                })
+                .filter(Objects::nonNull)
+                .toList();
+    }
+
+    private static File getSenderKeyFile(Key key, final File senderKeysPath) {
+        return new File(senderKeysPath,
+                key.recipientId().id() + "_" + key.deviceId() + "_" + key.distributionId().toString());
+    }
+
+    private static SenderKeyRecord loadSenderKeyLocked(final Key key, final File senderKeysPath) {
+        final var file = getSenderKeyFile(key, senderKeysPath);
+        if (!file.exists()) {
+            return null;
+        }
+        try (var inputStream = new FileInputStream(file)) {
+            return new SenderKeyRecord(inputStream.readAllBytes());
+        } catch (IOException | InvalidMessageException e) {
+            logger.warn("Failed to load sender key, resetting sender key: {}", e.getMessage());
+            return null;
+        }
+    }
+
+    record Key(RecipientId recipientId, int deviceId, UUID distributionId) {}
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java
new file mode 100644
index 00000000..cda652b2
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java
@@ -0,0 +1,68 @@
+package org.asamk.signal.manager.storage.senderKeys;
+
+import org.asamk.signal.manager.helper.RecipientAddressResolver;
+import org.asamk.signal.manager.storage.Utils;
+import org.asamk.signal.manager.storage.recipients.RecipientResolver;
+import org.asamk.signal.manager.storage.senderKeys.SenderKeySharedStore.SenderKeySharedEntry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.DistributionId;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class LegacySenderKeySharedStore {
+
+    private static final Logger logger = LoggerFactory.getLogger(LegacySenderKeySharedStore.class);
+
+    public static void migrate(
+            final File file,
+            final RecipientResolver resolver,
+            final RecipientAddressResolver addressResolver,
+            final SenderKeyStore senderKeyStore
+    ) {
+        final var objectMapper = Utils.createStorageObjectMapper();
+        try (var inputStream = new FileInputStream(file)) {
+            final var storage = objectMapper.readValue(inputStream, Storage.class);
+            final var sharedSenderKeys = new HashMap<DistributionId, Set<SenderKeySharedEntry>>();
+            for (final var senderKey : storage.sharedSenderKeys) {
+                final var recipientId = resolver.resolveRecipient(senderKey.recipientId);
+                if (recipientId == null) {
+                    continue;
+                }
+                final var serviceId = addressResolver.resolveRecipientAddress(recipientId).serviceId();
+                if (serviceId.isEmpty()) {
+                    continue;
+                }
+                final var entry = new SenderKeySharedEntry(serviceId.get().toString(), senderKey.deviceId);
+                final var distributionId = DistributionId.from(senderKey.distributionId);
+                var entries = sharedSenderKeys.get(distributionId);
+                if (entries == null) {
+                    entries = new HashSet<>();
+                }
+                entries.add(entry);
+                sharedSenderKeys.put(distributionId, entries);
+            }
+
+            senderKeyStore.addLegacySenderKeysShared(sharedSenderKeys);
+        } catch (IOException e) {
+            logger.info("Failed to load shared sender key store, ignoring", e);
+        }
+        try {
+            Files.delete(file.toPath());
+        } catch (IOException e) {
+            logger.info("Failed to load shared sender key store, ignoring", e);
+        }
+    }
+
+    public record Storage(List<SharedSenderKey> sharedSenderKeys) {
+
+        public record SharedSenderKey(long recipientId, int deviceId, String distributionId) {}
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java
index 0d9f6288..dd48fcdc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java
@@ -1,249 +1,232 @@
 package org.asamk.signal.manager.storage.senderKeys;
 
-import org.asamk.signal.manager.storage.recipients.RecipientId;
-import org.asamk.signal.manager.storage.recipients.RecipientResolver;
-import org.asamk.signal.manager.util.IOUtils;
+import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.storage.Database;
+import org.asamk.signal.manager.storage.Utils;
 import org.signal.libsignal.protocol.InvalidMessageException;
 import org.signal.libsignal.protocol.SignalProtocolAddress;
 import org.signal.libsignal.protocol.groups.state.SenderKeyRecord;
+import org.signal.libsignal.protocol.groups.state.SenderKeyStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.util.UuidUtil;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collection;
 import java.util.UUID;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
-public class SenderKeyRecordStore implements org.signal.libsignal.protocol.groups.state.SenderKeyStore {
+public class SenderKeyRecordStore implements SenderKeyStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(SenderKeyRecordStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(SenderKeyRecordStore.class);
+    private static final String TABLE_SENDER_KEY = "sender_key";
 
-    private final Map<Key, SenderKeyRecord> cachedSenderKeys = new HashMap<>();
+    private final Database database;
 
-    private final File senderKeysPath;
+    public static void createSql(Connection connection) throws SQLException {
+        // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
+        try (final var statement = connection.createStatement()) {
+            statement.executeUpdate("""
+                                    CREATE TABLE sender_key (
+                                      _id INTEGER PRIMARY KEY,
+                                      address TEXT NOT NULL,
+                                      device_id INTEGER NOT NULL,
+                                      distribution_id BLOB NOT NULL,
+                                      record BLOB NOT NULL,
+                                      created_timestamp INTEGER NOT NULL,
+                                      UNIQUE(address, device_id, distribution_id)
+                                    ) STRICT;
+                                    """);
+        }
+    }
 
-    private final RecipientResolver resolver;
-
-    public SenderKeyRecordStore(
-            final File senderKeysPath, final RecipientResolver resolver
-    ) {
-        this.senderKeysPath = senderKeysPath;
-        this.resolver = resolver;
+    SenderKeyRecordStore(final Database database) {
+        this.database = database;
     }
 
     @Override
     public SenderKeyRecord loadSenderKey(final SignalProtocolAddress address, final UUID distributionId) {
         final var key = getKey(address, distributionId);
 
-        synchronized (cachedSenderKeys) {
-            return loadSenderKeyLocked(key);
+        try (final var connection = database.getConnection()) {
+            return loadSenderKey(connection, key);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from sender key store", e);
         }
     }
 
     @Override
     public void storeSenderKey(
-            final SignalProtocolAddress address, final UUID distributionId, final SenderKeyRecord record
+            final SignalProtocolAddress address,
+            final UUID distributionId,
+            final SenderKeyRecord record
     ) {
         final var key = getKey(address, distributionId);
 
-        synchronized (cachedSenderKeys) {
-            storeSenderKeyLocked(key, record);
+        try (final var connection = database.getConnection()) {
+            storeSenderKey(connection, key, record);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update sender key store", e);
         }
     }
 
-    long getCreateTimeForKey(final RecipientId selfRecipientId, final int selfDeviceId, final UUID distributionId) {
-        final var key = getKey(selfRecipientId, selfDeviceId, distributionId);
-        final var senderKeyFile = getSenderKeyFile(key);
-
-        if (!senderKeyFile.exists()) {
-            return -1;
-        }
-
-        return IOUtils.getFileCreateTime(senderKeyFile);
-    }
-
-    void deleteSenderKey(final RecipientId recipientId, final UUID distributionId) {
-        synchronized (cachedSenderKeys) {
-            cachedSenderKeys.clear();
-            final var keys = getKeysLocked(recipientId);
-            for (var key : keys) {
-                if (key.distributionId.equals(distributionId)) {
-                    deleteSenderKeyLocked(key);
-                }
+    long getCreateTimeForKey(final ServiceId selfServiceId, final int selfDeviceId, final UUID distributionId) {
+        final var sql = (
+                """
+                SELECT s.created_timestamp
+                FROM %s AS s
+                WHERE s.address = ? AND s.device_id = ? AND s.distribution_id = ?
+                """
+        ).formatted(TABLE_SENDER_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setString(1, selfServiceId.toString());
+                statement.setInt(2, selfDeviceId);
+                statement.setBytes(3, UuidUtil.toByteArray(distributionId));
+                return Utils.executeQueryForOptional(statement, res -> res.getLong("created_timestamp")).orElse(-1L);
             }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from sender key store", e);
+        }
+    }
+
+    void deleteSenderKey(final ServiceId serviceId, final UUID distributionId) {
+        final var sql = (
+                """
+                DELETE FROM %s AS s
+                WHERE s.address = ? AND s.distribution_id = ?
+                """
+        ).formatted(TABLE_SENDER_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setString(1, serviceId.toString());
+                statement.setBytes(2, UuidUtil.toByteArray(distributionId));
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update sender key store", e);
         }
     }
 
     void deleteAll() {
-        synchronized (cachedSenderKeys) {
-            cachedSenderKeys.clear();
-            final var files = senderKeysPath.listFiles((_file, s) -> senderKeyFileNamePattern.matcher(s).matches());
-            if (files == null) {
-                return;
-            }
-
-            for (final var file : files) {
-                try {
-                    Files.delete(file.toPath());
-                } catch (IOException e) {
-                    logger.error("Failed to delete sender key file {}: {}", file, e.getMessage());
-                }
+        final var sql = """
+                        DELETE FROM %s AS s
+                        """.formatted(TABLE_SENDER_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.executeUpdate();
             }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update sender key store", e);
         }
     }
 
-    void deleteAllFor(final RecipientId recipientId) {
-        synchronized (cachedSenderKeys) {
-            cachedSenderKeys.clear();
-            final var keys = getKeysLocked(recipientId);
-            for (var key : keys) {
-                deleteSenderKeyLocked(key);
-            }
+    void deleteAllFor(final ServiceId serviceId) {
+        try (final var connection = database.getConnection()) {
+            deleteAllFor(connection, serviceId);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update sender key store", e);
         }
     }
 
-    void mergeRecipients(RecipientId recipientId, RecipientId toBeMergedRecipientId) {
-        synchronized (cachedSenderKeys) {
-            final var keys = getKeysLocked(toBeMergedRecipientId);
-            final var otherHasSenderKeys = keys.size() > 0;
-            if (!otherHasSenderKeys) {
-                return;
-            }
-
-            logger.debug("To be merged recipient had sender keys, re-assigning to the new recipient.");
-            for (var key : keys) {
-                final var toBeMergedSenderKey = loadSenderKeyLocked(key);
-                deleteSenderKeyLocked(key);
-                if (toBeMergedSenderKey == null) {
-                    continue;
-                }
-
-                final var newKey = new Key(recipientId, key.deviceId(), key.distributionId);
-                final var senderKeyRecord = loadSenderKeyLocked(newKey);
-                if (senderKeyRecord != null) {
-                    continue;
-                }
-                storeSenderKeyLocked(newKey, toBeMergedSenderKey);
+    void addLegacySenderKeys(final Collection<Pair<Key, SenderKeyRecord>> senderKeys) {
+        logger.debug("Migrating legacy sender keys to database");
+        long start = System.nanoTime();
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            for (final var pair : senderKeys) {
+                storeSenderKey(connection, pair.first(), pair.second());
             }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update sender keys store", e);
         }
-    }
-
-    /**
-     * @param identifier can be either a serialized uuid or a e164 phone number
-     */
-    private RecipientId resolveRecipient(String identifier) {
-        return resolver.resolveRecipient(identifier);
-    }
-
-    private Key getKey(final RecipientId recipientId, int deviceId, final UUID distributionId) {
-        return new Key(recipientId, deviceId, distributionId);
+        logger.debug("Complete sender keys migration took {}ms", (System.nanoTime() - start) / 1000000);
     }
 
     private Key getKey(final SignalProtocolAddress address, final UUID distributionId) {
-        final var recipientId = resolveRecipient(address.getName());
-        return new Key(recipientId, address.getDeviceId(), distributionId);
+        return new Key(address.getName(), address.getDeviceId(), distributionId);
     }
 
-    private List<Key> getKeysLocked(RecipientId recipientId) {
-        final var files = senderKeysPath.listFiles((_file, s) -> s.startsWith(recipientId.id() + "_"));
-        if (files == null) {
-            return List.of();
+    private SenderKeyRecord loadSenderKey(final Connection connection, final Key key) throws SQLException {
+        final var sql = (
+                """
+                SELECT s.record
+                FROM %s AS s
+                WHERE s.address = ? AND s.device_id = ? AND s.distribution_id = ?
+                """
+        ).formatted(TABLE_SENDER_KEY);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setString(1, key.address());
+            statement.setInt(2, key.deviceId());
+            statement.setBytes(3, UuidUtil.toByteArray(key.distributionId()));
+            return Utils.executeQueryForOptional(statement, this::getSenderKeyRecordFromResultSet).orElse(null);
         }
-        return parseFileNames(files);
     }
 
-    final Pattern senderKeyFileNamePattern = Pattern.compile("(\\d+)_(\\d+)_([\\da-z\\-]+)");
-
-    private List<Key> parseFileNames(final File[] files) {
-        return Arrays.stream(files)
-                .map(f -> senderKeyFileNamePattern.matcher(f.getName()))
-                .filter(Matcher::matches)
-                .map(matcher -> {
-                    final var recipientId = resolver.resolveRecipient(Long.parseLong(matcher.group(1)));
-                    if (recipientId == null) {
-                        return null;
-                    }
-                    return new Key(recipientId, Integer.parseInt(matcher.group(2)), UUID.fromString(matcher.group(3)));
-                })
-                .filter(Objects::nonNull)
-                .toList();
-    }
-
-    private File getSenderKeyFile(Key key) {
-        try {
-            IOUtils.createPrivateDirectories(senderKeysPath);
-        } catch (IOException e) {
-            throw new AssertionError("Failed to create sender keys path: " + e.getMessage(), e);
-        }
-        return new File(senderKeysPath,
-                key.recipientId().id() + "_" + key.deviceId() + "_" + key.distributionId.toString());
-    }
-
-    private SenderKeyRecord loadSenderKeyLocked(final Key key) {
-        {
-            final var senderKeyRecord = cachedSenderKeys.get(key);
-            if (senderKeyRecord != null) {
-                return senderKeyRecord;
+    private void storeSenderKey(
+            final Connection connection,
+            final Key key,
+            final SenderKeyRecord senderKeyRecord
+    ) throws SQLException {
+        final var sqlUpdate = """
+                              UPDATE %s
+                              SET record = ?
+                              WHERE address = ? AND device_id = ? and distribution_id = ?
+                              """.formatted(TABLE_SENDER_KEY);
+        try (final var statement = connection.prepareStatement(sqlUpdate)) {
+            statement.setBytes(1, senderKeyRecord.serialize());
+            statement.setString(2, key.address());
+            statement.setLong(3, key.deviceId());
+            statement.setBytes(4, UuidUtil.toByteArray(key.distributionId()));
+            final var rows = statement.executeUpdate();
+            if (rows > 0) {
+                return;
             }
         }
 
-        final var file = getSenderKeyFile(key);
-        if (!file.exists()) {
-            return null;
+        // Record doesn't exist yet, creating a new one
+        final var sqlInsert = (
+                """
+                INSERT OR REPLACE INTO %s (address, device_id, distribution_id, record, created_timestamp)
+                VALUES (?, ?, ?, ?, ?)
+                """
+        ).formatted(TABLE_SENDER_KEY);
+        try (final var statement = connection.prepareStatement(sqlInsert)) {
+            statement.setString(1, key.address());
+            statement.setInt(2, key.deviceId());
+            statement.setBytes(3, UuidUtil.toByteArray(key.distributionId()));
+            statement.setBytes(4, senderKeyRecord.serialize());
+            statement.setLong(5, System.currentTimeMillis());
+            statement.executeUpdate();
         }
-        try (var inputStream = new FileInputStream(file)) {
-            final var senderKeyRecord = new SenderKeyRecord(inputStream.readAllBytes());
-            cachedSenderKeys.put(key, senderKeyRecord);
-            return senderKeyRecord;
-        } catch (IOException | InvalidMessageException e) {
-            logger.warn("Failed to load sender key, resetting sender key: {}", e.getMessage());
+    }
+
+    private void deleteAllFor(final Connection connection, final ServiceId serviceId) throws SQLException {
+        final var sql = (
+                """
+                DELETE FROM %s AS s
+                WHERE s.address = ?
+                """
+        ).formatted(TABLE_SENDER_KEY);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setString(1, serviceId.toString());
+            statement.executeUpdate();
+        }
+    }
+
+    private SenderKeyRecord getSenderKeyRecordFromResultSet(ResultSet resultSet) throws SQLException {
+        try {
+            final var record = resultSet.getBytes("record");
+
+            return new SenderKeyRecord(record);
+        } catch (InvalidMessageException e) {
+            logger.warn("Failed to load sender key, resetting: {}", e.getMessage());
             return null;
         }
     }
 
-    private void storeSenderKeyLocked(final Key key, final SenderKeyRecord senderKeyRecord) {
-        cachedSenderKeys.put(key, senderKeyRecord);
-
-        final var file = getSenderKeyFile(key);
-        try {
-            try (var outputStream = new FileOutputStream(file)) {
-                outputStream.write(senderKeyRecord.serialize());
-            }
-        } catch (IOException e) {
-            logger.warn("Failed to store sender key, trying to delete file and retry: {}", e.getMessage());
-            try {
-                Files.delete(file.toPath());
-                try (var outputStream = new FileOutputStream(file)) {
-                    outputStream.write(senderKeyRecord.serialize());
-                }
-            } catch (IOException e2) {
-                logger.error("Failed to store sender key file {}: {}", file, e2.getMessage());
-            }
-        }
-    }
-
-    private void deleteSenderKeyLocked(final Key key) {
-        cachedSenderKeys.remove(key);
-
-        final var file = getSenderKeyFile(key);
-        if (!file.exists()) {
-            return;
-        }
-        try {
-            Files.delete(file.toPath());
-        } catch (IOException e) {
-            logger.error("Failed to delete sender key file {}: {}", file, e.getMessage());
-        }
-    }
-
-    private record Key(RecipientId recipientId, int deviceId, UUID distributionId) {}
+    record Key(String address, int deviceId, UUID distributionId) {}
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java
index f27f6139..175524f5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java
@@ -1,241 +1,222 @@
 package org.asamk.signal.manager.storage.senderKeys;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.asamk.signal.manager.helper.RecipientAddressResolver;
+import org.asamk.signal.manager.storage.Database;
 import org.asamk.signal.manager.storage.Utils;
-import org.asamk.signal.manager.storage.recipients.RecipientId;
-import org.asamk.signal.manager.storage.recipients.RecipientResolver;
 import org.signal.libsignal.protocol.SignalProtocolAddress;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.push.DistributionId;
+import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.UUID;
 import java.util.stream.Collectors;
 
 public class SenderKeySharedStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(SenderKeySharedStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(SenderKeySharedStore.class);
+    private static final String TABLE_SENDER_KEY_SHARED = "sender_key_shared";
 
-    private final Map<UUID, Set<SenderKeySharedEntry>> sharedSenderKeys;
+    private final Database database;
 
-    private final ObjectMapper objectMapper;
-    private final File file;
-
-    private final RecipientResolver resolver;
-    private final RecipientAddressResolver addressResolver;
-
-    public static SenderKeySharedStore load(
-            final File file, final RecipientAddressResolver addressResolver, final RecipientResolver resolver
-    ) {
-        final var objectMapper = Utils.createStorageObjectMapper();
-        try (var inputStream = new FileInputStream(file)) {
-            final var storage = objectMapper.readValue(inputStream, Storage.class);
-            final var sharedSenderKeys = new HashMap<UUID, Set<SenderKeySharedEntry>>();
-            for (final var senderKey : storage.sharedSenderKeys) {
-                final var recipientId = resolver.resolveRecipient(senderKey.recipientId);
-                if (recipientId == null) {
-                    continue;
-                }
-                final var entry = new SenderKeySharedEntry(recipientId, senderKey.deviceId);
-                final var distributionId = UuidUtil.parseOrNull(senderKey.distributionId);
-                if (distributionId == null) {
-                    logger.warn("Read invalid distribution id from storage {}, ignoring", senderKey.distributionId);
-                    continue;
-                }
-                var entries = sharedSenderKeys.get(distributionId);
-                if (entries == null) {
-                    entries = new HashSet<>();
-                }
-                entries.add(entry);
-                sharedSenderKeys.put(distributionId, entries);
-            }
-
-            return new SenderKeySharedStore(sharedSenderKeys, objectMapper, file, addressResolver, resolver);
-        } catch (FileNotFoundException e) {
-            logger.trace("Creating new shared sender key store.");
-            return new SenderKeySharedStore(new HashMap<>(), objectMapper, file, addressResolver, resolver);
-        } catch (IOException e) {
-            logger.warn("Failed to load shared sender key store", e);
-            throw new RuntimeException(e);
+    public static void createSql(Connection connection) throws SQLException {
+        // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
+        try (final var statement = connection.createStatement()) {
+            statement.executeUpdate("""
+                                    CREATE TABLE sender_key_shared (
+                                      _id INTEGER PRIMARY KEY,
+                                      address TEXT NOT NULL,
+                                      device_id INTEGER NOT NULL,
+                                      distribution_id BLOB NOT NULL,
+                                      timestamp INTEGER NOT NULL,
+                                      UNIQUE(address, device_id, distribution_id)
+                                    ) STRICT;
+                                    """);
         }
     }
 
-    private SenderKeySharedStore(
-            final Map<UUID, Set<SenderKeySharedEntry>> sharedSenderKeys,
-            final ObjectMapper objectMapper,
-            final File file,
-            final RecipientAddressResolver addressResolver,
-            final RecipientResolver resolver
-    ) {
-        this.sharedSenderKeys = sharedSenderKeys;
-        this.objectMapper = objectMapper;
-        this.file = file;
-        this.addressResolver = addressResolver;
-        this.resolver = resolver;
+    SenderKeySharedStore(final Database database) {
+        this.database = database;
     }
 
     public Set<SignalProtocolAddress> getSenderKeySharedWith(final DistributionId distributionId) {
-        synchronized (sharedSenderKeys) {
-            final var addresses = sharedSenderKeys.get(distributionId.asUuid());
-            if (addresses == null) {
-                return Set.of();
+        try (final var connection = database.getConnection()) {
+            final var sql = (
+                    """
+                    SELECT s.address, s.device_id
+                    FROM %s AS s
+                    WHERE s.distribution_id = ?
+                    """
+            ).formatted(TABLE_SENDER_KEY_SHARED);
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setBytes(1, UuidUtil.toByteArray(distributionId.asUuid()));
+                return Utils.executeQueryForStream(statement, this::getSenderKeySharedEntryFromResultSet)
+                        .map(k -> new SignalProtocolAddress(k.address, k.deviceId()))
+                        .collect(Collectors.toSet());
             }
-            return addresses.stream()
-                    .map(k -> new SignalProtocolAddress(addressResolver.resolveRecipientAddress(k.recipientId())
-                            .getIdentifier(), k.deviceId()))
-                    .collect(Collectors.toSet());
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from shared sender key store", e);
         }
     }
 
     public void markSenderKeySharedWith(
-            final DistributionId distributionId, final Collection<SignalProtocolAddress> addresses
+            final DistributionId distributionId,
+            final Collection<SignalProtocolAddress> addresses
     ) {
         final var newEntries = addresses.stream()
-                .map(a -> new SenderKeySharedEntry(resolveRecipient(a.getName()), a.getDeviceId()))
+                .map(a -> new SenderKeySharedEntry(a.getName(), a.getDeviceId()))
                 .collect(Collectors.toSet());
 
-        synchronized (sharedSenderKeys) {
-            final var previousEntries = sharedSenderKeys.getOrDefault(distributionId.asUuid(), Set.of());
-
-            sharedSenderKeys.put(distributionId.asUuid(), new HashSet<>() {
-                {
-                    addAll(previousEntries);
-                    addAll(newEntries);
-                }
-            });
-            saveLocked();
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            markSenderKeysSharedWith(connection, distributionId, newEntries);
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update shared sender key store", e);
         }
     }
 
     public void clearSenderKeySharedWith(final Collection<SignalProtocolAddress> addresses) {
         final var entriesToDelete = addresses.stream()
-                .map(a -> new SenderKeySharedEntry(resolveRecipient(a.getName()), a.getDeviceId()))
+                .map(a -> new SenderKeySharedEntry(a.getName(), a.getDeviceId()))
                 .collect(Collectors.toSet());
 
-        synchronized (sharedSenderKeys) {
-            for (final var distributionId : sharedSenderKeys.keySet()) {
-                final var entries = sharedSenderKeys.getOrDefault(distributionId, Set.of());
-
-                sharedSenderKeys.put(distributionId, new HashSet<>(entries) {
-                    {
-                        removeAll(entriesToDelete);
-                    }
-                });
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            final var sql = (
+                    """
+                    DELETE FROM %s AS s
+                    WHERE address = ? AND device_id = ?
+                    """
+            ).formatted(TABLE_SENDER_KEY_SHARED);
+            try (final var statement = connection.prepareStatement(sql)) {
+                for (final var entry : entriesToDelete) {
+                    statement.setString(1, entry.address());
+                    statement.setInt(2, entry.deviceId());
+                    statement.executeUpdate();
+                }
             }
-            saveLocked();
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update shared sender key store", e);
         }
     }
 
     public void deleteAll() {
-        synchronized (sharedSenderKeys) {
-            sharedSenderKeys.clear();
-            saveLocked();
-        }
-    }
-
-    public void deleteAllFor(final RecipientId recipientId) {
-        synchronized (sharedSenderKeys) {
-            for (final var distributionId : sharedSenderKeys.keySet()) {
-                final var entries = sharedSenderKeys.getOrDefault(distributionId, Set.of());
-
-                sharedSenderKeys.put(distributionId, new HashSet<>(entries) {
-                    {
-                        removeIf(e -> e.recipientId().equals(recipientId));
-                    }
-                });
+        try (final var connection = database.getConnection()) {
+            final var sql = (
+                    """
+                    DELETE FROM %s AS s
+                    """
+            ).formatted(TABLE_SENDER_KEY_SHARED);
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.executeUpdate();
             }
-            saveLocked();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update shared sender key store", e);
         }
     }
 
-    public void deleteSharedWith(
-            final RecipientId recipientId, final int deviceId, final DistributionId distributionId
-    ) {
-        synchronized (sharedSenderKeys) {
-            final var entries = sharedSenderKeys.getOrDefault(distributionId.asUuid(), Set.of());
+    public void deleteAllFor(final ServiceId serviceId) {
+        try (final var connection = database.getConnection()) {
+            final var sql = (
+                    """
+                    DELETE FROM %s AS s
+                    WHERE address = ?
+                    """
+            ).formatted(TABLE_SENDER_KEY_SHARED);
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setString(1, serviceId.toString());
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update shared sender key store", e);
+        }
+    }
 
-            sharedSenderKeys.put(distributionId.asUuid(), new HashSet<>(entries) {
-                {
-                    remove(new SenderKeySharedEntry(recipientId, deviceId));
-                }
-            });
-            saveLocked();
+    public void deleteSharedWith(final ServiceId serviceId, final int deviceId, final DistributionId distributionId) {
+        try (final var connection = database.getConnection()) {
+            final var sql = (
+                    """
+                    DELETE FROM %s AS s
+                    WHERE address = ? AND device_id = ? AND distribution_id = ?
+                    """
+            ).formatted(TABLE_SENDER_KEY_SHARED);
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setString(1, serviceId.toString());
+                statement.setInt(2, deviceId);
+                statement.setBytes(3, UuidUtil.toByteArray(distributionId.asUuid()));
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update shared sender key store", e);
         }
     }
 
     public void deleteAllFor(final DistributionId distributionId) {
-        synchronized (sharedSenderKeys) {
-            if (sharedSenderKeys.remove(distributionId.asUuid()) != null) {
-                saveLocked();
+        try (final var connection = database.getConnection()) {
+            final var sql = (
+                    """
+                    DELETE FROM %s AS s
+                    WHERE distribution_id = ?
+                    """
+            ).formatted(TABLE_SENDER_KEY_SHARED);
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setBytes(1, UuidUtil.toByteArray(distributionId.asUuid()));
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update shared sender key store", e);
+        }
+    }
+
+    void addLegacySenderKeysShared(final Map<DistributionId, Set<SenderKeySharedEntry>> sharedSenderKeys) {
+        logger.debug("Migrating legacy sender keys shared to database");
+        long start = System.nanoTime();
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            for (final var entry : sharedSenderKeys.entrySet()) {
+                markSenderKeysSharedWith(connection, entry.getKey(), entry.getValue());
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update shared sender key store", e);
+        }
+        logger.debug("Complete sender keys shared migration took {}ms", (System.nanoTime() - start) / 1000000);
+    }
+
+    private void markSenderKeysSharedWith(
+            final Connection connection,
+            final DistributionId distributionId,
+            final Set<SenderKeySharedEntry> newEntries
+    ) throws SQLException {
+        final var sql = (
+                """
+                INSERT OR REPLACE INTO %s (address, device_id, distribution_id, timestamp)
+                VALUES (?, ?, ?, ?)
+                """
+        ).formatted(TABLE_SENDER_KEY_SHARED);
+        try (final var statement = connection.prepareStatement(sql)) {
+            for (final var entry : newEntries) {
+                statement.setString(1, entry.toString());
+                statement.setInt(2, entry.deviceId());
+                statement.setBytes(3, UuidUtil.toByteArray(distributionId.asUuid()));
+                statement.setLong(4, System.currentTimeMillis());
+                statement.executeUpdate();
             }
         }
     }
 
-    public void mergeRecipients(RecipientId recipientId, RecipientId toBeMergedRecipientId) {
-        synchronized (sharedSenderKeys) {
-            for (final var distributionId : sharedSenderKeys.keySet()) {
-                final var entries = sharedSenderKeys.getOrDefault(distributionId, Set.of());
-
-                sharedSenderKeys.put(distributionId,
-                        entries.stream()
-                                .map(e -> e.recipientId.equals(toBeMergedRecipientId) ? new SenderKeySharedEntry(
-                                        recipientId,
-                                        e.deviceId()) : e)
-                                .collect(Collectors.toSet()));
-            }
-            saveLocked();
-        }
+    private SenderKeySharedEntry getSenderKeySharedEntryFromResultSet(ResultSet resultSet) throws SQLException {
+        final var address = resultSet.getString("address");
+        final var deviceId = resultSet.getInt("device_id");
+        return new SenderKeySharedEntry(address, deviceId);
     }
 
-    /**
-     * @param identifier can be either a serialized uuid or a e164 phone number
-     */
-    private RecipientId resolveRecipient(String identifier) {
-        return resolver.resolveRecipient(identifier);
-    }
-
-    private void saveLocked() {
-        var storage = new Storage(sharedSenderKeys.entrySet().stream().flatMap(pair -> {
-            final var sharedWith = pair.getValue();
-            return sharedWith.stream()
-                    .map(entry -> new Storage.SharedSenderKey(entry.recipientId().id(),
-                            entry.deviceId(),
-                            pair.getKey().toString()));
-        }).toList());
-
-        // Write to memory first to prevent corrupting the file in case of serialization errors
-        try (var inMemoryOutput = new ByteArrayOutputStream()) {
-            objectMapper.writeValue(inMemoryOutput, storage);
-
-            var input = new ByteArrayInputStream(inMemoryOutput.toByteArray());
-            try (var outputStream = new FileOutputStream(file)) {
-                input.transferTo(outputStream);
-            }
-        } catch (Exception e) {
-            logger.error("Error saving shared sender key store file: {}", e.getMessage());
-        }
-    }
-
-    private record Storage(List<SharedSenderKey> sharedSenderKeys) {
-
-        private record SharedSenderKey(long recipientId, int deviceId, String distributionId) {}
-    }
-
-    private record SenderKeySharedEntry(RecipientId recipientId, int deviceId) {}
+    record SenderKeySharedEntry(String address, int deviceId) {}
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyStore.java
index a9504497..5ae2790e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyStore.java
@@ -1,15 +1,15 @@
 package org.asamk.signal.manager.storage.senderKeys;
 
-import org.asamk.signal.manager.helper.RecipientAddressResolver;
-import org.asamk.signal.manager.storage.recipients.RecipientId;
-import org.asamk.signal.manager.storage.recipients.RecipientResolver;
+import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.storage.Database;
 import org.signal.libsignal.protocol.SignalProtocolAddress;
 import org.signal.libsignal.protocol.groups.state.SenderKeyRecord;
 import org.whispersystems.signalservice.api.SignalServiceSenderKeyStore;
 import org.whispersystems.signalservice.api.push.DistributionId;
+import org.whispersystems.signalservice.api.push.ServiceId;
 
-import java.io.File;
 import java.util.Collection;
+import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
@@ -18,19 +18,16 @@ public class SenderKeyStore implements SignalServiceSenderKeyStore {
     private final SenderKeyRecordStore senderKeyRecordStore;
     private final SenderKeySharedStore senderKeySharedStore;
 
-    public SenderKeyStore(
-            final File file,
-            final File senderKeysPath,
-            final RecipientAddressResolver addressResolver,
-            final RecipientResolver resolver
-    ) {
-        this.senderKeyRecordStore = new SenderKeyRecordStore(senderKeysPath, resolver);
-        this.senderKeySharedStore = SenderKeySharedStore.load(file, addressResolver, resolver);
+    public SenderKeyStore(final Database database) {
+        this.senderKeyRecordStore = new SenderKeyRecordStore(database);
+        this.senderKeySharedStore = new SenderKeySharedStore(database);
     }
 
     @Override
     public void storeSenderKey(
-            final SignalProtocolAddress sender, final UUID distributionId, final SenderKeyRecord record
+            final SignalProtocolAddress sender,
+            final UUID distributionId,
+            final SenderKeyRecord record
     ) {
         senderKeyRecordStore.storeSenderKey(sender, distributionId, record);
     }
@@ -47,7 +44,8 @@ public class SenderKeyStore implements SignalServiceSenderKeyStore {
 
     @Override
     public void markSenderKeySharedWith(
-            final DistributionId distributionId, final Collection<SignalProtocolAddress> addresses
+            final DistributionId distributionId,
+            final Collection<SignalProtocolAddress> addresses
     ) {
         senderKeySharedStore.markSenderKeySharedWith(distributionId, addresses);
     }
@@ -62,30 +60,33 @@ public class SenderKeyStore implements SignalServiceSenderKeyStore {
         senderKeyRecordStore.deleteAll();
     }
 
-    public void deleteAll(RecipientId recipientId) {
-        senderKeySharedStore.deleteAllFor(recipientId);
-        senderKeyRecordStore.deleteAllFor(recipientId);
+    public void deleteAll(ServiceId serviceId) {
+        senderKeySharedStore.deleteAllFor(serviceId);
+        senderKeyRecordStore.deleteAllFor(serviceId);
     }
 
-    public void deleteSharedWith(RecipientId recipientId) {
-        senderKeySharedStore.deleteAllFor(recipientId);
+    public void deleteSharedWith(ServiceId serviceId) {
+        senderKeySharedStore.deleteAllFor(serviceId);
     }
 
-    public void deleteSharedWith(RecipientId recipientId, int deviceId, DistributionId distributionId) {
-        senderKeySharedStore.deleteSharedWith(recipientId, deviceId, distributionId);
+    public void deleteSharedWith(ServiceId serviceId, int deviceId, DistributionId distributionId) {
+        senderKeySharedStore.deleteSharedWith(serviceId, deviceId, distributionId);
     }
 
-    public void deleteOurKey(RecipientId selfRecipientId, DistributionId distributionId) {
+    public void deleteOurKey(ServiceId selfServiceId, DistributionId distributionId) {
         senderKeySharedStore.deleteAllFor(distributionId);
-        senderKeyRecordStore.deleteSenderKey(selfRecipientId, distributionId.asUuid());
+        senderKeyRecordStore.deleteSenderKey(selfServiceId, distributionId.asUuid());
     }
 
-    public long getCreateTimeForOurKey(RecipientId selfRecipientId, int deviceId, DistributionId distributionId) {
-        return senderKeyRecordStore.getCreateTimeForKey(selfRecipientId, deviceId, distributionId.asUuid());
+    public long getCreateTimeForOurKey(ServiceId selfServiceId, int deviceId, DistributionId distributionId) {
+        return senderKeyRecordStore.getCreateTimeForKey(selfServiceId, deviceId, distributionId.asUuid());
     }
 
-    public void mergeRecipients(RecipientId recipientId, RecipientId toBeMergedRecipientId) {
-        senderKeySharedStore.mergeRecipients(recipientId, toBeMergedRecipientId);
-        senderKeyRecordStore.mergeRecipients(recipientId, toBeMergedRecipientId);
+    void addLegacySenderKeys(final Collection<Pair<SenderKeyRecordStore.Key, SenderKeyRecord>> senderKeys) {
+        senderKeyRecordStore.addLegacySenderKeys(senderKeys);
+    }
+
+    void addLegacySenderKeysShared(final Map<DistributionId, Set<SenderKeySharedStore.SenderKeySharedEntry>> sharedSenderKeys) {
+        senderKeySharedStore.addLegacySenderKeysShared(sharedSenderKeys);
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/LegacySessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/LegacySessionStore.java
new file mode 100644
index 00000000..98491514
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/LegacySessionStore.java
@@ -0,0 +1,114 @@
+package org.asamk.signal.manager.storage.sessions;
+
+import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.helper.RecipientAddressResolver;
+import org.asamk.signal.manager.storage.recipients.RecipientId;
+import org.asamk.signal.manager.storage.recipients.RecipientResolver;
+import org.asamk.signal.manager.util.IOUtils;
+import org.signal.libsignal.protocol.state.SessionRecord;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class LegacySessionStore {
+
+    private static final Logger logger = LoggerFactory.getLogger(LegacySessionStore.class);
+
+    public static void migrate(
+            final File sessionsPath,
+            final RecipientResolver resolver,
+            final RecipientAddressResolver addressResolver,
+            final SessionStore sessionStore
+    ) {
+        final var keys = getKeysLocked(sessionsPath, resolver);
+        final var sessions = keys.stream().map(key -> {
+            final var record = loadSessionLocked(key, sessionsPath);
+            final var serviceId = addressResolver.resolveRecipientAddress(key.recipientId).serviceId();
+            if (record == null || serviceId.isEmpty()) {
+                return null;
+            }
+            return new Pair<>(new SessionStore.Key(serviceId.get().toString(), key.deviceId()), record);
+        }).filter(Objects::nonNull).toList();
+        sessionStore.addLegacySessions(sessions);
+        deleteAllSessions(sessionsPath);
+    }
+
+    private static void deleteAllSessions(File sessionsPath) {
+        final var files = sessionsPath.listFiles();
+        if (files == null) {
+            return;
+        }
+
+        for (var file : files) {
+            try {
+                Files.delete(file.toPath());
+            } catch (IOException e) {
+                logger.error("Failed to delete session file {}: {}", file, e.getMessage());
+            }
+        }
+        try {
+            Files.delete(sessionsPath.toPath());
+        } catch (IOException e) {
+            logger.error("Failed to delete session directory {}: {}", sessionsPath, e.getMessage());
+        }
+    }
+
+    private static Collection<Key> getKeysLocked(File sessionsPath, final RecipientResolver resolver) {
+        final var files = sessionsPath.listFiles();
+        if (files == null) {
+            return List.of();
+        }
+        return parseFileNames(files, resolver);
+    }
+
+    static final Pattern sessionFileNamePattern = Pattern.compile("(\\d+)_(\\d+)");
+
+    private static List<Key> parseFileNames(final File[] files, final RecipientResolver resolver) {
+        return Arrays.stream(files)
+                .map(f -> sessionFileNamePattern.matcher(f.getName()))
+                .filter(Matcher::matches)
+                .map(matcher -> {
+                    final var recipientId = resolver.resolveRecipient(Long.parseLong(matcher.group(1)));
+                    if (recipientId == null) {
+                        return null;
+                    }
+                    return new Key(recipientId, Integer.parseInt(matcher.group(2)));
+                })
+                .filter(Objects::nonNull)
+                .toList();
+    }
+
+    private static File getSessionFile(Key key, final File sessionsPath) {
+        try {
+            IOUtils.createPrivateDirectories(sessionsPath);
+        } catch (IOException e) {
+            throw new AssertionError("Failed to create sessions path", e);
+        }
+        return new File(sessionsPath, key.recipientId().id() + "_" + key.deviceId());
+    }
+
+    private static SessionRecord loadSessionLocked(final Key key, final File sessionsPath) {
+        final var file = getSessionFile(key, sessionsPath);
+        if (!file.exists()) {
+            return null;
+        }
+        try (var inputStream = new FileInputStream(file)) {
+            return new SessionRecord(inputStream.readAllBytes());
+        } catch (Exception e) {
+            logger.warn("Failed to load session, resetting session: {}", e.getMessage());
+            return null;
+        }
+    }
+
+    record Key(RecipientId recipientId, int deviceId) {}
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
index b265e0bc..86fe875e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
@@ -1,60 +1,71 @@
 package org.asamk.signal.manager.storage.sessions;
 
-import org.asamk.signal.manager.storage.recipients.RecipientId;
-import org.asamk.signal.manager.storage.recipients.RecipientResolver;
-import org.asamk.signal.manager.util.IOUtils;
+import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.storage.Database;
+import org.asamk.signal.manager.storage.Utils;
 import org.signal.libsignal.protocol.NoSessionException;
 import org.signal.libsignal.protocol.SignalProtocolAddress;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
-import org.signal.libsignal.protocol.message.CiphertextMessage;
 import org.signal.libsignal.protocol.state.SessionRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalServiceSessionStore;
+import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceIdType;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Arrays;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 public class SessionStore implements SignalServiceSessionStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(SessionStore.class);
+    private static final String TABLE_SESSION = "session";
+    private static final Logger logger = LoggerFactory.getLogger(SessionStore.class);
 
     private final Map<Key, SessionRecord> cachedSessions = new HashMap<>();
 
-    private final File sessionsPath;
+    private final Database database;
+    private final int accountIdType;
 
-    private final RecipientResolver resolver;
+    public static void createSql(Connection connection) throws SQLException {
+        // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
+        try (final var statement = connection.createStatement()) {
+            statement.executeUpdate("""
+                                    CREATE TABLE session (
+                                      _id INTEGER PRIMARY KEY,
+                                      account_id_type INTEGER NOT NULL,
+                                      address TEXT NOT NULL,
+                                      device_id INTEGER NOT NULL,
+                                      record BLOB NOT NULL,
+                                      UNIQUE(account_id_type, address, device_id)
+                                    ) STRICT;
+                                    """);
+        }
+    }
 
-    public SessionStore(
-            final File sessionsPath, final RecipientResolver resolver
-    ) {
-        this.sessionsPath = sessionsPath;
-        this.resolver = resolver;
+    public SessionStore(final Database database, final ServiceIdType serviceIdType) {
+        this.database = database;
+        this.accountIdType = Utils.getAccountIdType(serviceIdType);
     }
 
     @Override
     public SessionRecord loadSession(SignalProtocolAddress address) {
         final var key = getKey(address);
-
-        synchronized (cachedSessions) {
-            final var session = loadSessionLocked(key);
-            if (session == null) {
-                return new SessionRecord();
+        try (final var connection = database.getConnection()) {
+            final var sessionRecord = Objects.requireNonNullElseGet(loadSession(connection, key), SessionRecord::new);
+            synchronized (cachedSessions) {
+                cachedSessions.put(key, sessionRecord);
             }
-            return session;
+            return sessionRecord;
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from session store", e);
         }
     }
 
@@ -62,8 +73,14 @@ public class SessionStore implements SignalServiceSessionStore {
     public List<SessionRecord> loadExistingSessions(final List<SignalProtocolAddress> addresses) throws NoSessionException {
         final var keys = addresses.stream().map(this::getKey).toList();
 
-        synchronized (cachedSessions) {
-            final var sessions = keys.stream().map(this::loadSessionLocked).filter(Objects::nonNull).toList();
+        try (final var connection = database.getConnection()) {
+            final var sessions = new ArrayList<SessionRecord>();
+            for (final var key : keys) {
+                final var sessionRecord = loadSession(connection, key);
+                if (sessionRecord != null) {
+                    sessions.add(sessionRecord);
+                }
+            }
 
             if (sessions.size() != addresses.size()) {
                 String message = "Mismatch! Asked for "
@@ -76,31 +93,44 @@ public class SessionStore implements SignalServiceSessionStore {
             }
 
             return sessions;
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from session store", e);
         }
     }
 
     @Override
     public List<Integer> getSubDeviceSessions(String name) {
-        final var recipientId = resolveRecipient(name);
-
-        synchronized (cachedSessions) {
-            return getKeysLocked(recipientId).stream()
-                    // get all sessions for recipient except primary device session
-                    .filter(key -> key.deviceId() != 1 && key.recipientId().equals(recipientId))
-                    .map(Key::deviceId)
-                    .toList();
+        final var serviceId = ServiceId.parseOrThrow(name);
+        // get all sessions for recipient except primary device session
+        final var sql = (
+                """
+                SELECT s.device_id
+                FROM %s AS s
+                WHERE s.account_id_type = ? AND s.address = ? AND s.device_id != 1
+                """
+        ).formatted(TABLE_SESSION);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setString(2, serviceId.toString());
+                return Utils.executeQueryForStream(statement, res -> res.getInt("device_id")).toList();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from session store", e);
         }
     }
 
-    public boolean isCurrentRatchetKey(RecipientId recipientId, int deviceId, ECPublicKey ratchetKey) {
-        final var key = new Key(recipientId, deviceId);
+    public boolean isCurrentRatchetKey(ServiceId serviceId, int deviceId, ECPublicKey ratchetKey) {
+        final var key = new Key(serviceId.toString(), deviceId);
 
-        synchronized (cachedSessions) {
-            final var session = loadSessionLocked(key);
+        try (final var connection = database.getConnection()) {
+            final var session = loadSession(connection, key);
             if (session == null) {
                 return false;
             }
             return session.currentRatchetKeyMatches(ratchetKey);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from session store", e);
         }
     }
 
@@ -108,8 +138,10 @@ public class SessionStore implements SignalServiceSessionStore {
     public void storeSession(SignalProtocolAddress address, SessionRecord session) {
         final var key = getKey(address);
 
-        synchronized (cachedSessions) {
-            storeSessionLocked(key, session);
+        try (final var connection = database.getConnection()) {
+            storeSession(connection, key, session);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from session store", e);
         }
     }
 
@@ -117,9 +149,13 @@ public class SessionStore implements SignalServiceSessionStore {
     public boolean containsSession(SignalProtocolAddress address) {
         final var key = getKey(address);
 
-        synchronized (cachedSessions) {
-            final var session = loadSessionLocked(key);
-            return isActive(session);
+        try (final var connection = database.getConnection()) {
+            final var session = loadSession(connection, key);
+            final var active = isActive(session);
+            logger.trace("Contains session {}: {} (active: {})", address, session != null, active);
+            return active;
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from session store", e);
         }
     }
 
@@ -127,23 +163,24 @@ public class SessionStore implements SignalServiceSessionStore {
     public void deleteSession(SignalProtocolAddress address) {
         final var key = getKey(address);
 
-        synchronized (cachedSessions) {
-            deleteSessionLocked(key);
+        try (final var connection = database.getConnection()) {
+            deleteSession(connection, key);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update session store", e);
         }
     }
 
     @Override
     public void deleteAllSessions(String name) {
-        final var recipientId = resolveRecipient(name);
-        deleteAllSessions(recipientId);
+        final var serviceId = ServiceId.parseOrThrow(name);
+        deleteAllSessions(serviceId);
     }
 
-    public void deleteAllSessions(RecipientId recipientId) {
-        synchronized (cachedSessions) {
-            final var keys = getKeysLocked(recipientId);
-            for (var key : keys) {
-                deleteSessionLocked(key);
-            }
+    public void deleteAllSessions(ServiceId serviceId) {
+        try (final var connection = database.getConnection()) {
+            deleteAllSessions(connection, serviceId.toString());
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update session store", e);
         }
     }
 
@@ -151,194 +188,221 @@ public class SessionStore implements SignalServiceSessionStore {
     public void archiveSession(final SignalProtocolAddress address) {
         final var key = getKey(address);
 
-        synchronized (cachedSessions) {
-            archiveSessionLocked(key);
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            final var session = loadSession(connection, key);
+            if (session != null) {
+                session.archiveCurrentState();
+                storeSession(connection, key, session);
+                connection.commit();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update session store", e);
         }
     }
 
     @Override
-    public Set<SignalProtocolAddress> getAllAddressesWithActiveSessions(final List<String> addressNames) {
-        final var recipientIdToNameMap = addressNames.stream()
-                .collect(Collectors.toMap(this::resolveRecipient, name -> name));
-        synchronized (cachedSessions) {
-            return recipientIdToNameMap.keySet()
-                    .stream()
-                    .flatMap(recipientId -> getKeysLocked(recipientId).stream())
-                    .filter(key -> isActive(this.loadSessionLocked(key)))
-                    .map(key -> new SignalProtocolAddress(recipientIdToNameMap.get(key.recipientId), key.deviceId()))
-                    .collect(Collectors.toSet());
+    public Map<SignalProtocolAddress, SessionRecord> getAllAddressesWithActiveSessions(final List<String> addressNames) {
+        final var serviceIdsCommaSeparated = addressNames.stream()
+                .map(address -> "'" + address.replaceAll("'", "''") + "'")
+                .collect(Collectors.joining(","));
+        final var sql = (
+                """
+                SELECT s.address, s.device_id, s.record
+                FROM %s AS s
+                WHERE s.account_id_type = ? AND s.address IN (%s)
+                """
+        ).formatted(TABLE_SESSION, serviceIdsCommaSeparated);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                return Utils.executeQueryForStream(statement,
+                                res -> new Pair<>(getKeyFromResultSet(res), getSessionRecordFromResultSet(res)))
+                        .filter(pair -> isActive(pair.second()))
+                        .collect(Collectors.toMap(pair -> new SignalProtocolAddress(pair.first().address(),
+                                pair.first().deviceId()), Pair::second));
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from session store", e);
         }
     }
 
     public void archiveAllSessions() {
-        synchronized (cachedSessions) {
-            final var keys = getKeysLocked();
-            for (var key : keys) {
-                archiveSessionLocked(key);
+        final var sql = (
+                """
+                SELECT s.address, s.device_id, s.record
+                FROM %s AS s
+                WHERE s.account_id_type = ?
+                """
+        ).formatted(TABLE_SESSION);
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            final List<Pair<Key, SessionRecord>> records;
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                records = Utils.executeQueryForStream(statement,
+                                res -> new Pair<>(getKeyFromResultSet(res), getSessionRecordFromResultSet(res)))
+                        .filter(Objects::nonNull)
+                        .toList();
             }
+            for (final var record : records) {
+                record.second().archiveCurrentState();
+                storeSession(connection, record.first(), record.second());
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update session store", e);
         }
     }
 
-    public void archiveSessions(final RecipientId recipientId) {
-        synchronized (cachedSessions) {
-            getKeysLocked().stream()
-                    .filter(key -> key.recipientId.equals(recipientId))
-                    .forEach(this::archiveSessionLocked);
+    public void archiveSessions(final ServiceId serviceId) {
+        final var sql = (
+                """
+                SELECT s.address, s.device_id, s.record
+                FROM %s AS s
+                WHERE s.account_id_type = ? AND s.address = ?
+                """
+        ).formatted(TABLE_SESSION);
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            final List<Pair<Key, SessionRecord>> records;
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setString(2, serviceId.toString());
+                records = Utils.executeQueryForStream(statement,
+                                res -> new Pair<>(getKeyFromResultSet(res), getSessionRecordFromResultSet(res)))
+                        .filter(Objects::nonNull)
+                        .toList();
+            }
+            for (final var record : records) {
+                record.second().archiveCurrentState();
+                storeSession(connection, record.first(), record.second());
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update session store", e);
         }
     }
 
-    public void mergeRecipients(RecipientId recipientId, RecipientId toBeMergedRecipientId) {
-        synchronized (cachedSessions) {
-            final var keys = getKeysLocked(toBeMergedRecipientId);
-            final var otherHasSession = keys.size() > 0;
-            if (!otherHasSession) {
-                return;
-            }
-
-            final var hasSession = getKeysLocked(recipientId).size() > 0;
-            if (hasSession) {
-                logger.debug("To be merged recipient had sessions, deleting.");
-                deleteAllSessions(toBeMergedRecipientId);
-            } else {
-                logger.debug("Only to be merged recipient had sessions, re-assigning to the new recipient.");
-                for (var key : keys) {
-                    final var session = loadSessionLocked(key);
-                    deleteSessionLocked(key);
-                    if (session == null) {
-                        continue;
-                    }
-                    final var newKey = new Key(recipientId, key.deviceId());
-                    storeSessionLocked(newKey, session);
-                }
+    void addLegacySessions(final Collection<Pair<Key, SessionRecord>> sessions) {
+        logger.debug("Migrating legacy sessions to database");
+        long start = System.nanoTime();
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            for (final var pair : sessions) {
+                storeSession(connection, pair.first(), pair.second());
             }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update session store", e);
         }
-    }
-
-    /**
-     * @param identifier can be either a serialized uuid or a e164 phone number
-     */
-    private RecipientId resolveRecipient(String identifier) {
-        return resolver.resolveRecipient(identifier);
+        logger.debug("Complete sessions migration took {}ms", (System.nanoTime() - start) / 1000000);
     }
 
     private Key getKey(final SignalProtocolAddress address) {
-        final var recipientId = resolveRecipient(address.getName());
-        return new Key(recipientId, address.getDeviceId());
+        return new Key(address.getName(), address.getDeviceId());
     }
 
-    private List<Key> getKeysLocked(RecipientId recipientId) {
-        final var files = sessionsPath.listFiles((_file, s) -> s.startsWith(recipientId.id() + "_"));
-        if (files == null) {
-            return List.of();
-        }
-        return parseFileNames(files);
-    }
-
-    private Collection<Key> getKeysLocked() {
-        final var files = sessionsPath.listFiles();
-        if (files == null) {
-            return List.of();
-        }
-        return parseFileNames(files);
-    }
-
-    final Pattern sessionFileNamePattern = Pattern.compile("(\\d+)_(\\d+)");
-
-    private List<Key> parseFileNames(final File[] files) {
-        return Arrays.stream(files)
-                .map(f -> sessionFileNamePattern.matcher(f.getName()))
-                .filter(Matcher::matches)
-                .map(matcher -> {
-                    final var recipientId = resolver.resolveRecipient(Long.parseLong(matcher.group(1)));
-                    if (recipientId == null) {
-                        return null;
-                    }
-                    return new Key(recipientId, Integer.parseInt(matcher.group(2)));
-                })
-                .filter(Objects::nonNull)
-                .toList();
-    }
-
-    private File getSessionFile(Key key) {
-        try {
-            IOUtils.createPrivateDirectories(sessionsPath);
-        } catch (IOException e) {
-            throw new AssertionError("Failed to create sessions path", e);
-        }
-        return new File(sessionsPath, key.recipientId().id() + "_" + key.deviceId());
-    }
-
-    private SessionRecord loadSessionLocked(final Key key) {
-        {
+    private SessionRecord loadSession(Connection connection, final Key key) throws SQLException {
+        synchronized (cachedSessions) {
             final var session = cachedSessions.get(key);
             if (session != null) {
                 return session;
             }
         }
-
-        final var file = getSessionFile(key);
-        if (!file.exists()) {
-            return null;
+        final var sql = (
+                """
+                SELECT s.record
+                FROM %s AS s
+                WHERE s.account_id_type = ? AND s.address = ? AND s.device_id = ?
+                """
+        ).formatted(TABLE_SESSION);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setInt(1, accountIdType);
+            statement.setString(2, key.address());
+            statement.setInt(3, key.deviceId());
+            return Utils.executeQueryForOptional(statement, this::getSessionRecordFromResultSet).orElse(null);
         }
-        try (var inputStream = new FileInputStream(file)) {
-            final var session = new SessionRecord(inputStream.readAllBytes());
-            cachedSessions.put(key, session);
-            return session;
+    }
+
+    private Key getKeyFromResultSet(ResultSet resultSet) throws SQLException {
+        final var address = resultSet.getString("address");
+        final var deviceId = resultSet.getInt("device_id");
+        return new Key(address, deviceId);
+    }
+
+    private SessionRecord getSessionRecordFromResultSet(ResultSet resultSet) {
+        try {
+            final var record = resultSet.getBytes("record");
+            return new SessionRecord(record);
         } catch (Exception e) {
             logger.warn("Failed to load session, resetting session: {}", e.getMessage());
             return null;
         }
     }
 
-    private void storeSessionLocked(final Key key, final SessionRecord session) {
-        cachedSessions.put(key, session);
+    private void storeSession(
+            final Connection connection,
+            final Key key,
+            final SessionRecord session
+    ) throws SQLException {
+        synchronized (cachedSessions) {
+            cachedSessions.put(key, session);
+        }
 
-        final var file = getSessionFile(key);
-        try {
-            try (var outputStream = new FileOutputStream(file)) {
-                outputStream.write(session.serialize());
-            }
-        } catch (IOException e) {
-            logger.warn("Failed to store session, trying to delete file and retry: {}", e.getMessage());
-            try {
-                Files.delete(file.toPath());
-                try (var outputStream = new FileOutputStream(file)) {
-                    outputStream.write(session.serialize());
-                }
-            } catch (IOException e2) {
-                logger.error("Failed to store session file {}: {}", file, e2.getMessage());
-            }
+        final var sql = """
+                        INSERT OR REPLACE INTO %s (account_id_type, address, device_id, record)
+                        VALUES (?, ?, ?, ?)
+                        """.formatted(TABLE_SESSION);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setInt(1, accountIdType);
+            statement.setString(2, key.address());
+            statement.setInt(3, key.deviceId());
+            statement.setBytes(4, session.serialize());
+            statement.executeUpdate();
         }
     }
 
-    private void archiveSessionLocked(final Key key) {
-        final var session = loadSessionLocked(key);
-        if (session == null) {
-            return;
+    private void deleteAllSessions(final Connection connection, final String address) throws SQLException {
+        synchronized (cachedSessions) {
+            cachedSessions.clear();
+        }
+
+        final var sql = (
+                """
+                DELETE FROM %s AS s
+                WHERE s.account_id_type = ? AND s.address = ?
+                """
+        ).formatted(TABLE_SESSION);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setInt(1, accountIdType);
+            statement.setString(2, address);
+            statement.executeUpdate();
         }
-        session.archiveCurrentState();
-        storeSessionLocked(key, session);
     }
 
-    private void deleteSessionLocked(final Key key) {
-        cachedSessions.remove(key);
-
-        final var file = getSessionFile(key);
-        if (!file.exists()) {
-            return;
+    private void deleteSession(Connection connection, final Key key) throws SQLException {
+        synchronized (cachedSessions) {
+            cachedSessions.remove(key);
         }
-        try {
-            Files.delete(file.toPath());
-        } catch (IOException e) {
-            logger.error("Failed to delete session file {}: {}", file, e.getMessage());
+
+        final var sql = (
+                """
+                DELETE FROM %s AS s
+                WHERE s.account_id_type = ? AND s.address = ? AND s.device_id = ?
+                """
+        ).formatted(TABLE_SESSION);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setInt(1, accountIdType);
+            statement.setString(2, key.address());
+            statement.setInt(3, key.deviceId());
+            statement.executeUpdate();
         }
     }
 
     private static boolean isActive(SessionRecord record) {
-        return record != null
-                && record.hasSenderChain()
-                && record.getSessionVersion() == CiphertextMessage.CURRENT_VERSION;
+        return record != null && record.hasSenderChain();
     }
 
-    private record Key(RecipientId recipientId, int deviceId) {}
+    record Key(String address, int deviceId) {}
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/LegacyStickerStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/LegacyStickerStore.java
new file mode 100644
index 00000000..16836d58
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/LegacyStickerStore.java
@@ -0,0 +1,35 @@
+package org.asamk.signal.manager.storage.stickers;
+
+import org.asamk.signal.manager.api.StickerPackId;
+
+import java.util.Base64;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+
+public class LegacyStickerStore {
+
+    public static void migrate(Storage storage, StickerStore stickerStore) {
+        final var packIds = new HashSet<StickerPackId>();
+        final var stickers = storage.stickers.stream().map(s -> {
+            var packId = StickerPackId.deserialize(Base64.getDecoder().decode(s.packId));
+            if (packIds.contains(packId)) {
+                // Remove legacy duplicate packIds ...
+                return null;
+            }
+            packIds.add(packId);
+            var packKey = Base64.getDecoder().decode(s.packKey);
+            var installed = s.installed;
+            return new StickerPack(-1, packId, packKey, installed);
+        }).filter(Objects::nonNull).toList();
+
+        stickerStore.addLegacyStickers(stickers);
+    }
+
+    public record Storage(List<Sticker> stickers) {
+
+        public record Sticker(String packId, String packKey, boolean installed) {
+
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/Sticker.java b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/Sticker.java
deleted file mode 100644
index f101e474..00000000
--- a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/Sticker.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.asamk.signal.manager.storage.stickers;
-
-import org.asamk.signal.manager.api.StickerPackId;
-
-public class Sticker {
-
-    private final StickerPackId packId;
-    private final byte[] packKey;
-    private boolean installed;
-
-    public Sticker(final StickerPackId packId, final byte[] packKey) {
-        this.packId = packId;
-        this.packKey = packKey;
-    }
-
-    public Sticker(final StickerPackId packId, final byte[] packKey, final boolean installed) {
-        this.packId = packId;
-        this.packKey = packKey;
-        this.installed = installed;
-    }
-
-    public StickerPackId getPackId() {
-        return packId;
-    }
-
-    public byte[] getPackKey() {
-        return packKey;
-    }
-
-    public boolean isInstalled() {
-        return installed;
-    }
-
-    public void setInstalled(final boolean installed) {
-        this.installed = installed;
-    }
-}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerPack.java b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerPack.java
new file mode 100644
index 00000000..a7e1adc0
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerPack.java
@@ -0,0 +1,10 @@
+package org.asamk.signal.manager.storage.stickers;
+
+import org.asamk.signal.manager.api.StickerPackId;
+
+public record StickerPack(long internalId, StickerPackId packId, byte[] packKey, boolean isInstalled) {
+
+    public StickerPack(final StickerPackId packId, final byte[] packKey) {
+        this(-1, packId, packKey, false);
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
index 2ebb7078..32223424 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
@@ -1,86 +1,150 @@
 package org.asamk.signal.manager.storage.stickers;
 
 import org.asamk.signal.manager.api.StickerPackId;
+import org.asamk.signal.manager.storage.Database;
+import org.asamk.signal.manager.storage.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.util.Base64;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 public class StickerStore {
 
-    private final Map<StickerPackId, Sticker> stickers;
+    private static final Logger logger = LoggerFactory.getLogger(StickerStore.class);
+    private static final String TABLE_STICKER = "sticker";
 
-    private final Saver saver;
+    private final Database database;
 
-    public StickerStore(final Saver saver) {
-        this.saver = saver;
-        stickers = new HashMap<>();
+    public static void createSql(Connection connection) throws SQLException {
+        // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
+        try (final var statement = connection.createStatement()) {
+            statement.executeUpdate("""
+                                    CREATE TABLE sticker (
+                                      _id INTEGER PRIMARY KEY,
+                                      pack_id BLOB UNIQUE NOT NULL,
+                                      pack_key BLOB NOT NULL,
+                                      installed INTEGER NOT NULL DEFAULT FALSE
+                                    ) STRICT;
+                                    """);
+        }
     }
 
-    public StickerStore(final Map<StickerPackId, Sticker> stickers, final Saver saver) {
-        this.stickers = stickers;
-        this.saver = saver;
+    public StickerStore(final Database database) {
+        this.database = database;
     }
 
-    public static StickerStore fromStorage(Storage storage, Saver saver) {
-        final var packIds = new HashSet<StickerPackId>();
-        final var stickers = storage.stickers.stream().map(s -> {
-            var packId = StickerPackId.deserialize(Base64.getDecoder().decode(s.packId));
-            if (packIds.contains(packId)) {
-                // Remove legacy duplicate packIds ...
-                return null;
+    public List<StickerPack> getStickerPacks() {
+        final var sql = (
+                """
+                SELECT s._id, s.pack_id, s.pack_key, s.installed
+                FROM %s s
+                """
+        ).formatted(TABLE_STICKER);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                try (var result = Utils.executeQueryForStream(statement, this::getStickerPackFromResultSet)) {
+                    return result.toList();
+                }
             }
-            packIds.add(packId);
-            var packKey = Base64.getDecoder().decode(s.packKey);
-            var installed = s.installed;
-            return new Sticker(packId, packKey, installed);
-        }).filter(Objects::nonNull).collect(Collectors.toMap(Sticker::getPackId, s -> s));
-
-        return new StickerStore(stickers, saver);
-    }
-
-    public Collection<Sticker> getStickerPacks() {
-        return stickers.values();
-    }
-
-    public Sticker getStickerPack(StickerPackId packId) {
-        synchronized (stickers) {
-            return stickers.get(packId);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from sticker store", e);
         }
     }
 
-    public void updateSticker(Sticker sticker) {
-        Storage storage;
-        synchronized (stickers) {
-            stickers.put(sticker.getPackId(), sticker);
-            storage = toStorageLocked();
-        }
-        saver.save(storage);
-    }
-
-    private Storage toStorageLocked() {
-        return new Storage(stickers.values()
-                .stream()
-                .map(s -> new Storage.Sticker(Base64.getEncoder().encodeToString(s.getPackId().serialize()),
-                        Base64.getEncoder().encodeToString(s.getPackKey()),
-                        s.isInstalled()))
-                .toList());
-    }
-
-    public record Storage(List<Storage.Sticker> stickers) {
-
-        private record Sticker(String packId, String packKey, boolean installed) {
-
+    public StickerPack getStickerPack(StickerPackId packId) {
+        final var sql = (
+                """
+                SELECT s._id, s.pack_id, s.pack_key, s.installed
+                FROM %s s
+                WHERE s.pack_id = ?
+                """
+        ).formatted(TABLE_STICKER);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setBytes(1, packId.serialize());
+                return Utils.executeQueryForOptional(statement, this::getStickerPackFromResultSet).orElse(null);
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from sticker store", e);
         }
     }
 
-    public interface Saver {
+    public void addStickerPack(StickerPack stickerPack) {
+        final var sql = (
+                """
+                INSERT INTO %s (pack_id, pack_key, installed)
+                VALUES (?, ?, ?)
+                """
+        ).formatted(TABLE_STICKER);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setBytes(1, stickerPack.packId().serialize());
+                statement.setBytes(2, stickerPack.packKey());
+                statement.setBoolean(3, stickerPack.isInstalled());
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update sticker store", e);
+        }
+    }
 
-        void save(Storage storage);
+    public void updateStickerPackInstalled(StickerPackId stickerPackId, boolean installed) {
+        final var sql = (
+                """
+                UPDATE %s
+                SET installed = ?
+                WHERE pack_id = ?
+                """
+        ).formatted(TABLE_STICKER);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setBytes(1, stickerPackId.serialize());
+                statement.setBoolean(2, installed);
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update sticker store", e);
+        }
+    }
+
+    void addLegacyStickers(Collection<StickerPack> stickerPacks) {
+        logger.debug("Migrating legacy stickers to database");
+        long start = System.nanoTime();
+        final var sql = (
+                """
+                INSERT INTO %s (pack_id, pack_key, installed)
+                VALUES (?, ?, ?)
+                """
+        ).formatted(TABLE_STICKER);
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            try (final var statement = connection.prepareStatement("DELETE FROM %s".formatted(TABLE_STICKER))) {
+                statement.executeUpdate();
+            }
+            try (final var statement = connection.prepareStatement(sql)) {
+                for (final var sticker : stickerPacks) {
+                    statement.setBytes(1, sticker.packId().serialize());
+                    statement.setBytes(2, sticker.packKey());
+                    statement.setBoolean(3, sticker.isInstalled());
+                    statement.executeUpdate();
+                }
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update sticker store", e);
+        }
+        logger.debug("Stickers migration took {}ms", (System.nanoTime() - start) / 1000000);
+    }
+
+    private StickerPack getStickerPackFromResultSet(ResultSet resultSet) throws SQLException {
+        final var internalId = resultSet.getLong("_id");
+        final var packId = resultSet.getBytes("pack_id");
+        final var packKey = resultSet.getBytes("pack_key");
+        final var installed = resultSet.getBoolean("installed");
+        return new StickerPack(internalId, StickerPackId.deserialize(packId), packKey, installed);
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java
index 81810713..efe65c64 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java
@@ -25,9 +25,9 @@ public class LegacyJsonThreadStore {
     @JsonProperty("threads")
     @JsonSerialize(using = MapToListSerializer.class)
     @JsonDeserialize(using = ThreadsDeserializer.class)
-    private Map<String, ThreadInfo> threads = new HashMap<>();
+    private final Map<String, LegacyThreadInfo> threads = new HashMap<>();
 
-    public List<ThreadInfo> getThreads() {
+    public List<LegacyThreadInfo> getThreads() {
         return new ArrayList<>(threads.values());
     }
 
@@ -35,22 +35,25 @@ public class LegacyJsonThreadStore {
 
         @Override
         public void serialize(
-                final Map<?, ?> value, final JsonGenerator jgen, final SerializerProvider provider
+                final Map<?, ?> value,
+                final JsonGenerator jgen,
+                final SerializerProvider provider
         ) throws IOException {
             jgen.writeObject(value.values());
         }
     }
 
-    private static class ThreadsDeserializer extends JsonDeserializer<Map<String, ThreadInfo>> {
+    private static class ThreadsDeserializer extends JsonDeserializer<Map<String, LegacyThreadInfo>> {
 
         @Override
-        public Map<String, ThreadInfo> deserialize(
-                JsonParser jsonParser, DeserializationContext deserializationContext
+        public Map<String, LegacyThreadInfo> deserialize(
+                JsonParser jsonParser,
+                DeserializationContext deserializationContext
         ) throws IOException {
-            var threads = new HashMap<String, ThreadInfo>();
+            var threads = new HashMap<String, LegacyThreadInfo>();
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
             for (var n : node) {
-                var t = jsonProcessor.treeToValue(n, ThreadInfo.class);
+                var t = jsonProcessor.treeToValue(n, LegacyThreadInfo.class);
                 threads.put(t.id, t);
             }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/threads/ThreadInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyThreadInfo.java
similarity index 86%
rename from lib/src/main/java/org/asamk/signal/manager/storage/threads/ThreadInfo.java
rename to lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyThreadInfo.java
index b81a0051..7a55c665 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/threads/ThreadInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyThreadInfo.java
@@ -2,7 +2,7 @@ package org.asamk.signal.manager.storage.threads;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class ThreadInfo {
+public class LegacyThreadInfo {
 
     @JsonProperty
     public String id;
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
new file mode 100644
index 00000000..30816060
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
@@ -0,0 +1,234 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.asamk.signal.manager.api.Profile;
+import org.asamk.signal.manager.internal.JobExecutor;
+import org.asamk.signal.manager.jobs.DownloadProfileAvatarJob;
+import org.asamk.signal.manager.storage.SignalAccount;
+import org.asamk.signal.manager.util.KeyUtils;
+import org.signal.libsignal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.UsernameLinkComponents;
+import org.whispersystems.signalservice.api.storage.IAPSubscriptionId;
+import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
+import org.whispersystems.signalservice.api.storage.StorageId;
+import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.signalservice.internal.storage.protos.AccountRecord;
+import org.whispersystems.signalservice.internal.storage.protos.OptionalBool;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Optional;
+
+import okio.ByteString;
+
+import static org.asamk.signal.manager.util.Utils.firstNonEmpty;
+import static org.whispersystems.signalservice.api.storage.AccountRecordExtensionsKt.safeSetBackupsSubscriber;
+import static org.whispersystems.signalservice.api.storage.AccountRecordExtensionsKt.safeSetPayments;
+import static org.whispersystems.signalservice.api.storage.AccountRecordExtensionsKt.safeSetSubscriber;
+
+/**
+ * Processes {@link SignalAccountRecord}s.
+ */
+public class AccountRecordProcessor extends DefaultStorageRecordProcessor<SignalAccountRecord> {
+
+    private static final Logger logger = LoggerFactory.getLogger(AccountRecordProcessor.class);
+    private final SignalAccountRecord localAccountRecord;
+    private final SignalAccount account;
+    private final Connection connection;
+    private final JobExecutor jobExecutor;
+
+    public AccountRecordProcessor(
+            SignalAccount account,
+            Connection connection,
+            final JobExecutor jobExecutor
+    ) throws SQLException {
+        this.account = account;
+        this.connection = connection;
+        this.jobExecutor = jobExecutor;
+        final var selfRecipientId = account.getSelfRecipientId();
+        final var recipient = account.getRecipientStore().getRecipient(connection, selfRecipientId);
+        final var storageId = account.getRecipientStore().getSelfStorageId(connection);
+        this.localAccountRecord = new SignalAccountRecord(storageId,
+                StorageSyncModels.localToRemoteRecord(connection,
+                        account.getConfigurationStore(),
+                        recipient,
+                        account.getUsernameLink()));
+    }
+
+    @Override
+    protected boolean isInvalid(SignalAccountRecord remote) {
+        return false;
+    }
+
+    @Override
+    protected Optional<SignalAccountRecord> getMatching(SignalAccountRecord record) {
+        return Optional.of(localAccountRecord);
+    }
+
+    @Override
+    protected SignalAccountRecord merge(SignalAccountRecord remoteRecord, SignalAccountRecord localRecord) {
+        final var remote = remoteRecord.getProto();
+        final var local = localRecord.getProto();
+        String givenName;
+        String familyName;
+        if (!remote.givenName.isEmpty() || !remote.familyName.isEmpty()) {
+            givenName = remote.givenName;
+            familyName = remote.familyName;
+        } else {
+            givenName = local.givenName;
+            familyName = local.familyName;
+        }
+
+        final var payments = remote.payments != null && remote.payments.entropy.size() > 0
+                ? remote.payments
+                : local.payments;
+
+        final ByteString donationSubscriberId;
+        final String donationSubscriberCurrencyCode;
+
+        if (remote.subscriberId.size() > 0) {
+            donationSubscriberId = remote.subscriberId;
+            donationSubscriberCurrencyCode = remote.subscriberCurrencyCode;
+        } else {
+            donationSubscriberId = local.subscriberId;
+            donationSubscriberCurrencyCode = local.subscriberCurrencyCode;
+        }
+
+        final ByteString backupsSubscriberId;
+        final IAPSubscriptionId backupsPurchaseToken;
+
+        final var remoteBackupSubscriberData = remote.backupSubscriberData;
+        if (remoteBackupSubscriberData != null && remoteBackupSubscriberData.subscriberId.size() > 0) {
+            backupsSubscriberId = remoteBackupSubscriberData.subscriberId;
+            backupsPurchaseToken = IAPSubscriptionId.Companion.from(remoteBackupSubscriberData);
+        } else {
+            backupsSubscriberId = local.backupSubscriberData != null
+                    ? local.backupSubscriberData.subscriberId
+                    : ByteString.EMPTY;
+            backupsPurchaseToken = IAPSubscriptionId.Companion.from(local.backupSubscriberData);
+        }
+
+        final var mergedBuilder = remote.newBuilder()
+                .givenName(givenName)
+                .familyName(familyName)
+                .avatarUrlPath(firstNonEmpty(remote.avatarUrlPath, local.avatarUrlPath))
+                .profileKey(firstNonEmpty(remote.profileKey, local.profileKey))
+                .noteToSelfArchived(remote.noteToSelfArchived)
+                .noteToSelfMarkedUnread(remote.noteToSelfMarkedUnread)
+                .readReceipts(remote.readReceipts)
+                .typingIndicators(remote.typingIndicators)
+                .sealedSenderIndicators(remote.sealedSenderIndicators)
+                .linkPreviews(remote.linkPreviews)
+                .unlistedPhoneNumber(remote.unlistedPhoneNumber)
+                .phoneNumberSharingMode(remote.phoneNumberSharingMode)
+                .pinnedConversations(remote.pinnedConversations)
+                .preferContactAvatars(remote.preferContactAvatars)
+                .universalExpireTimer(remote.universalExpireTimer)
+                .preferredReactionEmoji(firstNonEmpty(remote.preferredReactionEmoji, local.preferredReactionEmoji))
+                .subscriberId(firstNonEmpty(remote.subscriberId, local.subscriberId))
+                .subscriberCurrencyCode(firstNonEmpty(remote.subscriberCurrencyCode, local.subscriberCurrencyCode))
+                .displayBadgesOnProfile(remote.displayBadgesOnProfile)
+                .subscriptionManuallyCancelled(remote.subscriptionManuallyCancelled)
+                .keepMutedChatsArchived(remote.keepMutedChatsArchived)
+                .hasSetMyStoriesPrivacy(remote.hasSetMyStoriesPrivacy)
+                .hasViewedOnboardingStory(remote.hasViewedOnboardingStory || local.hasViewedOnboardingStory)
+                .storiesDisabled(remote.storiesDisabled)
+                .hasSeenGroupStoryEducationSheet(remote.hasSeenGroupStoryEducationSheet
+                        || local.hasSeenGroupStoryEducationSheet)
+                .hasCompletedUsernameOnboarding(remote.hasCompletedUsernameOnboarding
+                        || local.hasCompletedUsernameOnboarding)
+                .storyViewReceiptsEnabled(remote.storyViewReceiptsEnabled == OptionalBool.UNSET
+                        ? local.storyViewReceiptsEnabled
+                        : remote.storyViewReceiptsEnabled)
+                .username(remote.username)
+                .usernameLink(remote.usernameLink)
+                .avatarColor(remote.avatarColor);
+        safeSetPayments(mergedBuilder,
+                payments != null && payments.enabled,
+                payments == null ? null : payments.entropy.toByteArray());
+        safeSetSubscriber(mergedBuilder, donationSubscriberId, donationSubscriberCurrencyCode);
+        safeSetBackupsSubscriber(mergedBuilder, backupsSubscriberId, backupsPurchaseToken);
+
+        final var merged = mergedBuilder.build();
+
+        final var matchesRemote = doProtosMatch(merged, remote);
+        if (matchesRemote) {
+            return remoteRecord;
+        }
+
+        final var matchesLocal = doProtosMatch(merged, local);
+        if (matchesLocal) {
+            return localRecord;
+        }
+
+        return new SignalAccountRecord(StorageId.forAccount(KeyUtils.createRawStorageId()), mergedBuilder.build());
+    }
+
+    @Override
+    protected void insertLocal(SignalAccountRecord record) {
+        throw new UnsupportedOperationException(
+                "We should always have a local AccountRecord, so we should never been inserting a new one.");
+    }
+
+    @Override
+    protected void updateLocal(StorageRecordUpdate<SignalAccountRecord> update) throws SQLException {
+        final var accountRecord = update.newRecord();
+        final var accountProto = accountRecord.getProto();
+
+        account.getConfigurationStore().setReadReceipts(connection, accountProto.readReceipts);
+        account.getConfigurationStore().setTypingIndicators(connection, accountProto.typingIndicators);
+        account.getConfigurationStore()
+                .setUnidentifiedDeliveryIndicators(connection, accountProto.sealedSenderIndicators);
+        account.getConfigurationStore().setLinkPreviews(connection, accountProto.linkPreviews);
+        account.getConfigurationStore()
+                .setPhoneNumberSharingMode(connection,
+                        StorageSyncModels.remoteToLocal(accountProto.phoneNumberSharingMode));
+        account.getConfigurationStore().setPhoneNumberUnlisted(connection, accountProto.unlistedPhoneNumber);
+
+        account.setUsername(!accountProto.username.isEmpty() ? accountProto.username : null);
+        if (accountProto.usernameLink != null) {
+            final var usernameLink = accountProto.usernameLink;
+            account.setUsernameLink(new UsernameLinkComponents(usernameLink.entropy.toByteArray(),
+                    UuidUtil.parseOrThrow(usernameLink.serverId.toByteArray())));
+            account.getConfigurationStore().setUsernameLinkColor(connection, usernameLink.color.name());
+        }
+
+        if (accountProto.profileKey.size() > 0) {
+            ProfileKey profileKey;
+            try {
+                profileKey = new ProfileKey(accountProto.profileKey.toByteArray());
+            } catch (InvalidInputException e) {
+                logger.debug("Received invalid profile key from storage");
+                profileKey = null;
+            }
+            if (profileKey != null) {
+                account.setProfileKey(profileKey);
+                final var avatarPath = accountProto.avatarUrlPath.isEmpty() ? null : accountProto.avatarUrlPath;
+                jobExecutor.enqueueJob(new DownloadProfileAvatarJob(avatarPath));
+            }
+        }
+
+        final var profile = account.getRecipientStore().getProfile(connection, account.getSelfRecipientId());
+        final var builder = profile == null ? Profile.newBuilder() : Profile.newBuilder(profile);
+        builder.withGivenName(accountProto.givenName);
+        builder.withFamilyName(accountProto.familyName);
+        account.getRecipientStore().storeProfile(connection, account.getSelfRecipientId(), builder.build());
+        account.getRecipientStore()
+                .storeStorageRecord(connection,
+                        account.getSelfRecipientId(),
+                        accountRecord.getId(),
+                        accountProto.encode());
+    }
+
+    @Override
+    public int compare(SignalAccountRecord lhs, SignalAccountRecord rhs) {
+        return 0;
+    }
+
+    private static boolean doProtosMatch(AccountRecord merged, AccountRecord other) {
+        return Arrays.equals(merged.encode(), other.encode());
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
new file mode 100644
index 00000000..e1fee99b
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -0,0 +1,350 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.asamk.signal.manager.api.Contact;
+import org.asamk.signal.manager.api.Profile;
+import org.asamk.signal.manager.internal.JobExecutor;
+import org.asamk.signal.manager.jobs.DownloadProfileJob;
+import org.asamk.signal.manager.jobs.RefreshRecipientsJob;
+import org.asamk.signal.manager.storage.SignalAccount;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.asamk.signal.manager.util.KeyUtils;
+import org.signal.libsignal.protocol.IdentityKey;
+import org.signal.libsignal.protocol.InvalidKeyException;
+import org.signal.libsignal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
+import org.whispersystems.signalservice.api.storage.SignalContactRecord;
+import org.whispersystems.signalservice.api.storage.StorageId;
+import org.whispersystems.signalservice.internal.storage.protos.ContactRecord;
+import org.whispersystems.signalservice.internal.storage.protos.ContactRecord.IdentityState;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Pattern;
+
+import okio.ByteString;
+
+import static org.asamk.signal.manager.util.Utils.firstNonEmpty;
+import static org.asamk.signal.manager.util.Utils.nullIfEmpty;
+
+public class ContactRecordProcessor extends DefaultStorageRecordProcessor<SignalContactRecord> {
+
+    private static final Logger logger = LoggerFactory.getLogger(ContactRecordProcessor.class);
+
+    private static final Pattern E164_PATTERN = Pattern.compile("^\\+[1-9]\\d{6,18}$");
+
+    private final ACI selfAci;
+    private final PNI selfPni;
+    private final String selfNumber;
+    private final SignalAccount account;
+    private final Connection connection;
+    private final JobExecutor jobExecutor;
+
+    public ContactRecordProcessor(SignalAccount account, Connection connection, final JobExecutor jobExecutor) {
+        this.account = account;
+        this.connection = connection;
+        this.jobExecutor = jobExecutor;
+        this.selfAci = account.getAci();
+        this.selfPni = account.getPni();
+        this.selfNumber = account.getNumber();
+    }
+
+    /**
+     * Error cases:
+     * - You can't have a contact record without an ACI or PNI.
+     * - You can't have a contact record for yourself. That should be an account record.
+     */
+    @Override
+    protected boolean isInvalid(SignalContactRecord remoteRecord) {
+        final var remote = remoteRecord.getProto();
+        final var aci = ACI.parseOrNull(remote.aci);
+        final var pni = PNI.parseOrNull(remote.pni);
+        final var e164 = nullIfEmpty(remote.e164);
+        boolean hasAci = aci != null && aci.isValid();
+        boolean hasPni = pni != null && pni.isValid();
+
+        if (!hasAci && !hasPni) {
+            logger.debug("Found a ContactRecord with neither an ACI nor a PNI -- marking as invalid.");
+            return true;
+        } else if (selfAci != null && selfAci.equals(aci) || (
+                selfPni != null && selfPni.equals(pni)
+        ) || (selfNumber != null && selfNumber.equals(e164))) {
+            logger.debug("Found a ContactRecord for ourselves -- marking as invalid.");
+            return true;
+        } else if (e164 != null && !isValidE164(e164)) {
+            logger.debug("Found a record with an invalid E164 ({}). Marking as invalid.", e164);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    protected Optional<SignalContactRecord> getMatching(SignalContactRecord remote) throws SQLException {
+        final var address = getRecipientAddress(remote.getProto());
+        final var recipientId = account.getRecipientStore().resolveRecipient(connection, address);
+        final var recipient = account.getRecipientStore().getRecipient(connection, recipientId);
+
+        final var identifier = recipient.getAddress().getIdentifier();
+        final var identity = account.getIdentityKeyStore().getIdentityInfo(connection, identifier);
+        final var storageId = account.getRecipientStore().getStorageId(connection, recipientId);
+
+        return Optional.of(new SignalContactRecord(storageId,
+                StorageSyncModels.localToRemoteRecord(recipient, identity)));
+    }
+
+    @Override
+    protected SignalContactRecord merge(SignalContactRecord remoteRecord, SignalContactRecord localRecord) {
+        final var remote = remoteRecord.getProto();
+        final var local = localRecord.getProto();
+
+        String profileGivenName;
+        String profileFamilyName;
+        if (!remote.givenName.isEmpty() || !remote.familyName.isEmpty()) {
+            profileGivenName = remote.givenName;
+            profileFamilyName = remote.familyName;
+        } else {
+            profileGivenName = local.givenName;
+            profileFamilyName = local.familyName;
+        }
+
+        IdentityState identityState;
+        ByteString identityKey;
+        if (remote.identityKey.size() > 0 && (
+                !account.isPrimaryDevice()
+                        || remote.identityState != local.identityState
+                        || local.identityKey.size() == 0
+
+        )) {
+            identityState = remote.identityState;
+            identityKey = remote.identityKey;
+        } else {
+            identityState = local.identityState;
+            identityKey = local.identityKey.size() > 0 ? local.identityKey : ByteString.EMPTY;
+        }
+
+        if (!local.aci.isEmpty()
+                && local.identityKey.size() > 0
+                && remote.identityKey.size() > 0
+                && !local.identityKey.equals(remote.identityKey)) {
+            logger.debug("The local and remote identity keys do not match for {}. Enqueueing a profile fetch.",
+                    local.aci);
+            final var address = getRecipientAddress(local);
+            jobExecutor.enqueueJob(new DownloadProfileJob(address));
+        }
+
+        String pni;
+        String e164;
+        if (account.isPrimaryDevice()) {
+            final var e164sMatchButPnisDont = !local.e164.isEmpty()
+                    && local.e164.equals(remote.e164)
+                    && !local.pni.isEmpty()
+                    && !remote.pni.isEmpty()
+                    && !local.pni.equals(remote.pni);
+
+            final var pnisMatchButE164sDont = !local.pni.isEmpty()
+                    && local.pni.equals(remote.pni)
+                    && !local.e164.isEmpty()
+                    && !remote.e164.isEmpty()
+                    && !local.e164.equals(remote.e164);
+
+            if (e164sMatchButPnisDont || pnisMatchButE164sDont) {
+                if (e164sMatchButPnisDont) {
+                    logger.debug("Matching E164s, but the PNIs differ! Trusting our local pair.");
+                } else if (pnisMatchButE164sDont) {
+                    logger.debug("Matching PNIs, but the E164s differ! Trusting our local pair.");
+                }
+                jobExecutor.enqueueJob(new RefreshRecipientsJob());
+                pni = local.pni;
+                e164 = local.e164;
+            } else {
+                pni = firstNonEmpty(remote.pni, local.pni);
+                e164 = firstNonEmpty(remote.e164, local.e164);
+            }
+        } else {
+            pni = firstNonEmpty(remote.pni, local.pni);
+            e164 = firstNonEmpty(remote.e164, local.e164);
+        }
+
+        final var mergedBuilder = remote.newBuilder()
+                .aci(local.aci.isEmpty() ? remote.aci : local.aci)
+                .e164(e164)
+                .pni(pni)
+                .givenName(profileGivenName)
+                .familyName(profileFamilyName)
+                .systemGivenName(account.isPrimaryDevice() ? local.systemGivenName : remote.systemGivenName)
+                .systemFamilyName(account.isPrimaryDevice() ? local.systemFamilyName : remote.systemFamilyName)
+                .systemNickname(remote.systemNickname)
+                .profileKey(firstNonEmpty(remote.profileKey, local.profileKey))
+                .username(firstNonEmpty(remote.username, local.username))
+                .identityState(identityState)
+                .identityKey(identityKey)
+                .blocked(remote.blocked)
+                .whitelisted(remote.whitelisted)
+                .archived(remote.archived)
+                .markedUnread(remote.markedUnread)
+                .mutedUntilTimestamp(remote.mutedUntilTimestamp)
+                .hideStory(remote.hideStory)
+                .unregisteredAtTimestamp(remote.unregisteredAtTimestamp)
+                .hidden(remote.hidden)
+                .pniSignatureVerified(remote.pniSignatureVerified || local.pniSignatureVerified)
+                .nickname(remote.nickname)
+                .note(remote.note)
+                .avatarColor(remote.avatarColor);
+        final var merged = mergedBuilder.build();
+
+        final var matchesRemote = doProtosMatch(merged, remote);
+        if (matchesRemote) {
+            return remoteRecord;
+        }
+
+        final var matchesLocal = doProtosMatch(merged, local);
+        if (matchesLocal) {
+            return localRecord;
+        }
+
+        return new SignalContactRecord(StorageId.forContact(KeyUtils.createRawStorageId()), mergedBuilder.build());
+    }
+
+    @Override
+    protected void insertLocal(SignalContactRecord record) throws SQLException {
+        StorageRecordUpdate<SignalContactRecord> update = new StorageRecordUpdate<>(null, record);
+        updateLocal(update);
+    }
+
+    @Override
+    protected void updateLocal(StorageRecordUpdate<SignalContactRecord> update) throws SQLException {
+        final var contactRecord = update.newRecord();
+        final var contactProto = contactRecord.getProto();
+        final var address = getRecipientAddress(contactProto);
+        final var recipientId = account.getRecipientStore().resolveRecipientTrusted(connection, address);
+        final var recipient = account.getRecipientStore().getRecipient(connection, recipientId);
+
+        final var contact = recipient.getContact();
+        final var blocked = contact != null && contact.isBlocked();
+        final var profileShared = contact != null && contact.isProfileSharingEnabled();
+        final var archived = contact != null && contact.isArchived();
+        final var hidden = contact != null && contact.isHidden();
+        final var hideStory = contact != null && contact.hideStory();
+        final var muteUntil = contact == null ? 0 : contact.muteUntil();
+        final var unregisteredTimestamp = contact == null || contact.unregisteredTimestamp() == null
+                ? 0
+                : contact.unregisteredTimestamp();
+        final var contactGivenName = contact == null ? null : contact.givenName();
+        final var contactFamilyName = contact == null ? null : contact.familyName();
+        final var contactNickName = contact == null ? null : contact.nickName();
+        final var contactNickGivenName = contact == null ? null : contact.nickNameGivenName();
+        final var contactNickFamilyName = contact == null ? null : contact.nickNameFamilyName();
+        final var contactNote = contact == null ? null : contact.note();
+        if (blocked != contactProto.blocked
+                || profileShared != contactProto.whitelisted
+                || archived != contactProto.archived
+                || hidden != contactProto.hidden
+                || hideStory != contactProto.hideStory
+                || muteUntil != contactProto.mutedUntilTimestamp
+                || unregisteredTimestamp != contactProto.unregisteredAtTimestamp
+                || !Objects.equals(nullIfEmpty(contactProto.systemGivenName), contactGivenName)
+                || !Objects.equals(nullIfEmpty(contactProto.systemFamilyName), contactFamilyName)
+                || !Objects.equals(nullIfEmpty(contactProto.systemNickname), contactNickName)
+                || !Objects.equals(nullIfEmpty(contactProto.nickname == null ? "" : contactProto.nickname.given),
+                contactNickGivenName)
+                || !Objects.equals(nullIfEmpty(contactProto.nickname == null ? "" : contactProto.nickname.family),
+                contactNickFamilyName)
+                || !Objects.equals(nullIfEmpty(contactProto.note), contactNote)) {
+            logger.debug("Storing new or updated contact {}", recipientId);
+            final var contactBuilder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
+            final var newContact = contactBuilder.withIsBlocked(contactProto.blocked)
+                    .withIsProfileSharingEnabled(contactProto.whitelisted)
+                    .withIsArchived(contactProto.archived)
+                    .withIsHidden(contactProto.hidden)
+                    .withMuteUntil(contactProto.mutedUntilTimestamp)
+                    .withHideStory(contactProto.hideStory)
+                    .withGivenName(nullIfEmpty(contactProto.systemGivenName))
+                    .withFamilyName(nullIfEmpty(contactProto.systemFamilyName))
+                    .withNickName(nullIfEmpty(contactProto.systemNickname))
+                    .withNickNameGivenName(nullIfEmpty(contactProto.nickname == null
+                            ? null
+                            : contactProto.nickname.given))
+                    .withNickNameFamilyName(nullIfEmpty(contactProto.nickname == null
+                            ? null
+                            : contactProto.nickname.family))
+                    .withNote(nullIfEmpty(contactProto.note))
+                    .withUnregisteredTimestamp(contactProto.unregisteredAtTimestamp == 0
+                            ? null
+                            : contactProto.unregisteredAtTimestamp);
+            account.getRecipientStore().storeContact(connection, recipientId, newContact.build());
+        }
+
+        final var profile = recipient.getProfile();
+        final var profileGivenName = profile == null ? null : profile.getGivenName();
+        final var profileFamilyName = profile == null ? null : profile.getFamilyName();
+        if (!Objects.equals(nullIfEmpty(contactProto.givenName), profileGivenName) || !Objects.equals(nullIfEmpty(
+                contactProto.familyName), profileFamilyName)) {
+            final var profileBuilder = profile == null ? Profile.newBuilder() : Profile.newBuilder(profile);
+            final var newProfile = profileBuilder.withGivenName(nullIfEmpty(contactProto.givenName))
+                    .withFamilyName(nullIfEmpty(contactProto.familyName))
+                    .build();
+            account.getRecipientStore().storeProfile(connection, recipientId, newProfile);
+        }
+        if (contactProto.profileKey.size() > 0) {
+            try {
+                logger.trace("Storing profile key {}", recipientId);
+                final var profileKey = new ProfileKey(contactProto.profileKey.toByteArray());
+                account.getRecipientStore().storeProfileKey(connection, recipientId, profileKey);
+            } catch (InvalidInputException e) {
+                logger.warn("Received invalid contact profile key from storage");
+            }
+        }
+        if (contactProto.identityKey.size() > 0 && address.aci().isPresent()) {
+            try {
+                logger.trace("Storing identity key {}", recipientId);
+                final var identityKey = new IdentityKey(contactProto.identityKey.toByteArray());
+                account.getIdentityKeyStore().saveIdentity(connection, address.aci().get(), identityKey);
+
+                final var trustLevel = StorageSyncModels.remoteToLocal(contactProto.identityState);
+                if (trustLevel != null) {
+                    account.getIdentityKeyStore()
+                            .setIdentityTrustLevel(connection, address.aci().get(), identityKey, trustLevel);
+                }
+            } catch (InvalidKeyException e) {
+                logger.warn("Received invalid contact identity key from storage");
+            }
+        }
+        account.getRecipientStore()
+                .storeStorageRecord(connection, recipientId, contactRecord.getId(), contactProto.encode());
+    }
+
+    private static RecipientAddress getRecipientAddress(final ContactRecord contactRecord) {
+        return new RecipientAddress(ACI.parseOrNull(contactRecord.aci),
+                PNI.parseOrNull(contactRecord.pni),
+                nullIfEmpty(contactRecord.e164),
+                nullIfEmpty(contactRecord.username));
+    }
+
+    @Override
+    public int compare(SignalContactRecord lhsRecord, SignalContactRecord rhsRecord) {
+        final var lhs = lhsRecord.getProto();
+        final var rhs = rhsRecord.getProto();
+        if ((!lhs.aci.isEmpty() && Objects.equals(lhs.aci, rhs.aci)) || (
+                !lhs.e164.isEmpty() && Objects.equals(lhs.e164, rhs.e164)
+        ) || (!lhs.pni.isEmpty() && Objects.equals(lhs.pni, rhs.pni))) {
+            return 0;
+        } else {
+            return 1;
+        }
+    }
+
+    private static boolean isValidE164(String value) {
+        return E164_PATTERN.matcher(value).matches();
+    }
+
+    private static boolean doProtosMatch(ContactRecord merged, ContactRecord other) {
+        return Arrays.equals(merged.encode(), other.encode());
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java
new file mode 100644
index 00000000..87acb991
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java
@@ -0,0 +1,98 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.storage.SignalRecord;
+import org.whispersystems.signalservice.api.storage.StorageId;
+
+import java.sql.SQLException;
+import java.util.Comparator;
+import java.util.Optional;
+import java.util.Set;
+import java.util.TreeSet;
+
+/**
+ * An implementation of {@link StorageRecordProcessor} that solidifies a pattern and reduces
+ * duplicate code in individual implementations.
+ * <p>
+ * Concerning the implementation of {@link #compare(Object, Object)}, it's purpose is to detect if
+ * two items would map to the same logical entity (i.e. they would correspond to the same record in
+ * our local store). We use it for a {@link TreeSet}, so mainly it's just important that the '0'
+ * case is correct. Other cases are whatever, just make it something stable.
+ */
+abstract class DefaultStorageRecordProcessor<E extends SignalRecord<?>> implements StorageRecordProcessor<E>, Comparator<E> {
+
+    private static final Logger logger = LoggerFactory.getLogger(DefaultStorageRecordProcessor.class);
+    private final Set<E> matchedRecords = new TreeSet<>(this);
+
+    /**
+     * One type of invalid remote data this handles is two records mapping to the same local data. We
+     * have to trim this bad data out, because if we don't, we'll upload an ID set that only has one
+     * of the IDs in it, but won't properly delete the dupes, which will then fail our validation
+     * checks.
+     * <p>
+     * This is a bit tricky -- as we process records, IDs are written back to the local store, so we
+     * can't easily be like "oh multiple records are mapping to the same local storage ID". And in
+     * general we rely on SignalRecords to implement an equals() that includes the StorageId, so using
+     * a regular set is out. Instead, we use a {@link TreeSet}, which allows us to define a custom
+     * comparator for checking equality. Then we delegate to the subclass to tell us if two items are
+     * the same based on their actual data (i.e. two contacts having the same UUID, or two groups
+     * having the same MasterKey).
+     */
+    @Override
+    public void process(E remote) throws SQLException {
+        if (isInvalid(remote)) {
+            debug(remote.getId(), remote, "Found invalid key! Ignoring it.");
+            return;
+        }
+
+        final var local = getMatching(remote);
+
+        if (local.isEmpty()) {
+            debug(remote.getId(), remote, "[Local Insert] No matching local record. Inserting.");
+            insertLocal(remote);
+            return;
+        }
+
+        if (matchedRecords.contains(local.get())) {
+            debug(remote.getId(),
+                    remote,
+                    "Multiple remote records map to the same local record " + local.get() + "! Ignoring this one.");
+            return;
+        }
+
+        matchedRecords.add(local.get());
+
+        final var merged = merge(remote, local.get());
+        if (!merged.equals(remote)) {
+            debug(remote.getId(), remote, "[Remote Update] " + merged.describeDiff(remote));
+        }
+
+        if (!merged.equals(local.get())) {
+            final var update = new StorageRecordUpdate<>(local.get(), merged);
+            debug(remote.getId(), remote, "[Local Update] " + local.get().describeDiff(merged));
+            updateLocal(update);
+        }
+    }
+
+    private void debug(StorageId i, E record, String message) {
+        logger.debug("[{}][{}] {}", i, record.getClass().getSimpleName(), message);
+    }
+
+    /**
+     * @return True if the record is invalid and should be removed from storage service, otherwise false.
+     */
+    protected abstract boolean isInvalid(E remote) throws SQLException;
+
+    /**
+     * Only records that pass the validity check (i.e. return false from {@link #isInvalid(SignalRecord)})
+     * make it to here, so you can assume all records are valid.
+     */
+    protected abstract Optional<E> getMatching(E remote) throws SQLException;
+
+    protected abstract E merge(E remote, E local);
+
+    protected abstract void insertLocal(E record) throws SQLException;
+
+    protected abstract void updateLocal(StorageRecordUpdate<E> update) throws SQLException;
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
new file mode 100644
index 00000000..a5c3e3e0
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
@@ -0,0 +1,135 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupIdV1;
+import org.asamk.signal.manager.storage.SignalAccount;
+import org.asamk.signal.manager.storage.groups.GroupInfoV2;
+import org.asamk.signal.manager.util.KeyUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.storage.SignalGroupV1Record;
+import org.whispersystems.signalservice.api.storage.StorageId;
+import org.whispersystems.signalservice.internal.storage.protos.GroupV1Record;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * Handles merging remote storage updates into local group v1 state.
+ */
+public final class GroupV1RecordProcessor extends DefaultStorageRecordProcessor<SignalGroupV1Record> {
+
+    private static final Logger logger = LoggerFactory.getLogger(GroupV1RecordProcessor.class);
+    private final SignalAccount account;
+    private final Connection connection;
+
+    public GroupV1RecordProcessor(SignalAccount account, Connection connection) {
+        this.account = account;
+        this.connection = connection;
+    }
+
+    /**
+     * We want to catch:
+     * - Invalid group IDs
+     * - GV1 IDs that map to GV2 IDs, meaning we've already migrated them.
+     */
+    @Override
+    protected boolean isInvalid(SignalGroupV1Record remote) throws SQLException {
+        try {
+            final var id = GroupId.unknownVersion(remote.getProto().id.toByteArray());
+            if (!(id instanceof GroupIdV1)) {
+                return true;
+            }
+            final var group = account.getGroupStore().getGroup(connection, id);
+
+            if (group instanceof GroupInfoV2) {
+                logger.debug("We already have an upgraded V2 group for this V1 group -- marking as invalid.");
+                return true;
+            } else {
+                return false;
+            }
+        } catch (AssertionError e) {
+            logger.debug("Bad Group ID -- marking as invalid.");
+            return true;
+        }
+    }
+
+    @Override
+    protected Optional<SignalGroupV1Record> getMatching(SignalGroupV1Record remote) throws SQLException {
+        final var id = GroupId.v1(remote.getProto().id.toByteArray());
+        final var group = account.getGroupStore().getGroup(connection, id);
+
+        if (group == null) {
+            return Optional.empty();
+        }
+
+        final var storageId = account.getGroupStore().getGroupStorageId(connection, id);
+        return Optional.of(new SignalGroupV1Record(storageId, StorageSyncModels.localToRemoteRecord(group)));
+    }
+
+    @Override
+    protected SignalGroupV1Record merge(SignalGroupV1Record remoteRecord, SignalGroupV1Record localRecord) {
+        final var remote = remoteRecord.getProto();
+        final var local = localRecord.getProto();
+
+        final var mergedBuilder = remote.newBuilder()
+                .id(remote.id)
+                .blocked(remote.blocked)
+                .whitelisted(remote.whitelisted)
+                .markedUnread(remote.markedUnread)
+                .mutedUntilTimestamp(remote.mutedUntilTimestamp)
+                .archived(remote.archived);
+
+        final var merged = mergedBuilder.build();
+
+        final var matchesRemote = doProtosMatch(merged, remote);
+        if (matchesRemote) {
+            return remoteRecord;
+        }
+
+        final var matchesLocal = doProtosMatch(merged, local);
+        if (matchesLocal) {
+            return localRecord;
+        }
+
+        return new SignalGroupV1Record(StorageId.forGroupV1(KeyUtils.createRawStorageId()), mergedBuilder.build());
+    }
+
+    @Override
+    protected void insertLocal(SignalGroupV1Record record) throws SQLException {
+        // TODO send group info request (after server message queue is empty)
+        // context.getGroupHelper().sendGroupInfoRequest(groupIdV1, account.getSelfRecipientId());
+        StorageRecordUpdate<SignalGroupV1Record> update = new StorageRecordUpdate<>(null, record);
+        updateLocal(update);
+    }
+
+    @Override
+    protected void updateLocal(StorageRecordUpdate<SignalGroupV1Record> update) throws SQLException {
+        final var groupV1Record = update.newRecord();
+        final var groupV1Proto = groupV1Record.getProto();
+        final var groupIdV1 = GroupId.v1(groupV1Proto.id.toByteArray());
+
+        final var group = account.getGroupStore().getOrCreateGroupV1(connection, groupIdV1);
+        if (group != null) {
+            group.setBlocked(groupV1Proto.blocked);
+            account.getGroupStore().updateGroup(connection, group);
+            account.getGroupStore()
+                    .storeStorageRecord(connection, group.getGroupId(), groupV1Record.getId(), groupV1Proto.encode());
+        }
+    }
+
+    @Override
+    public int compare(SignalGroupV1Record lhs, SignalGroupV1Record rhs) {
+        if (lhs.getProto().id.equals(rhs.getProto().id)) {
+            return 0;
+        } else {
+            return 1;
+        }
+    }
+
+    private static boolean doProtosMatch(GroupV1Record merged, GroupV1Record other) {
+        return Arrays.equals(merged.encode(), other.encode());
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
new file mode 100644
index 00000000..dfbe7c4b
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
@@ -0,0 +1,123 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.asamk.signal.manager.groups.GroupUtils;
+import org.asamk.signal.manager.storage.SignalAccount;
+import org.asamk.signal.manager.util.KeyUtils;
+import org.jetbrains.annotations.NotNull;
+import org.signal.libsignal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.storage.SignalGroupV2Record;
+import org.whispersystems.signalservice.api.storage.StorageId;
+import org.whispersystems.signalservice.internal.storage.protos.GroupV2Record;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Optional;
+
+import okio.ByteString;
+
+public final class GroupV2RecordProcessor extends DefaultStorageRecordProcessor<SignalGroupV2Record> {
+
+    private static final Logger logger = LoggerFactory.getLogger(GroupV2RecordProcessor.class);
+    private final SignalAccount account;
+    private final Connection connection;
+
+    public GroupV2RecordProcessor(SignalAccount account, Connection connection) {
+        this.account = account;
+        this.connection = connection;
+    }
+
+    @Override
+    protected boolean isInvalid(SignalGroupV2Record remote) {
+        return remote.getProto().masterKey.size() != GroupMasterKey.SIZE;
+    }
+
+    @Override
+    protected Optional<SignalGroupV2Record> getMatching(SignalGroupV2Record remote) throws SQLException {
+        final var id = GroupUtils.getGroupIdV2(getGroupMasterKeyOrThrow(remote.getProto().masterKey));
+        final var group = account.getGroupStore().getGroup(connection, id);
+
+        if (group == null) {
+            return Optional.empty();
+        }
+
+        final var storageId = account.getGroupStore().getGroupStorageId(connection, id);
+        return Optional.of(new SignalGroupV2Record(storageId, StorageSyncModels.localToRemoteRecord(group)));
+    }
+
+    @Override
+    protected SignalGroupV2Record merge(SignalGroupV2Record remoteRecord, SignalGroupV2Record localRecord) {
+        final var remote = remoteRecord.getProto();
+        final var local = localRecord.getProto();
+
+        final var mergedBuilder = remote.newBuilder()
+                .masterKey(remote.masterKey)
+                .blocked(remote.blocked)
+                .whitelisted(remote.whitelisted)
+                .archived(remote.archived)
+                .markedUnread(remote.markedUnread)
+                .mutedUntilTimestamp(remote.mutedUntilTimestamp)
+                .dontNotifyForMentionsIfMuted(remote.dontNotifyForMentionsIfMuted)
+                .hideStory(remote.hideStory)
+                .storySendMode(remote.storySendMode)
+                .avatarColor(remote.avatarColor);
+        final var merged = mergedBuilder.build();
+
+        final var matchesRemote = doProtosMatch(merged, remote);
+        if (matchesRemote) {
+            return remoteRecord;
+        }
+
+        final var matchesLocal = doProtosMatch(merged, local);
+        if (matchesLocal) {
+            return localRecord;
+        }
+
+        return new SignalGroupV2Record(StorageId.forGroupV2(KeyUtils.createRawStorageId()), mergedBuilder.build());
+    }
+
+    @Override
+    protected void insertLocal(SignalGroupV2Record record) throws SQLException {
+        StorageRecordUpdate<SignalGroupV2Record> update = new StorageRecordUpdate<>(null, record);
+        updateLocal(update);
+    }
+
+    @Override
+    protected void updateLocal(StorageRecordUpdate<SignalGroupV2Record> update) throws SQLException {
+        final var groupV2Record = update.newRecord();
+        final var groupV2Proto = groupV2Record.getProto();
+        final var groupMasterKey = getGroupMasterKeyOrThrow(groupV2Proto.masterKey);
+
+        final var group = account.getGroupStore().getGroupOrPartialMigrate(connection, groupMasterKey);
+        group.setBlocked(groupV2Proto.blocked);
+        group.setProfileSharingEnabled(groupV2Proto.whitelisted);
+        account.getGroupStore().updateGroup(connection, group);
+        account.getGroupStore()
+                .storeStorageRecord(connection, group.getGroupId(), groupV2Record.getId(), groupV2Proto.encode());
+    }
+
+    @NotNull
+    private static GroupMasterKey getGroupMasterKeyOrThrow(final ByteString masterKey) {
+        try {
+            return new GroupMasterKey(masterKey.toByteArray());
+        } catch (InvalidInputException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    @Override
+    public int compare(SignalGroupV2Record lhs, SignalGroupV2Record rhs) {
+        if (lhs.getProto().masterKey.equals(rhs.getProto().masterKey)) {
+            return 0;
+        } else {
+            return 1;
+        }
+    }
+
+    private static boolean doProtosMatch(GroupV2Record merged, GroupV2Record other) {
+        return Arrays.equals(merged.encode(), other.encode());
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordProcessor.java
new file mode 100644
index 00000000..2e14f648
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordProcessor.java
@@ -0,0 +1,14 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.whispersystems.signalservice.api.storage.SignalRecord;
+
+import java.sql.SQLException;
+
+/**
+ * Handles processing a remote record, which involves applying any local changes that need to be
+ * made based on the remote records.
+ */
+interface StorageRecordProcessor<E extends SignalRecord<?>> {
+
+    void process(E remoteRecord) throws SQLException;
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordUpdate.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordUpdate.java
new file mode 100644
index 00000000..da8ccaf6
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordUpdate.java
@@ -0,0 +1,14 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.whispersystems.signalservice.api.storage.SignalRecord;
+
+/**
+ * Represents a pair of records: one old, and one new. The new record should replace the old.
+ */
+record StorageRecordUpdate<E extends SignalRecord<?>>(E oldRecord, E newRecord) {
+
+    @Override
+    public String toString() {
+        return newRecord.describeDiff(oldRecord);
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
new file mode 100644
index 00000000..7ca71bfc
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
@@ -0,0 +1,161 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.asamk.signal.manager.api.PhoneNumberSharingMode;
+import org.asamk.signal.manager.api.TrustLevel;
+import org.asamk.signal.manager.storage.configuration.ConfigurationStore;
+import org.asamk.signal.manager.storage.groups.GroupInfoV1;
+import org.asamk.signal.manager.storage.groups.GroupInfoV2;
+import org.asamk.signal.manager.storage.identities.IdentityInfo;
+import org.asamk.signal.manager.storage.recipients.Recipient;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
+import org.whispersystems.signalservice.api.push.UsernameLinkComponents;
+import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
+import org.whispersystems.signalservice.api.storage.SignalContactRecord;
+import org.whispersystems.signalservice.api.storage.SignalGroupV1Record;
+import org.whispersystems.signalservice.api.storage.SignalGroupV2Record;
+import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.signalservice.internal.storage.protos.AccountRecord;
+import org.whispersystems.signalservice.internal.storage.protos.AccountRecord.UsernameLink;
+import org.whispersystems.signalservice.internal.storage.protos.ContactRecord;
+import org.whispersystems.signalservice.internal.storage.protos.ContactRecord.IdentityState;
+import org.whispersystems.signalservice.internal.storage.protos.GroupV1Record;
+import org.whispersystems.signalservice.internal.storage.protos.GroupV2Record;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Optional;
+
+import okio.ByteString;
+
+import static org.signal.core.util.StringExtensionsKt.emptyIfNull;
+
+public final class StorageSyncModels {
+
+    private StorageSyncModels() {
+    }
+
+    public static AccountRecord.PhoneNumberSharingMode localToRemote(PhoneNumberSharingMode phoneNumberPhoneNumberSharingMode) {
+        return switch (phoneNumberPhoneNumberSharingMode) {
+            case EVERYBODY -> AccountRecord.PhoneNumberSharingMode.EVERYBODY;
+            case CONTACTS, NOBODY -> AccountRecord.PhoneNumberSharingMode.NOBODY;
+        };
+    }
+
+    public static PhoneNumberSharingMode remoteToLocal(AccountRecord.PhoneNumberSharingMode phoneNumberPhoneNumberSharingMode) {
+        return switch (phoneNumberPhoneNumberSharingMode) {
+            case EVERYBODY -> PhoneNumberSharingMode.EVERYBODY;
+            case NOBODY -> PhoneNumberSharingMode.NOBODY;
+            case UNKNOWN -> null;
+        };
+    }
+
+    public static AccountRecord localToRemoteRecord(
+            final Connection connection,
+            ConfigurationStore configStore,
+            Recipient self,
+            UsernameLinkComponents usernameLinkComponents
+    ) throws SQLException {
+        final var builder = SignalAccountRecord.Companion.newBuilder(self.getStorageRecord());
+        if (self.getProfileKey() != null) {
+            builder.profileKey(ByteString.of(self.getProfileKey().serialize()));
+        }
+        if (self.getProfile() != null) {
+            builder.givenName(emptyIfNull(self.getProfile().getGivenName()))
+                    .familyName(emptyIfNull(self.getProfile().getFamilyName()))
+                    .avatarUrlPath(emptyIfNull(self.getProfile().getAvatarUrlPath()));
+        }
+        builder.typingIndicators(Optional.ofNullable(configStore.getTypingIndicators(connection)).orElse(true))
+                .readReceipts(Optional.ofNullable(configStore.getReadReceipts(connection)).orElse(true))
+                .sealedSenderIndicators(Optional.ofNullable(configStore.getUnidentifiedDeliveryIndicators(connection))
+                        .orElse(true))
+                .linkPreviews(Optional.ofNullable(configStore.getLinkPreviews(connection)).orElse(true))
+                .unlistedPhoneNumber(Optional.ofNullable(configStore.getPhoneNumberUnlisted(connection)).orElse(false))
+                .phoneNumberSharingMode(Optional.ofNullable(configStore.getPhoneNumberSharingMode(connection))
+                        .map(StorageSyncModels::localToRemote)
+                        .orElse(AccountRecord.PhoneNumberSharingMode.UNKNOWN))
+                .username(self.getAddress().username().orElse(""));
+        if (usernameLinkComponents != null) {
+            final var linkColor = configStore.getUsernameLinkColor(connection);
+            builder.usernameLink(new UsernameLink.Builder().entropy(ByteString.of(usernameLinkComponents.getEntropy()))
+                    .serverId(UuidUtil.toByteString(usernameLinkComponents.getServerId()))
+                    .color(linkColor == null ? UsernameLink.Color.UNKNOWN : UsernameLink.Color.valueOf(linkColor))
+                    .build());
+        }
+
+        return builder.build();
+    }
+
+    public static ContactRecord localToRemoteRecord(Recipient recipient, IdentityInfo identity) {
+        final var address = recipient.getAddress();
+        final var builder = SignalContactRecord.Companion.newBuilder(recipient.getStorageRecord())
+                .aci(address.aci().map(ACI::toString).orElse(""))
+                .e164(address.number().orElse(""))
+                .pni(address.pni().map(PNI::toStringWithoutPrefix).orElse(""))
+                .username(address.username().orElse(""))
+                .profileKey(recipient.getProfileKey() == null
+                        ? ByteString.EMPTY
+                        : ByteString.of(recipient.getProfileKey().serialize()));
+        if (recipient.getProfile() != null) {
+            builder.givenName(emptyIfNull(recipient.getProfile().getGivenName()))
+                    .familyName(emptyIfNull(recipient.getProfile().getFamilyName()));
+        }
+        if (recipient.getContact() != null) {
+            builder.systemGivenName(emptyIfNull(recipient.getContact().givenName()))
+                    .systemFamilyName(emptyIfNull(recipient.getContact().familyName()))
+                    .systemNickname(emptyIfNull(recipient.getContact().nickName()))
+                    .nickname(new ContactRecord.Name.Builder().given(emptyIfNull(recipient.getContact()
+                                    .nickNameGivenName()))
+                            .family(emptyIfNull(recipient.getContact().nickNameFamilyName()))
+                            .build())
+                    .note(emptyIfNull(recipient.getContact().note()))
+                    .blocked(recipient.getContact().isBlocked())
+                    .whitelisted(recipient.getContact().isProfileSharingEnabled())
+                    .mutedUntilTimestamp(recipient.getContact().muteUntil())
+                    .hideStory(recipient.getContact().hideStory())
+                    .unregisteredAtTimestamp(recipient.getContact().unregisteredTimestamp() == null
+                            ? 0
+                            : recipient.getContact().unregisteredTimestamp())
+                    .archived(recipient.getContact().isArchived())
+                    .hidden(recipient.getContact().isHidden());
+        }
+        if (identity != null) {
+            builder.identityKey(ByteString.of(identity.getIdentityKey().serialize()))
+                    .identityState(localToRemote(identity.getTrustLevel()));
+        }
+        return builder.build();
+    }
+
+    public static GroupV1Record localToRemoteRecord(GroupInfoV1 group) {
+        final var builder = SignalGroupV1Record.Companion.newBuilder(group.getStorageRecord());
+        builder.id(ByteString.of(group.getGroupId().serialize()));
+        builder.blocked(group.isBlocked());
+        builder.archived(group.archived);
+        builder.whitelisted(true);
+        return builder.build();
+    }
+
+    public static GroupV2Record localToRemoteRecord(GroupInfoV2 group) {
+        final var builder = SignalGroupV2Record.Companion.newBuilder(group.getStorageRecord());
+        builder.masterKey(ByteString.of(group.getMasterKey().serialize()));
+        builder.blocked(group.isBlocked());
+        builder.whitelisted(group.isProfileSharingEnabled());
+        return builder.build();
+    }
+
+    public static TrustLevel remoteToLocal(IdentityState identityState) {
+        return switch (identityState) {
+            case DEFAULT -> TrustLevel.TRUSTED_UNVERIFIED;
+            case UNVERIFIED -> TrustLevel.UNTRUSTED;
+            case VERIFIED -> TrustLevel.TRUSTED_VERIFIED;
+        };
+    }
+
+    private static IdentityState localToRemote(TrustLevel local) {
+        return switch (local) {
+            case TRUSTED_VERIFIED -> IdentityState.VERIFIED;
+            case UNTRUSTED -> IdentityState.UNVERIFIED;
+            default -> IdentityState.DEFAULT;
+        };
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java
new file mode 100644
index 00000000..249a792d
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java
@@ -0,0 +1,245 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.signal.core.util.Base64;
+import org.signal.core.util.SetUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
+import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
+import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
+import org.whispersystems.signalservice.api.storage.StorageId;
+import org.whispersystems.signalservice.internal.storage.protos.ManifestRecord;
+
+import java.nio.ByteBuffer;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public final class StorageSyncValidations {
+
+    private static final Logger logger = LoggerFactory.getLogger(StorageSyncValidations.class);
+
+    private StorageSyncValidations() {
+    }
+
+    public static void validate(
+            WriteOperationResult result,
+            SignalStorageManifest previousManifest,
+            boolean forcePushPending,
+            RecipientAddress self
+    ) {
+        validateManifestAndInserts(result.manifest(), result.inserts(), self);
+
+        if (!result.deletes().isEmpty()) {
+            Set<String> allSetEncoded = result.manifest().storageIds.stream()
+                    .map(StorageId::getRaw)
+                    .map(Base64::encodeWithPadding)
+                    .collect(Collectors.toSet());
+
+            for (byte[] delete : result.deletes()) {
+                String encoded = Base64.encodeWithPadding(delete);
+                if (allSetEncoded.contains(encoded)) {
+                    throw new DeletePresentInFullIdSetError();
+                }
+            }
+        }
+
+        if (previousManifest.version == 0) {
+            logger.debug(
+                    "Previous manifest is empty, not bothering with additional validations around the diffs between the two manifests.");
+            return;
+        }
+
+        if (result.manifest().version != previousManifest.version + 1) {
+            throw new IncorrectManifestVersionError();
+        }
+
+        if (forcePushPending) {
+            logger.debug(
+                    "Force push pending, not bothering with additional validations around the diffs between the two manifests.");
+            return;
+        }
+
+        Set<ByteBuffer> previousIds = previousManifest.storageIds.stream()
+                .map(id -> ByteBuffer.wrap(id.getRaw()))
+                .collect(Collectors.toSet());
+        Set<ByteBuffer> newIds = result.manifest().storageIds.stream()
+                .map(id -> ByteBuffer.wrap(id.getRaw()))
+                .collect(Collectors.toSet());
+
+        Set<ByteBuffer> manifestInserts = SetUtil.difference(newIds, previousIds);
+        Set<ByteBuffer> manifestDeletes = SetUtil.difference(previousIds, newIds);
+
+        Set<ByteBuffer> declaredInserts = result.inserts()
+                .stream()
+                .map(r -> ByteBuffer.wrap(r.getId().getRaw()))
+                .collect(Collectors.toSet());
+        Set<ByteBuffer> declaredDeletes = result.deletes().stream().map(ByteBuffer::wrap).collect(Collectors.toSet());
+
+        if (declaredInserts.size() > manifestInserts.size()) {
+            logger.debug("DeclaredInserts: {}, ManifestInserts: {}", declaredInserts.size(), manifestInserts.size());
+            throw new MoreInsertsThanExpectedError();
+        }
+
+        if (declaredInserts.size() < manifestInserts.size()) {
+            logger.debug("DeclaredInserts: {}, ManifestInserts: {}", declaredInserts.size(), manifestInserts.size());
+            throw new LessInsertsThanExpectedError();
+        }
+
+        if (!declaredInserts.containsAll(manifestInserts)) {
+            throw new InsertMismatchError();
+        }
+
+        if (declaredDeletes.size() > manifestDeletes.size()) {
+            logger.debug("DeclaredDeletes: {}, ManifestDeletes: {}", declaredDeletes.size(), manifestDeletes.size());
+            throw new MoreDeletesThanExpectedError();
+        }
+
+        if (declaredDeletes.size() < manifestDeletes.size()) {
+            logger.debug("DeclaredDeletes: {}, ManifestDeletes: {}", declaredDeletes.size(), manifestDeletes.size());
+            throw new LessDeletesThanExpectedError();
+        }
+
+        if (!declaredDeletes.containsAll(manifestDeletes)) {
+            throw new DeleteMismatchError();
+        }
+    }
+
+    public static void validateForcePush(
+            SignalStorageManifest manifest,
+            List<SignalStorageRecord> inserts,
+            RecipientAddress self
+    ) {
+        validateManifestAndInserts(manifest, inserts, self);
+    }
+
+    private static void validateManifestAndInserts(
+            SignalStorageManifest manifest,
+            List<SignalStorageRecord> inserts,
+            RecipientAddress self
+    ) {
+        int accountCount = 0;
+        for (StorageId id : manifest.storageIds) {
+            accountCount += id.getType() == ManifestRecord.Identifier.Type.ACCOUNT.getValue() ? 1 : 0;
+        }
+
+        if (accountCount > 1) {
+            throw new MultipleAccountError();
+        }
+
+        if (accountCount == 0) {
+            throw new MissingAccountError();
+        }
+
+        Set<StorageId> allSet = new HashSet<>(manifest.storageIds);
+        Set<StorageId> insertSet = inserts.stream().map(SignalStorageRecord::getId).collect(Collectors.toSet());
+        Set<ByteBuffer> rawIdSet = allSet.stream().map(id -> ByteBuffer.wrap(id.getRaw())).collect(Collectors.toSet());
+
+        if (allSet.size() != manifest.storageIds.size()) {
+            throw new DuplicateStorageIdError();
+        }
+
+        if (rawIdSet.size() != allSet.size()) {
+            List<StorageId> ids = manifest.getStorageIdsByType().get(ManifestRecord.Identifier.Type.CONTACT.getValue());
+            if (ids.size() != new HashSet<>(ids).size()) {
+                throw new DuplicateContactIdError();
+            }
+
+            ids = manifest.getStorageIdsByType().get(ManifestRecord.Identifier.Type.GROUPV1.getValue());
+            if (ids.size() != new HashSet<>(ids).size()) {
+                throw new DuplicateGroupV1IdError();
+            }
+
+            ids = manifest.getStorageIdsByType().get(ManifestRecord.Identifier.Type.GROUPV2.getValue());
+            if (ids.size() != new HashSet<>(ids).size()) {
+                throw new DuplicateGroupV2IdError();
+            }
+
+            ids = manifest.getStorageIdsByType().get(ManifestRecord.Identifier.Type.STORY_DISTRIBUTION_LIST.getValue());
+            if (ids.size() != new HashSet<>(ids).size()) {
+                throw new DuplicateDistributionListIdError();
+            }
+
+            ids = manifest.getStorageIdsByType().get(ManifestRecord.Identifier.Type.CALL_LINK.getValue());
+            if (ids.size() != new HashSet<>(ids).size()) {
+                throw new DuplicateCallLinkError();
+            }
+
+            throw new DuplicateRawIdAcrossTypesError();
+        }
+
+        if (inserts.size() > insertSet.size()) {
+            throw new DuplicateInsertInWriteError();
+        }
+
+        for (SignalStorageRecord insert : inserts) {
+            if (!allSet.contains(insert.getId())) {
+                throw new InsertNotPresentInFullIdSetError();
+            }
+
+            if (insert.isUnknown()) {
+                throw new UnknownInsertError();
+            }
+
+            if (insert.getProto().contact != null) {
+                final var contact = insert.getProto().contact;
+                final var aci = ACI.parseOrNull(contact.aci);
+                final var pni = PNI.parseOrNull(contact.pni);
+                final var number = contact.e164.isEmpty() ? null : contact.e164;
+                final var username = contact.username.isEmpty() ? null : contact.username;
+                final var address = new RecipientAddress(aci, pni, number, username);
+                if (self.matches(address)) {
+                    throw new SelfAddedAsContactError();
+                }
+            }
+            if (insert.getProto().account != null && insert.getProto().account.profileKey.size() == 0) {
+                logger.debug("Uploading a null profile key in our AccountRecord!");
+            }
+        }
+    }
+
+    private static final class DuplicateStorageIdError extends Error {}
+
+    private static final class DuplicateRawIdAcrossTypesError extends Error {}
+
+    private static final class DuplicateContactIdError extends Error {}
+
+    private static final class DuplicateGroupV1IdError extends Error {}
+
+    private static final class DuplicateGroupV2IdError extends Error {}
+
+    private static final class DuplicateDistributionListIdError extends Error {}
+
+    private static final class DuplicateCallLinkError extends Error {}
+
+    private static final class DuplicateInsertInWriteError extends Error {}
+
+    private static final class InsertNotPresentInFullIdSetError extends Error {}
+
+    private static final class DeletePresentInFullIdSetError extends Error {}
+
+    private static final class UnknownInsertError extends Error {}
+
+    private static final class MultipleAccountError extends Error {}
+
+    private static final class MissingAccountError extends Error {}
+
+    private static final class SelfAddedAsContactError extends Error {}
+
+    private static final class IncorrectManifestVersionError extends Error {}
+
+    private static final class MoreInsertsThanExpectedError extends Error {}
+
+    private static final class LessInsertsThanExpectedError extends Error {}
+
+    private static final class InsertMismatchError extends Error {}
+
+    private static final class MoreDeletesThanExpectedError extends Error {}
+
+    private static final class LessDeletesThanExpectedError extends Error {}
+
+    private static final class DeleteMismatchError extends Error {}
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/WriteOperationResult.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/WriteOperationResult.java
new file mode 100644
index 00000000..5bbd996e
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/WriteOperationResult.java
@@ -0,0 +1,30 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
+import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
+
+import java.util.List;
+import java.util.Locale;
+
+public record WriteOperationResult(
+        SignalStorageManifest manifest, List<SignalStorageRecord> inserts, List<byte[]> deletes
+) {
+
+    public boolean isEmpty() {
+        return inserts.isEmpty() && deletes.isEmpty();
+    }
+
+    @Override
+    public String toString() {
+        if (isEmpty()) {
+            return "Empty";
+        } else {
+            return String.format(Locale.ROOT,
+                    "ManifestVersion: %d, Total Keys: %d, Inserts: %d, Deletes: %d",
+                    manifest.version,
+                    manifest.storageIds.size(),
+                    inserts.size(),
+                    deletes.size());
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
index a94d7673..bab4c433 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
@@ -2,61 +2,44 @@ package org.asamk.signal.manager.util;
 
 import org.asamk.signal.manager.api.AttachmentInvalidException;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
+import org.whispersystems.signalservice.api.push.exceptions.ResumeLocationInvalidException;
 import org.whispersystems.signalservice.api.util.StreamDetails;
 import org.whispersystems.signalservice.internal.push.http.ResumableUploadSpec;
 
-import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 
 public class AttachmentUtils {
 
-    public static List<SignalServiceAttachmentStream> createAttachmentStreams(List<String> attachments) throws AttachmentInvalidException {
-        if (attachments == null) {
-            return null;
-        }
-        final var signalServiceAttachments = new ArrayList<SignalServiceAttachmentStream>(attachments.size());
-        for (var attachment : attachments) {
-            signalServiceAttachments.add(createAttachmentStream(new File(attachment)));
-        }
-        return signalServiceAttachments;
-    }
-
-    public static SignalServiceAttachmentStream createAttachmentStream(File attachmentFile) throws AttachmentInvalidException {
+    public static SignalServiceAttachmentStream createAttachmentStream(
+            String attachment,
+            ResumableUploadSpec resumableUploadSpec
+    ) throws AttachmentInvalidException {
         try {
-            final var streamDetails = Utils.createStreamDetailsFromFile(attachmentFile);
-            return createAttachmentStream(streamDetails, Optional.of(attachmentFile.getName()));
+            final var streamDetails = Utils.createStreamDetails(attachment);
+
+            return createAttachmentStream(streamDetails.first(), streamDetails.second(), resumableUploadSpec);
         } catch (IOException e) {
-            throw new AttachmentInvalidException(attachmentFile.toString(), e);
+            throw new AttachmentInvalidException(attachment, e);
         }
     }
 
     public static SignalServiceAttachmentStream createAttachmentStream(
-            StreamDetails streamDetails, Optional<String> name
-    ) {
+            StreamDetails streamDetails,
+            Optional<String> name,
+            ResumableUploadSpec resumableUploadSpec
+    ) throws ResumeLocationInvalidException {
         // TODO maybe add a parameter to set the voiceNote, borderless, preview, width, height and caption option
         final var uploadTimestamp = System.currentTimeMillis();
-        Optional<byte[]> preview = Optional.empty();
-        Optional<String> caption = Optional.empty();
-        Optional<String> blurHash = Optional.empty();
-        final Optional<ResumableUploadSpec> resumableUploadSpec = Optional.empty();
-        return new SignalServiceAttachmentStream(streamDetails.getStream(),
-                streamDetails.getContentType(),
-                streamDetails.getLength(),
-                name,
-                false,
-                false,
-                false,
-                preview,
-                0,
-                0,
-                uploadTimestamp,
-                caption,
-                blurHash,
-                null,
-                null,
-                resumableUploadSpec);
+        return SignalServiceAttachmentStream.newStreamBuilder()
+                .withStream(streamDetails.getStream())
+                .withContentType(streamDetails.getContentType())
+                .withLength(streamDetails.getLength())
+                .withFileName(name.orElse(null))
+                .withUploadTimestamp(uploadTimestamp)
+                .withResumableUploadSpec(resumableUploadSpec)
+                .withUuid(UUID.randomUUID())
+                .build();
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/DataURI.java b/lib/src/main/java/org/asamk/signal/manager/util/DataURI.java
new file mode 100644
index 00000000..b848c868
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/util/DataURI.java
@@ -0,0 +1,69 @@
+package org.asamk.signal.manager.util;
+
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@SuppressWarnings({"java:S6218"})
+public record DataURI(String mediaType, Map<String, String> parameter, byte[] data) {
+
+    public static final Pattern DATA_URI_PATTERN = Pattern.compile(
+            "\\Adata:(?<type>.+?/.+?)?(?<parameters>;.+?=.+?)?(?<base64>;base64)?,(?<data>.+)\\z",
+            Pattern.CASE_INSENSITIVE);
+    public static final Pattern PARAMETER_PATTERN = Pattern.compile("\\G;(?<key>.+)=(?<value>.+)",
+            Pattern.CASE_INSENSITIVE);
+
+    /**
+     * Generates a new {@link DataURI} object that follows
+     * <a href="https://datatracker.ietf.org/doc/html/rfc2397">RFC 2397</a> from the given string.
+     * <p>
+     * The {@code dataURI} must be of the form:
+     * <p>
+     * {@code
+     * data:[<mediatype>][;base64],<data>
+     * }
+     * <p>
+     * The {@code <mediatype>} is an Internet media type specification (with
+     * optional parameters.) The appearance of ";base64" means that the data
+     * is encoded as base64. Without ";base64", the data is represented using (ASCII) URL Escaped encoding.
+     * If {@code <mediatype>} is omitted, it defaults to {@link MimeUtils#PLAIN_TEXT}.
+     * Parameter values should use the URL Escaped encoding.
+     *
+     * @param dataURI the data URI
+     * @return a data URI object
+     * @throws IllegalArgumentException if the given string is not a valid data URI
+     */
+    public static DataURI of(final String dataURI) {
+        final var matcher = DATA_URI_PATTERN.matcher(dataURI);
+
+        if (!matcher.find()) {
+            throw new IllegalArgumentException("The given string is not a valid data URI.");
+        }
+
+        final Map<String, String> parameters = new HashMap<>();
+        final var params = matcher.group("parameters");
+        if (params != null) {
+            final Matcher paramsMatcher = PARAMETER_PATTERN.matcher(params);
+            while (paramsMatcher.find()) {
+                final var key = paramsMatcher.group("key");
+                final var value = URLDecoder.decode(paramsMatcher.group("value"), StandardCharsets.UTF_8);
+                parameters.put(key, value);
+            }
+        }
+
+        final boolean isBase64 = matcher.group("base64") != null;
+        final byte[] data;
+        if (isBase64) {
+            data = Base64.getDecoder().decode(matcher.group("data").getBytes(StandardCharsets.UTF_8));
+        } else {
+            data = URLDecoder.decode(matcher.group("data"), StandardCharsets.UTF_8).getBytes(StandardCharsets.UTF_8);
+        }
+
+        return new DataURI(Optional.ofNullable(matcher.group("type")).orElse(MimeUtils.PLAIN_TEXT), parameters, data);
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
index d87868ee..31c3cd39 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
@@ -1,22 +1,29 @@
 package org.asamk.signal.manager.util;
 
+import org.asamk.signal.manager.storage.SignalAccount;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidKeyException;
-import org.signal.libsignal.protocol.ecc.Curve;
+import org.signal.libsignal.protocol.ecc.ECKeyPair;
 import org.signal.libsignal.protocol.ecc.ECPrivateKey;
+import org.signal.libsignal.protocol.kem.KEMKeyPair;
+import org.signal.libsignal.protocol.kem.KEMKeyType;
+import org.signal.libsignal.protocol.state.KyberPreKeyRecord;
 import org.signal.libsignal.protocol.state.PreKeyRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
-import org.signal.libsignal.protocol.util.Medium;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
-import org.whispersystems.signalservice.api.kbs.MasterKey;
+import org.whispersystems.signalservice.api.account.PreKeyCollection;
+import org.whispersystems.signalservice.api.backup.MediaRootBackupKey;
 
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
 
+import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_BATCH_SIZE;
+import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_MAXIMUM_ID;
+
 public class KeyUtils {
 
     private static final SecureRandom secureRandom = new SecureRandom();
@@ -26,8 +33,8 @@ public class KeyUtils {
 
     public static IdentityKeyPair getIdentityKeyPair(byte[] publicKeyBytes, byte[] privateKeyBytes) {
         try {
-            IdentityKey publicKey = new IdentityKey(publicKeyBytes);
-            ECPrivateKey privateKey = Curve.decodePrivatePoint(privateKeyBytes);
+            final var publicKey = new IdentityKey(publicKeyBytes);
+            final var privateKey = new ECPrivateKey(privateKeyBytes);
 
             return new IdentityKeyPair(publicKey, privateKey);
         } catch (InvalidKeyException e) {
@@ -36,18 +43,18 @@ public class KeyUtils {
     }
 
     public static IdentityKeyPair generateIdentityKeyPair() {
-        var djbKeyPair = Curve.generateKeyPair();
+        var djbKeyPair = ECKeyPair.generate();
         var djbIdentityKey = new IdentityKey(djbKeyPair.getPublicKey());
         var djbPrivateKey = djbKeyPair.getPrivateKey();
 
         return new IdentityKeyPair(djbIdentityKey, djbPrivateKey);
     }
 
-    public static List<PreKeyRecord> generatePreKeyRecords(final int offset, final int batchSize) {
-        var records = new ArrayList<PreKeyRecord>(batchSize);
-        for (var i = 0; i < batchSize; i++) {
-            var preKeyId = (offset + i) % Medium.MAX_VALUE;
-            var keyPair = Curve.generateKeyPair();
+    public static List<PreKeyRecord> generatePreKeyRecords(final int offset) {
+        var records = new ArrayList<PreKeyRecord>(PREKEY_BATCH_SIZE);
+        for (var i = 0; i < PREKEY_BATCH_SIZE; i++) {
+            var preKeyId = (offset + i) % PREKEY_MAXIMUM_ID;
+            var keyPair = ECKeyPair.generate();
             var record = new PreKeyRecord(preKeyId, keyPair);
 
             records.add(record);
@@ -56,18 +63,31 @@ public class KeyUtils {
     }
 
     public static SignedPreKeyRecord generateSignedPreKeyRecord(
-            final IdentityKeyPair identityKeyPair, final int signedPreKeyId
+            final int signedPreKeyId,
+            final ECPrivateKey privateKey
     ) {
-        var keyPair = Curve.generateKeyPair();
+        var keyPair = ECKeyPair.generate();
         byte[] signature;
-        try {
-            signature = Curve.calculateSignature(identityKeyPair.getPrivateKey(), keyPair.getPublicKey().serialize());
-        } catch (InvalidKeyException e) {
-            throw new AssertionError(e);
-        }
+        signature = privateKey.calculateSignature(keyPair.getPublicKey().serialize());
         return new SignedPreKeyRecord(signedPreKeyId, System.currentTimeMillis(), keyPair, signature);
     }
 
+    public static List<KyberPreKeyRecord> generateKyberPreKeyRecords(final int offset, final ECPrivateKey privateKey) {
+        var records = new ArrayList<KyberPreKeyRecord>(PREKEY_BATCH_SIZE);
+        for (var i = 0; i < PREKEY_BATCH_SIZE; i++) {
+            var preKeyId = (offset + i) % PREKEY_MAXIMUM_ID;
+            records.add(generateKyberPreKeyRecord(preKeyId, privateKey));
+        }
+        return records;
+    }
+
+    public static KyberPreKeyRecord generateKyberPreKeyRecord(final int preKeyId, final ECPrivateKey privateKey) {
+        KEMKeyPair keyPair = KEMKeyPair.generate(KEMKeyType.KYBER_1024);
+        byte[] signature = privateKey.calculateSignature(keyPair.getPublicKey().serialize());
+
+        return new KyberPreKeyRecord(preKeyId, System.currentTimeMillis(), keyPair, signature);
+    }
+
     public static ProfileKey createProfileKey() {
         try {
             return new ProfileKey(getSecretBytes(32));
@@ -84,8 +104,12 @@ public class KeyUtils {
         return getSecretBytes(32);
     }
 
-    public static MasterKey createMasterKey() {
-        return MasterKey.createNew(secureRandom);
+    public static MediaRootBackupKey createMediaRootBackupKey() {
+        return new MediaRootBackupKey(getSecretBytes(32));
+    }
+
+    public static byte[] createRawStorageId() {
+        return getSecretBytes(16);
     }
 
     private static String getSecret(int size) {
@@ -98,4 +122,22 @@ public class KeyUtils {
         secureRandom.nextBytes(secret);
         return secret;
     }
+
+    public static int getRandomInt(int bound) {
+        return secureRandom.nextInt(bound);
+    }
+
+    public static PreKeyCollection generatePreKeysForType(final SignalAccount.AccountData<?> accountData) {
+        final var keyPair = accountData.getIdentityKeyPair();
+        final var preKeyMetadata = accountData.getPreKeyMetadata();
+
+        final var nextSignedPreKeyId = preKeyMetadata.getNextSignedPreKeyId();
+        final var signedPreKey = generateSignedPreKeyRecord(nextSignedPreKeyId, keyPair.getPrivateKey());
+
+        final var privateKey = keyPair.getPrivateKey();
+        final var kyberPreKeyIdOffset = preKeyMetadata.getNextKyberPreKeyId();
+        final var lastResortKyberPreKey = generateKyberPreKeyRecord(kyberPreKeyIdOffset, privateKey);
+
+        return new PreKeyCollection(keyPair.getPublicKey(), signedPreKey, lastResortKyberPreKey);
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
index 347e3d81..316c349e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
@@ -1,9 +1,12 @@
 package org.asamk.signal.manager.util;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.signalservice.internal.push.Envelope;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -15,96 +18,103 @@ import java.util.Optional;
 
 public class MessageCacheUtils {
 
+    private static final Logger logger = LoggerFactory.getLogger(MessageCacheUtils.class);
+
+    static final int CURRENT_VERSION = 9;
+
     public static SignalServiceEnvelope loadEnvelope(File file) throws IOException {
         try (var f = new FileInputStream(file)) {
             var in = new DataInputStream(f);
             var version = in.readInt();
-            if (version > 5) {
+            logger.trace("Reading cached envelope file with version {} (current: {})", version, CURRENT_VERSION);
+            if (version > CURRENT_VERSION) {
+                logger.warn("Unsupported envelope version {} (current: {})", version, CURRENT_VERSION);
+                // Unsupported envelope version
                 return null;
             }
-            var type = in.readInt();
-            var source = in.readUTF();
-            ServiceId sourceServiceId = null;
-            if (version >= 3) {
-                sourceServiceId = ServiceId.parseOrNull(in.readUTF());
-            }
-            var sourceDevice = in.readInt();
-            if (version == 1) {
-                // read legacy relay field
-                in.readUTF();
-            }
-            String destinationUuid = null;
-            if (version >= 5) {
-                destinationUuid = in.readUTF();
-            }
-            var timestamp = in.readLong();
-            byte[] content = null;
-            var contentLen = in.readInt();
-            if (contentLen > 0) {
-                content = new byte[contentLen];
-                in.readFully(content);
-            }
-            byte[] legacyMessage = null;
-            var legacyMessageLen = in.readInt();
-            if (legacyMessageLen > 0) {
-                legacyMessage = new byte[legacyMessageLen];
-                in.readFully(legacyMessage);
-            }
-            long serverReceivedTimestamp = 0;
-            String uuid = null;
-            if (version >= 2) {
-                serverReceivedTimestamp = in.readLong();
-                uuid = in.readUTF();
-                if ("".equals(uuid)) {
-                    uuid = null;
+            if (version >= 9) {
+                final var serverReceivedTimestamp = in.readLong();
+                final var envelope = Envelope.ADAPTER.decode(in.readAllBytes());
+                return new SignalServiceEnvelope(envelope, serverReceivedTimestamp);
+            } else {
+                var type = in.readInt();
+                var source = in.readUTF();
+                ServiceId sourceServiceId = null;
+                if (version >= 3) {
+                    sourceServiceId = ServiceId.parseOrNull(in.readUTF());
                 }
+                var sourceDevice = in.readInt();
+                if (version == 1) {
+                    // read legacy relay field
+                    in.readUTF();
+                }
+                String destinationUuid = null;
+                if (version >= 5) {
+                    destinationUuid = in.readUTF();
+                }
+                var timestamp = in.readLong();
+                byte[] content = null;
+                var contentLen = in.readInt();
+                if (contentLen > 0) {
+                    content = new byte[contentLen];
+                    in.readFully(content);
+                }
+                var legacyMessageLen = in.readInt();
+                if (legacyMessageLen > 0) {
+                    byte[] legacyMessage = new byte[legacyMessageLen];
+                    in.readFully(legacyMessage);
+                }
+                long serverReceivedTimestamp = 0;
+                String uuid = null;
+                if (version >= 2) {
+                    serverReceivedTimestamp = in.readLong();
+                    uuid = in.readUTF();
+                    if (uuid.isEmpty()) {
+                        uuid = null;
+                    }
+                }
+                long serverDeliveredTimestamp = 0;
+                if (version >= 4) {
+                    serverDeliveredTimestamp = in.readLong();
+                }
+                boolean isUrgent = true;
+                if (version >= 6) {
+                    isUrgent = in.readBoolean();
+                }
+                boolean isStory = true;
+                if (version >= 7) {
+                    isStory = in.readBoolean();
+                }
+                String updatedPni = null;
+                if (version >= 8) {
+                    updatedPni = in.readUTF();
+                }
+                Optional<SignalServiceAddress> addressOptional = sourceServiceId == null
+                        ? Optional.empty()
+                        : Optional.of(new SignalServiceAddress(sourceServiceId, source));
+                return new SignalServiceEnvelope(type,
+                        addressOptional,
+                        sourceDevice,
+                        timestamp,
+                        content,
+                        serverReceivedTimestamp,
+                        serverDeliveredTimestamp,
+                        uuid,
+                        destinationUuid == null ? UuidUtil.UNKNOWN_UUID.toString() : destinationUuid,
+                        isUrgent,
+                        isStory,
+                        null,
+                        updatedPni == null ? "" : updatedPni);
             }
-            long serverDeliveredTimestamp = 0;
-            if (version >= 4) {
-                serverDeliveredTimestamp = in.readLong();
-            }
-            Optional<SignalServiceAddress> addressOptional = sourceServiceId == null
-                    ? Optional.empty()
-                    : Optional.of(new SignalServiceAddress(sourceServiceId, source));
-            return new SignalServiceEnvelope(type,
-                    addressOptional,
-                    sourceDevice,
-                    timestamp,
-                    legacyMessage,
-                    content,
-                    serverReceivedTimestamp,
-                    serverDeliveredTimestamp,
-                    uuid,
-                    destinationUuid == null ? UuidUtil.UNKNOWN_UUID.toString() : destinationUuid);
         }
     }
 
     public static void storeEnvelope(SignalServiceEnvelope envelope, File file) throws IOException {
         try (var f = new FileOutputStream(file)) {
             try (var out = new DataOutputStream(f)) {
-                out.writeInt(5); // version
-                out.writeInt(envelope.getType());
-                out.writeUTF(envelope.getSourceE164().isPresent() ? envelope.getSourceE164().get() : "");
-                out.writeUTF(envelope.getSourceUuid().isPresent() ? envelope.getSourceUuid().get() : "");
-                out.writeInt(envelope.getSourceDevice());
-                out.writeUTF(envelope.getDestinationUuid() == null ? "" : envelope.getDestinationUuid());
-                out.writeLong(envelope.getTimestamp());
-                if (envelope.hasContent()) {
-                    out.writeInt(envelope.getContent().length);
-                    out.write(envelope.getContent());
-                } else {
-                    out.writeInt(0);
-                }
-                if (envelope.hasLegacyMessage()) {
-                    out.writeInt(envelope.getLegacyMessage().length);
-                    out.write(envelope.getLegacyMessage());
-                } else {
-                    out.writeInt(0);
-                }
-                out.writeLong(envelope.getServerReceivedTimestamp());
-                var uuid = envelope.getServerGuid();
-                out.writeUTF(uuid == null ? "" : uuid);
+                out.writeInt(CURRENT_VERSION); // version
                 out.writeLong(envelope.getServerDeliveredTimestamp());
+                envelope.getProto().encode(out);
             }
         }
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/MimeUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/MimeUtils.java
new file mode 100644
index 00000000..17d81345
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/util/MimeUtils.java
@@ -0,0 +1,51 @@
+package org.asamk.signal.manager.util;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLConnection;
+import java.nio.file.Files;
+import java.util.Optional;
+
+public class MimeUtils {
+
+    public static final String LONG_TEXT = "text/x-signal-plain";
+    public static final String PLAIN_TEXT = "text/plain";
+    public static final String OCTET_STREAM = "application/octet-stream";
+
+    public static Optional<String> getFileMimeType(final File file) throws IOException {
+        var mime = Files.probeContentType(file.toPath());
+        if (mime != null) {
+            return Optional.of(mime);
+        }
+
+        try (final InputStream bufferedStream = new BufferedInputStream(new FileInputStream(file))) {
+            return getStreamMimeType(bufferedStream);
+        }
+    }
+
+    public static Optional<String> getStreamMimeType(final InputStream inputStream) throws IOException {
+        return Optional.ofNullable(URLConnection.guessContentTypeFromStream(inputStream));
+    }
+
+    public static Optional<String> guessExtensionFromMimeType(String mimeType) {
+        return Optional.ofNullable(switch (mimeType) {
+            case "application/vnd.android.package-archive" -> "apk";
+            case "application/json" -> "json";
+            case "image/png" -> "png";
+            case "image/jpeg" -> "jpg";
+            case "image/heic" -> "heic";
+            case "image/heif" -> "heif";
+            case "image/webp" -> "webp";
+            case "image/gif" -> "gif";
+            case "audio/aac" -> "aac";
+            case "video/mp4" -> "mp4";
+            case "text/x-vcard" -> "vcf";
+            case PLAIN_TEXT, LONG_TEXT -> "txt";
+            case OCTET_STREAM -> "bin";
+            default -> null;
+        });
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
index 9dcee1fb..659a8c67 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
@@ -4,41 +4,102 @@ import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.PinLockMissingException;
 import org.asamk.signal.manager.api.PinLockedException;
+import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 import org.asamk.signal.manager.helper.PinHelper;
-import org.whispersystems.signalservice.api.KbsPinData;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
-import org.whispersystems.signalservice.internal.ServiceResponse;
+import org.whispersystems.signalservice.api.push.exceptions.ChallengeRequiredException;
+import org.whispersystems.signalservice.api.push.exceptions.NoSuchSessionException;
+import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.signalservice.api.push.exceptions.TokenNotAcceptedException;
+import org.whispersystems.signalservice.api.registration.RegistrationApi;
 import org.whispersystems.signalservice.internal.push.LockedException;
-import org.whispersystems.signalservice.internal.push.RequestVerificationCodeResponse;
+import org.whispersystems.signalservice.internal.push.PushServiceSocket.VerificationCodeTransport;
+import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse;
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
 
 import java.io.IOException;
-import java.util.Optional;
+import java.util.Locale;
+import java.util.function.Consumer;
 
 public class NumberVerificationUtils {
 
-    public static void requestVerificationCode(
-            SignalServiceAccountManager accountManager, String captcha, boolean voiceVerification
-    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException {
-        captcha = captcha == null ? null : captcha.replace("signalcaptcha://", "");
+    private static final Logger logger = LoggerFactory.getLogger(NumberVerificationUtils.class);
 
-        final ServiceResponse<RequestVerificationCodeResponse> response;
-        if (voiceVerification) {
-            response = accountManager.requestVoiceVerificationCode(Utils.getDefaultLocale(null),
-                    Optional.ofNullable(captcha),
-                    Optional.empty(),
-                    Optional.empty());
-        } else {
-            response = accountManager.requestSmsVerificationCode(false,
-                    Optional.ofNullable(captcha),
-                    Optional.empty(),
-                    Optional.empty());
-        }
+    public static String handleVerificationSession(
+            RegistrationApi registrationApi,
+            String sessionId,
+            Consumer<String> sessionIdSaver,
+            boolean voiceVerification,
+            String captcha
+    ) throws CaptchaRequiredException, IOException, RateLimitException, VerificationMethodNotAvailableException {
+        RegistrationSessionMetadataResponse sessionResponse;
         try {
-            handleResponseException(response);
-        } catch (org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException e) {
+            sessionResponse = getValidSession(registrationApi, sessionId);
+        } catch (ChallengeRequiredException e) {
+            if (captcha != null) {
+                sessionResponse = submitCaptcha(registrationApi, sessionId, captcha);
+            } else {
+                throw new CaptchaRequiredException("Captcha Required");
+            }
+        }
+
+        sessionId = sessionResponse.getMetadata().getId();
+        sessionIdSaver.accept(sessionId);
+
+        if (sessionResponse.getMetadata().getVerified()) {
+            return sessionId;
+        }
+
+        if (sessionResponse.getMetadata().getAllowedToRequestCode()) {
+            return sessionId;
+        }
+
+        final var nextAttempt = voiceVerification
+                ? sessionResponse.getMetadata().getNextCall()
+                : sessionResponse.getMetadata().getNextSms();
+        if (nextAttempt == null) {
+            throw new VerificationMethodNotAvailableException();
+        } else if (nextAttempt > 0) {
+            final var timestamp = sessionResponse.getClientReceivedAtMilliseconds() + nextAttempt * 1000;
+            throw new RateLimitException(timestamp);
+        }
+
+        final var nextVerificationAttempt = sessionResponse.getMetadata().getNextVerificationAttempt();
+        if (nextVerificationAttempt != null && nextVerificationAttempt > 0) {
+            final var timestamp = sessionResponse.getClientReceivedAtMilliseconds() + nextVerificationAttempt * 1000;
+            throw new CaptchaRequiredException(timestamp);
+        }
+
+        if (sessionResponse.getMetadata().getRequestedInformation().contains("captcha")) {
+            if (captcha != null) {
+                sessionResponse = submitCaptcha(registrationApi, sessionId, captcha);
+            }
+            if (!sessionResponse.getMetadata().getAllowedToRequestCode()) {
+                throw new CaptchaRequiredException("Captcha Required");
+            }
+        }
+
+        return sessionId;
+    }
+
+    public static void requestVerificationCode(
+            RegistrationApi registrationApi,
+            String sessionId,
+            boolean voiceVerification
+    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException {
+        final var locale = Utils.getDefaultLocale(Locale.US);
+        final var response = registrationApi.requestSmsVerificationCode(sessionId,
+                locale,
+                false,
+                voiceVerification ? VerificationCodeTransport.VOICE : VerificationCodeTransport.SMS);
+        try {
+            Utils.handleResponseException(response);
+        } catch (ChallengeRequiredException e) {
             throw new CaptchaRequiredException(e.getMessage(), e);
         } catch (org.whispersystems.signalservice.api.push.exceptions.NonNormalizedPhoneNumberException e) {
             throw new NonNormalizedPhoneNumberException("Phone number is not normalized ("
@@ -49,11 +110,15 @@ public class NumberVerificationUtils {
     }
 
     public static Pair<VerifyAccountResponse, MasterKey> verifyNumber(
-            String verificationCode, String pin, PinHelper pinHelper, Verifier verifier
-    ) throws IOException, PinLockedException, IncorrectPinException {
+            String sessionId,
+            String verificationCode,
+            String pin,
+            PinHelper pinHelper,
+            Verifier verifier
+    ) throws IOException, PinLockedException, IncorrectPinException, PinLockMissingException {
         verificationCode = verificationCode.replace("-", "");
         try {
-            final var response = verifyAccountWithCode(verificationCode, null, verifier);
+            final var response = verifier.verify(sessionId, verificationCode, null);
 
             return new Pair<>(response, null);
         } catch (LockedException e) {
@@ -61,16 +126,15 @@ public class NumberVerificationUtils {
                 throw new PinLockedException(e.getTimeRemaining());
             }
 
-            KbsPinData registrationLockData;
-            registrationLockData = pinHelper.getRegistrationLockData(pin, e);
+            final var registrationLockData = pinHelper.getRegistrationLockData(pin, e);
             if (registrationLockData == null) {
-                throw e;
+                throw new PinLockMissingException();
             }
 
             var registrationLock = registrationLockData.getMasterKey().deriveRegistrationLock();
             VerifyAccountResponse response;
             try {
-                response = verifyAccountWithCode(verificationCode, registrationLock, verifier);
+                response = verifier.verify(sessionId, verificationCode, registrationLock);
             } catch (LockedException _e) {
                 throw new AssertionError("KBS Pin appeared to matched but reg lock still failed!");
             }
@@ -79,29 +143,58 @@ public class NumberVerificationUtils {
         }
     }
 
-    private static VerifyAccountResponse verifyAccountWithCode(
-            final String verificationCode, final String registrationLock, final Verifier verifier
+    private static RegistrationSessionMetadataResponse validateSession(
+            final RegistrationApi registrationApi,
+            final String sessionId
     ) throws IOException {
-        final var response = verifier.verify(verificationCode, registrationLock);
-        handleResponseException(response);
-        return response.getResult().get();
+        if (sessionId == null || sessionId.isEmpty()) {
+            throw new NoSuchSessionException();
+        }
+        return Utils.handleResponseException(registrationApi.getRegistrationSessionStatus(sessionId));
     }
 
-    private static void handleResponseException(final ServiceResponse<?> response) throws IOException {
-        final var throwableOptional = response.getExecutionError().or(response::getApplicationError);
-        if (throwableOptional.isPresent()) {
-            if (throwableOptional.get() instanceof IOException) {
-                throw (IOException) throwableOptional.get();
-            } else {
-                throw new IOException(throwableOptional.get());
+    private static RegistrationSessionMetadataResponse requestValidSession(
+            final RegistrationApi registrationApi
+    ) throws IOException {
+        return Utils.handleResponseException(registrationApi.createRegistrationSession(null, "", ""));
+    }
+
+    private static RegistrationSessionMetadataResponse getValidSession(
+            final RegistrationApi registrationApi,
+            final String sessionId
+    ) throws IOException {
+        try {
+            return validateSession(registrationApi, sessionId);
+        } catch (NoSuchSessionException e) {
+            logger.debug("No registration session, creating new one.");
+            return requestValidSession(registrationApi);
+        }
+    }
+
+    private static RegistrationSessionMetadataResponse submitCaptcha(
+            RegistrationApi registrationApi,
+            String sessionId,
+            String captcha
+    ) throws IOException, CaptchaRequiredException {
+        captcha = captcha == null ? null : captcha.replace("signalcaptcha://", "");
+        try {
+            return Utils.handleResponseException(registrationApi.submitCaptchaToken(sessionId, captcha));
+        } catch (ChallengeRequiredException | TokenNotAcceptedException _e) {
+            throw new CaptchaRequiredException("Captcha not accepted");
+        } catch (NonSuccessfulResponseCodeException e) {
+            if (e.code == 400) {
+                throw new CaptchaRequiredException("Captcha has invalid format");
             }
+            throw e;
         }
     }
 
     public interface Verifier {
 
-        ServiceResponse<VerifyAccountResponse> verify(
-                String verificationCode, String registrationLock
-        );
+        VerifyAccountResponse verify(
+                String sessionId,
+                String verificationCode,
+                String registrationLock
+        ) throws IOException;
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
index 6c34d9c9..fd8e46ef 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
@@ -1,31 +1,30 @@
 package org.asamk.signal.manager.util;
 
-import com.google.protobuf.ByteString;
-
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.ecc.ECPrivateKey;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.internal.push.PaymentAddress;
+
+import okio.ByteString;
 
 public class PaymentUtils {
 
+    private static final Logger logger = LoggerFactory.getLogger(PaymentUtils.class);
+
     private PaymentUtils() {
     }
 
     /**
      * Signs the supplied address bytes with the {@link IdentityKeyPair}'s private key and returns a proto that includes it, and it's signature.
      */
-    public static SignalServiceProtos.PaymentAddress signPaymentsAddress(
-            byte[] publicAddressBytes, ECPrivateKey privateKey
-    ) {
+    public static PaymentAddress signPaymentsAddress(byte[] publicAddressBytes, ECPrivateKey privateKey) {
         byte[] signature = privateKey.calculateSignature(publicAddressBytes);
 
-        return SignalServiceProtos.PaymentAddress.newBuilder()
-                .setMobileCoinAddress(SignalServiceProtos.PaymentAddress.MobileCoinAddress.newBuilder()
-                        .setAddress(ByteString.copyFrom(publicAddressBytes))
-                        .setSignature(ByteString.copyFrom(signature)))
-                .build();
+        return new PaymentAddress.Builder().mobileCoin(new PaymentAddress.MobileCoin.Builder().publicAddress(ByteString.of(
+                publicAddressBytes)).signature(ByteString.of(signature)).build()).build();
     }
 
     /**
@@ -33,17 +32,20 @@ public class PaymentUtils {
      * <p>
      * Returns the validated bytes if so, otherwise returns null.
      */
-    public static byte[] verifyPaymentsAddress(
-            SignalServiceProtos.PaymentAddress paymentAddress, ECPublicKey publicKey
-    ) {
-        if (!paymentAddress.hasMobileCoinAddress()) {
+    public static byte[] verifyPaymentsAddress(PaymentAddress paymentAddress, ECPublicKey publicKey) {
+        final var mobileCoinAddress = paymentAddress.mobileCoin;
+        if (mobileCoinAddress == null
+                || mobileCoinAddress.publicAddress == null
+                || mobileCoinAddress.signature == null) {
+            logger.debug("Got payment address without mobile coin address, ignoring.");
             return null;
         }
 
-        byte[] bytes = paymentAddress.getMobileCoinAddress().getAddress().toByteArray();
-        byte[] signature = paymentAddress.getMobileCoinAddress().getSignature().toByteArray();
+        byte[] bytes = mobileCoinAddress.publicAddress.toByteArray();
+        byte[] signature = mobileCoinAddress.signature.toByteArray();
 
         if (signature.length != 64 || !publicKey.verifySignature(bytes, signature)) {
+            logger.debug("Got mobile coin address with invalid signature, ignoring.");
             return null;
         }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/PhoneNumberFormatter.java b/lib/src/main/java/org/asamk/signal/manager/util/PhoneNumberFormatter.java
new file mode 100644
index 00000000..cc0c6503
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/util/PhoneNumberFormatter.java
@@ -0,0 +1,59 @@
+package org.asamk.signal.manager.util;
+
+import com.google.i18n.phonenumbers.NumberParseException;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+
+import org.asamk.signal.manager.api.InvalidNumberException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PhoneNumberFormatter {
+
+    private static final Logger logger = LoggerFactory.getLogger(PhoneNumberFormatter.class);
+
+    private static String impreciseFormatNumber(String number, String localNumber) {
+        number = number.replaceAll("[^0-9+]", "");
+
+        if (number.charAt(0) == '+') return number;
+
+        if (localNumber.charAt(0) == '+') localNumber = localNumber.substring(1);
+
+        if (localNumber.length() == number.length() || number.length() > localNumber.length()) return "+" + number;
+
+        int difference = localNumber.length() - number.length();
+
+        return "+" + localNumber.substring(0, difference) + number;
+    }
+
+    public static String formatNumber(String number, String localNumber) throws InvalidNumberException {
+        if (number == null) {
+            throw new InvalidNumberException("Null String passed as number.");
+        }
+
+        if (number.contains("@")) {
+            throw new InvalidNumberException("Possible attempt to use email address.");
+        }
+
+        number = number.replaceAll("[^0-9+]", "");
+
+        if (number.isEmpty()) {
+            throw new InvalidNumberException("No valid characters found.");
+        }
+
+        try {
+            PhoneNumberUtil util = PhoneNumberUtil.getInstance();
+            PhoneNumber localNumberObject = util.parse(localNumber, null);
+
+            String localCountryCode = util.getRegionCodeForNumber(localNumberObject);
+            logger.trace("Got local CC: {}", localCountryCode);
+
+            PhoneNumber numberObject = util.parse(number, localCountryCode);
+            return util.format(numberObject, PhoneNumberFormat.E164);
+        } catch (NumberParseException e) {
+            logger.debug("{}: {}", e.getClass().getSimpleName(), e.getMessage());
+            return impreciseFormatNumber(number, localNumber);
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/PinHashing.java b/lib/src/main/java/org/asamk/signal/manager/util/PinHashing.java
deleted file mode 100644
index 5dc5a5bc..00000000
--- a/lib/src/main/java/org/asamk/signal/manager/util/PinHashing.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.asamk.signal.manager.util;
-
-import org.bouncycastle.crypto.generators.Argon2BytesGenerator;
-import org.bouncycastle.crypto.params.Argon2Parameters;
-import org.whispersystems.signalservice.api.KeyBackupService;
-import org.whispersystems.signalservice.api.kbs.HashedPin;
-import org.whispersystems.signalservice.internal.registrationpin.PinHasher;
-
-public final class PinHashing {
-
-    private PinHashing() {
-    }
-
-    public static HashedPin hashPin(String pin, KeyBackupService.HashSession hashSession) {
-        final var params = new Argon2Parameters.Builder(Argon2Parameters.ARGON2_id).withParallelism(1)
-                .withIterations(32)
-                .withVersion(Argon2Parameters.ARGON2_VERSION_13)
-                .withMemoryAsKB(16 * 1024)
-                .withSalt(hashSession.hashSalt())
-                .build();
-
-        final var generator = new Argon2BytesGenerator();
-        generator.init(params);
-
-        return PinHasher.hashPin(PinHasher.normalize(pin), password -> {
-            var output = new byte[64];
-            generator.generateBytes(password, output);
-            return output;
-        });
-    }
-}
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
index e202f70a..0b5b418a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
@@ -1,9 +1,8 @@
 package org.asamk.signal.manager.util;
 
-import com.google.protobuf.InvalidProtocolBufferException;
-
 import org.asamk.signal.manager.api.Pair;
-import org.asamk.signal.manager.storage.recipients.Profile;
+import org.asamk.signal.manager.api.PhoneNumberSharingMode;
+import org.asamk.signal.manager.api.Profile;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
@@ -13,32 +12,35 @@ import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException;
 import org.whispersystems.signalservice.api.crypto.ProfileCipher;
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+import org.whispersystems.signalservice.internal.push.PaymentAddress;
 
 import java.io.IOException;
 import java.util.Base64;
 import java.util.HashSet;
+import java.util.Optional;
 
 public class ProfileUtils {
 
-    private final static Logger logger = LoggerFactory.getLogger(ProfileUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(ProfileUtils.class);
 
-    public static Profile decryptProfile(
-            final ProfileKey profileKey, final SignalServiceProfile encryptedProfile
-    ) {
+    public static Profile decryptProfile(final ProfileKey profileKey, final SignalServiceProfile encryptedProfile) {
         var profileCipher = new ProfileCipher(profileKey);
         IdentityKey identityKey = null;
         try {
             identityKey = new IdentityKey(Base64.getDecoder().decode(encryptedProfile.getIdentityKey()), 0);
-        } catch (InvalidKeyException ignored) {
+        } catch (InvalidKeyException e) {
+            logger.debug("Failed to decode identity key in profile, can't verify payment address", e);
         }
 
         try {
-            var name = decrypt(encryptedProfile.getName(), profileCipher);
-            var about = trimZeros(decrypt(encryptedProfile.getAbout(), profileCipher));
-            var aboutEmoji = trimZeros(decrypt(encryptedProfile.getAboutEmoji(), profileCipher));
+            var name = decryptString(encryptedProfile.getName(), profileCipher);
+            var about = decryptString(encryptedProfile.getAbout(), profileCipher);
+            var aboutEmoji = decryptString(encryptedProfile.getAboutEmoji(), profileCipher);
 
             final var nameParts = splitName(name);
+            final var remotePhoneNumberSharing = decryptBoolean(encryptedProfile.getPhoneNumberSharing(),
+                    profileCipher).map(v -> v ? PhoneNumberSharingMode.EVERYBODY : PhoneNumberSharingMode.NOBODY)
+                    .orElse(null);
             return new Profile(System.currentTimeMillis(),
                     nameParts.first(),
                     nameParts.second(),
@@ -51,7 +53,8 @@ public class ProfileUtils {
                                     profileCipher,
                                     identityKey.getPublicKey()),
                     getUnidentifiedAccessMode(encryptedProfile, profileCipher),
-                    getCapabilities(encryptedProfile));
+                    getCapabilities(encryptedProfile),
+                    remotePhoneNumberSharing);
         } catch (InvalidCiphertextException e) {
             logger.debug("Failed to decrypt profile for {}", encryptedProfile.getServiceId(), e);
             return null;
@@ -59,7 +62,8 @@ public class ProfileUtils {
     }
 
     public static Profile.UnidentifiedAccessMode getUnidentifiedAccessMode(
-            final SignalServiceProfile encryptedProfile, final ProfileCipher profileCipher
+            final SignalServiceProfile encryptedProfile,
+            final ProfileCipher profileCipher
     ) {
         if (encryptedProfile.isUnrestrictedUnidentifiedAccess()) {
             return Profile.UnidentifiedAccessMode.UNRESTRICTED;
@@ -77,48 +81,58 @@ public class ProfileUtils {
 
     public static HashSet<Profile.Capability> getCapabilities(final SignalServiceProfile encryptedProfile) {
         final var capabilities = new HashSet<Profile.Capability>();
-        if (encryptedProfile.getCapabilities().isGv1Migration()) {
-            capabilities.add(Profile.Capability.gv1Migration);
-        }
         if (encryptedProfile.getCapabilities().isStorage()) {
             capabilities.add(Profile.Capability.storage);
         }
-        if (encryptedProfile.getCapabilities().isSenderKey()) {
-            capabilities.add(Profile.Capability.senderKey);
-        }
-        if (encryptedProfile.getCapabilities().isAnnouncementGroup()) {
-            capabilities.add(Profile.Capability.announcementGroup);
+        if (encryptedProfile.getCapabilities().isStorageServiceEncryptionV2()) {
+            capabilities.add(Profile.Capability.storageServiceEncryptionV2Capability);
         }
 
         return capabilities;
     }
 
-    private static String decrypt(
-            final String encryptedName, final ProfileCipher profileCipher
+    private static String decryptString(
+            final String encrypted,
+            final ProfileCipher profileCipher
     ) throws InvalidCiphertextException {
         try {
-            return encryptedName == null
-                    ? null
-                    : new String(profileCipher.decrypt(Base64.getDecoder().decode(encryptedName)));
+            return encrypted == null ? null : profileCipher.decryptString(Base64.getDecoder().decode(encrypted));
         } catch (IllegalArgumentException e) {
             return null;
         }
     }
 
+    private static Optional<Boolean> decryptBoolean(
+            final String encrypted,
+            final ProfileCipher profileCipher
+    ) throws InvalidCiphertextException {
+        try {
+            return encrypted == null
+                    ? Optional.empty()
+                    : profileCipher.decryptBoolean(Base64.getDecoder().decode(encrypted));
+        } catch (IllegalArgumentException e) {
+            return Optional.empty();
+        }
+    }
+
     private static byte[] decryptAndVerifyMobileCoinAddress(
-            final byte[] encryptedPaymentAddress, final ProfileCipher profileCipher, final ECPublicKey publicKey
+            final byte[] encryptedPaymentAddress,
+            final ProfileCipher profileCipher,
+            final ECPublicKey publicKey
     ) throws InvalidCiphertextException {
         byte[] decrypted;
         try {
             decrypted = profileCipher.decryptWithLength(encryptedPaymentAddress);
         } catch (IOException e) {
+            logger.debug("Failed to decrypt payment address", e);
             return null;
         }
 
-        SignalServiceProtos.PaymentAddress paymentAddress;
+        PaymentAddress paymentAddress;
         try {
-            paymentAddress = SignalServiceProtos.PaymentAddress.parseFrom(decrypted);
-        } catch (InvalidProtocolBufferException e) {
+            paymentAddress = PaymentAddress.ADAPTER.decode(decrypted);
+        } catch (IOException e) {
+            logger.debug("Failed to parse payment address", e);
             return null;
         }
 
@@ -137,13 +151,4 @@ public class ProfileUtils {
             default -> new Pair<>(parts[0], parts[1]);
         };
     }
-
-    static String trimZeros(String str) {
-        if (str == null) {
-            return null;
-        }
-
-        int pos = str.indexOf(0);
-        return pos == -1 ? str : str.substring(0, pos);
-    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java
index f3825cc4..d017f0a5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java
@@ -12,7 +12,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Optional;
 import java.util.zip.ZipFile;
@@ -101,7 +100,9 @@ public class StickerUtils {
     }
 
     private static Pair<InputStream, Long> getInputStreamAndLength(
-            final String rootPath, final ZipFile zip, final String subfile
+            final String rootPath,
+            final ZipFile zip,
+            final String subfile
     ) throws IOException {
         if (zip != null) {
             final var entry = zip.getEntry(subfile);
@@ -113,16 +114,18 @@ public class StickerUtils {
     }
 
     private static String getContentType(
-            final String rootPath, final ZipFile zip, final String subfile
+            final String rootPath,
+            final ZipFile zip,
+            final String subfile
     ) throws IOException {
         if (zip != null) {
             final var entry = zip.getEntry(subfile);
             try (InputStream bufferedStream = new BufferedInputStream(zip.getInputStream(entry))) {
-                return URLConnection.guessContentTypeFromStream(bufferedStream);
+                return MimeUtils.getStreamMimeType(bufferedStream).orElse(null);
             }
         } else {
             final var file = new File(rootPath, subfile);
-            return Utils.getFileMimeType(file, null);
+            return MimeUtils.getFileMimeType(file).orElse(null);
         }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
index 3fc69801..daee1d77 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -1,82 +1,106 @@
 package org.asamk.signal.manager.util;
 
+import org.asamk.signal.manager.api.Pair;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.fingerprint.Fingerprint;
 import org.signal.libsignal.protocol.fingerprint.NumericFingerprintGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.NetworkResult;
+import org.whispersystems.signalservice.api.NetworkResultUtil;
+import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.util.StreamDetails;
 
-import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URLConnection;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Spliterator;
 import java.util.Spliterators;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
+import okio.ByteString;
+
 public class Utils {
 
-    private final static Logger logger = LoggerFactory.getLogger(Utils.class);
+    private static final Logger logger = LoggerFactory.getLogger(Utils.class);
 
-    public static String getFileMimeType(File file, String defaultMimeType) throws IOException {
-        var mime = Files.probeContentType(file.toPath());
-        if (mime == null) {
-            try (InputStream bufferedStream = new BufferedInputStream(new FileInputStream(file))) {
-                mime = URLConnection.guessContentTypeFromStream(bufferedStream);
-            }
-        }
-        if (mime == null) {
-            return defaultMimeType;
-        }
-        return mime;
+    public static Pair<StreamDetails, Optional<String>> createStreamDetailsFromDataURI(final String dataURI) {
+        final DataURI uri = DataURI.of(dataURI);
+
+        return new Pair<>(new StreamDetails(new ByteArrayInputStream(uri.data()), uri.mediaType(), uri.data().length),
+                Optional.ofNullable(uri.parameter().get("filename")));
     }
 
-    public static StreamDetails createStreamDetailsFromFile(File file) throws IOException {
-        InputStream stream = new FileInputStream(file);
+    public static StreamDetails createStreamDetailsFromFile(final File file) throws IOException {
+        final InputStream stream = new FileInputStream(file);
         final var size = file.length();
-        final var mime = getFileMimeType(file, "application/octet-stream");
+        final var mime = MimeUtils.getFileMimeType(file).orElse(MimeUtils.OCTET_STREAM);
         return new StreamDetails(stream, mime, size);
     }
 
-    public static Fingerprint computeSafetyNumber(
-            boolean isUuidCapable,
-            SignalServiceAddress ownAddress,
+    public static Pair<StreamDetails, Optional<String>> createStreamDetails(final String value) throws IOException {
+        try {
+            return createStreamDetailsFromDataURI(value);
+        } catch (final IllegalArgumentException e) {
+            final File f = new File(value);
+
+            return new Pair<>(createStreamDetailsFromFile(f), Optional.of(f.getName()));
+        }
+    }
+
+    public static Fingerprint computeSafetyNumberForNumber(
+            String ownNumber,
             IdentityKey ownIdentityKey,
-            SignalServiceAddress theirAddress,
+            String theirNumber,
             IdentityKey theirIdentityKey
     ) {
-        int version;
-        byte[] ownId;
-        byte[] theirId;
+        // Version 1: E164 user
+        final var version = 1;
+        final var ownId = ownNumber.getBytes(StandardCharsets.UTF_8);
+        final var theirId = theirNumber.getBytes(StandardCharsets.UTF_8);
 
-        if (isUuidCapable) {
-            // Version 2: UUID user
-            version = 2;
-            ownId = ownAddress.getServiceId().toByteArray();
-            theirId = theirAddress.getServiceId().toByteArray();
-        } else {
-            // Version 1: E164 user
-            version = 1;
-            if (ownAddress.getNumber().isEmpty() || theirAddress.getNumber().isEmpty()) {
-                return null;
-            }
-            ownId = ownAddress.getNumber().get().getBytes();
-            theirId = theirAddress.getNumber().get().getBytes();
-        }
+        return getFingerprint(version, ownId, ownIdentityKey, theirId, theirIdentityKey);
+    }
 
+    public static Fingerprint computeSafetyNumberForUuid(
+            ServiceId ownServiceId,
+            IdentityKey ownIdentityKey,
+            ServiceId theirServiceId,
+            IdentityKey theirIdentityKey
+    ) {
+        // Version 2: UUID user
+        final var version = 2;
+        final var ownId = ownServiceId.toByteArray();
+        final var theirId = theirServiceId.toByteArray();
+
+        return getFingerprint(version, ownId, ownIdentityKey, theirId, theirIdentityKey);
+    }
+
+    private static Fingerprint getFingerprint(
+            final int version,
+            final byte[] ownId,
+            final IdentityKey ownIdentityKey,
+            final byte[] theirId,
+            final IdentityKey theirIdentityKey
+    ) {
         return new NumericFingerprintGenerator(5200).createFor(version,
                 ownId,
                 ownIdentityKey,
@@ -87,15 +111,18 @@ public class Utils {
     public static Locale getDefaultLocale(Locale fallback) {
         final var locale = Locale.getDefault();
         if (locale == null) {
+            logger.debug("No default locale found, using fallback: {}", fallback);
             return fallback;
         }
+        final var localeString = locale.getLanguage() + "-" + locale.getCountry();
         try {
-            Locale.LanguageRange.parse(locale.getLanguage() + "-" + locale.getCountry());
+            Locale.LanguageRange.parse(localeString);
         } catch (IllegalArgumentException e) {
-            logger.debug("Invalid locale, ignoring: {}", locale);
+            logger.debug("Invalid locale '{}', using fallback: {}", locale, fallback);
             return fallback;
         }
 
+        logger.trace("Using default locale: {} ({})", locale, localeString);
         return locale;
     }
 
@@ -111,15 +138,80 @@ public class Utils {
         }, leftStream.isParallel() || rightStream.isParallel());
     }
 
+    public static <OK, NK, V> Map<NK, V> mapKeys(Map<OK, V> map, Function<OK, NK> keyMapper) {
+        return map.entrySet().stream().collect(Collectors.toMap(e -> keyMapper.apply(e.getKey()), Map.Entry::getValue));
+    }
+
     public static Map<String, String> getQueryMap(String query) {
         var params = query.split("&");
         var map = new HashMap<String, String>();
         for (var param : params) {
             final var paramParts = param.split("=");
             var name = URLDecoder.decode(paramParts[0], StandardCharsets.UTF_8);
-            var value = URLDecoder.decode(paramParts[1], StandardCharsets.UTF_8);
+            var value = paramParts.length == 1 ? null : URLDecoder.decode(paramParts[1], StandardCharsets.UTF_8);
             map.put(name, value);
         }
         return map;
     }
+
+    public static <T> T handleResponseException(final NetworkResult<T> response) throws IOException {
+        return NetworkResultUtil.toBasicLegacy(response);
+    }
+
+    public static ByteString firstNonEmpty(ByteString... strings) {
+        for (final var s : strings) {
+            if (s.size() > 0) {
+                return s;
+            }
+        }
+        return ByteString.EMPTY;
+    }
+
+    @SafeVarargs
+    public static <T> List<T> firstNonEmpty(List<T>... values) {
+        for (final var s : values) {
+            if (!s.isEmpty()) {
+                return s;
+            }
+        }
+        return List.of();
+    }
+
+    public static String firstNonEmpty(String... strings) {
+        for (final var s : strings) {
+            if (!s.isEmpty()) {
+                return s;
+            }
+        }
+        return "";
+    }
+
+    @SafeVarargs
+    public static <T> T firstNonNull(T... values) {
+        for (final var v : values) {
+            if (v != null) {
+                return v;
+            }
+        }
+        return null;
+    }
+
+    public static String nullIfEmpty(String string) {
+        return string == null || string.isEmpty() ? null : string;
+    }
+
+    public static Proxy getHttpsProxy() {
+        final URI uri;
+        try {
+            uri = new URI("https://example");
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+        final var proxies = ProxySelector.getDefault().select(uri);
+        if (proxies.isEmpty()) {
+            return Proxy.NO_PROXY;
+        } else {
+            return proxies.getFirst();
+        }
+    }
 }
diff --git a/lib/src/main/resources/org/asamk/signal/manager/config/ias.store b/lib/src/main/resources/org/asamk/signal/manager/config/ias.store
deleted file mode 100644
index e0b8ec8c..00000000
Binary files a/lib/src/main/resources/org/asamk/signal/manager/config/ias.store and /dev/null differ
diff --git a/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java b/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
new file mode 100644
index 00000000..f2f427c1
--- /dev/null
+++ b/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
@@ -0,0 +1,259 @@
+package org.asamk.signal.manager.storage.recipients;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class MergeRecipientHelperTest {
+
+    static final ACI ACI_A = ACI.from(UUID.randomUUID());
+    static final ACI ACI_B = ACI.from(UUID.randomUUID());
+    static final PNI PNI_A = PNI.from(UUID.randomUUID());
+    static final PNI PNI_B = PNI.from(UUID.randomUUID());
+    static final String NUMBER_A = "+AAA";
+    static final String NUMBER_B = "+BBB";
+    static final String USERNAME_A = "USER.1";
+    static final String USERNAME_B = "USER.2";
+
+    static final PartialAddresses ADDR_A = new PartialAddresses(ACI_A, PNI_A, NUMBER_A, USERNAME_A);
+    static final PartialAddresses ADDR_B = new PartialAddresses(ACI_B, PNI_B, NUMBER_B, USERNAME_B);
+
+    static final T[] testInstancesNone = new T[]{
+            new T(Set.of(), ADDR_A.FULL, Set.of(rec(1000000, ADDR_A.FULL))),
+            new T(Set.of(), ADDR_A.ACI_NUM, Set.of(rec(1000000, ADDR_A.ACI_NUM))),
+            new T(Set.of(), ADDR_A.ACI_PNI, Set.of(rec(1000000, ADDR_A.ACI_PNI))),
+            new T(Set.of(), ADDR_A.PNI_NUM, Set.of(rec(1000000, ADDR_A.PNI_NUM))),
+            new T(Set.of(), ADDR_A.ACI_USERNAME, Set.of(rec(1000000, ADDR_A.ACI_USERNAME))),
+            new T(Set.of(), ADDR_A.FULL_USERNAME, Set.of(rec(1000000, ADDR_A.FULL_USERNAME))),
+    };
+
+    static final T[] testInstancesSingle = new T[]{
+            new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.FULL_USERNAME)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL_USERNAME))),
+            new T(Set.of(rec(1, ADDR_A.ACI)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.PNI)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI_NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.PNI_NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI_PNI)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+
+            new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.ACI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.PNI), rec(1000000, ADDR_A.ACI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.NUM)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.ACI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.ACI_NUM)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.ACI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI_NUM)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI_PNI)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.FULL))),
+
+            new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.ACI), rec(1000000, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.NUM)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.ACI_NUM)),
+                    ADDR_A.PNI_NUM,
+                    Set.of(rec(1, ADDR_A.ACI), rec(1000000, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI_NUM)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.ACI_PNI)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.FULL))),
+
+            new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.ACI_PNI))),
+            new T(Set.of(rec(1, ADDR_A.PNI)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.ACI_PNI))),
+            new T(Set.of(rec(1, ADDR_A.NUM)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.NUM), rec(1000000, ADDR_A.ACI_PNI))),
+            new T(Set.of(rec(1, ADDR_A.ACI_NUM)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.PNI_NUM)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI_PNI)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.ACI_PNI))),
+
+            new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_B.FULL, Set.of(rec(1, ADDR_A.FULL), rec(1000000, ADDR_B.FULL))),
+
+            new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_A.ACI_USERNAME, Set.of(rec(1, ADDR_A.FULL_USERNAME))),
+            new T(Set.of(rec(1, ADDR_A.ACI)), ADDR_A.ACI_USERNAME, Set.of(rec(1, ADDR_A.ACI_USERNAME))),
+            new T(Set.of(rec(1, ADDR_A.ACI_NUM)), ADDR_A.ACI_USERNAME, Set.of(rec(1, ADDR_A.ACI_NUM_USERNAME))),
+    };
+
+    static final T[] testInstancesTwo = new T[]{
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.ACI_NUM)), ADDR_A.FULL, Set.of(rec(2, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.NUM), rec(2, ADDR_A.ACI_PNI)), ADDR_A.FULL, Set.of(rec(2, ADDR_A.FULL))),
+
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.NUM)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.ACI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.NUM), rec(2, ADDR_A.ACI_PNI)), ADDR_A.ACI_NUM, Set.of(rec(2, ADDR_A.FULL))),
+
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM)),
+                    ADDR_A.PNI_NUM,
+                    Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.NUM)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.ACI_NUM)),
+                    ADDR_A.PNI_NUM,
+                    Set.of(rec(1, ADDR_A.PNI_NUM), rec(2, ADDR_A.ACI))),
+            new T(Set.of(rec(1, ADDR_A.NUM), rec(2, ADDR_A.ACI_PNI)), ADDR_A.PNI_NUM, Set.of(rec(2, ADDR_A.FULL))),
+
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.ACI_PNI))),
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.ACI_NUM)), ADDR_A.ACI_PNI, Set.of(rec(2, ADDR_A.FULL))),
+    };
+
+    static final T[] testInstancesThree = new T[]{
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI), rec(3, ADDR_A.NUM)),
+                    ADDR_A.FULL,
+                    Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_B.PNI.withOtherIdentifiersFrom(ADDR_A.ACI)),
+                    rec(2, ADDR_A.PNI),
+                    rec(3, ADDR_A.NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_B.NUM.withOtherIdentifiersFrom(ADDR_A.ACI)),
+                    rec(2, ADDR_A.PNI),
+                    rec(3, ADDR_A.NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI),
+                    rec(2, ADDR_A.PNI),
+                    rec(3, ADDR_B.ACI.withOtherIdentifiersFrom(ADDR_A.NUM))),
+                    ADDR_A.FULL,
+                    Set.of(rec(1, ADDR_A.FULL), rec(3, ADDR_B.ACI))),
+            new T(Set.of(rec(1, ADDR_A.ACI),
+                    rec(2, ADDR_B.ACI.withOtherIdentifiersFrom(ADDR_A.PNI)),
+                    rec(3, ADDR_A.NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL), rec(2, ADDR_B.ACI))),
+    };
+
+    @ParameterizedTest
+    @MethodSource
+    void resolveRecipientTrustedLocked_NoneExisting(T test) throws Exception {
+        final var testStore = new TestStore(test.input);
+        MergeRecipientHelper.resolveRecipientTrustedLocked(testStore, test.request);
+        assertEquals(test.output, testStore.getRecipients());
+    }
+
+    private static Stream<Arguments> resolveRecipientTrustedLocked_NoneExisting() {
+        return Arrays.stream(testInstancesNone).map(Arguments::of);
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void resolveRecipientTrustedLocked_SingleExisting(T test) throws Exception {
+        final var testStore = new TestStore(test.input);
+        MergeRecipientHelper.resolveRecipientTrustedLocked(testStore, test.request);
+        assertEquals(test.output, testStore.getRecipients());
+    }
+
+    private static Stream<Arguments> resolveRecipientTrustedLocked_SingleExisting() {
+        return Arrays.stream(testInstancesSingle).map(Arguments::of);
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void resolveRecipientTrustedLocked_TwoExisting(T test) throws Exception {
+        final var testStore = new TestStore(test.input);
+        MergeRecipientHelper.resolveRecipientTrustedLocked(testStore, test.request);
+        assertEquals(test.output, testStore.getRecipients());
+    }
+
+    private static Stream<Arguments> resolveRecipientTrustedLocked_TwoExisting() {
+        return Arrays.stream(testInstancesTwo).map(Arguments::of);
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void resolveRecipientTrustedLocked_ThreeExisting(T test) throws Exception {
+        final var testStore = new TestStore(test.input);
+        MergeRecipientHelper.resolveRecipientTrustedLocked(testStore, test.request);
+        assertEquals(test.output, testStore.getRecipients());
+    }
+
+    private static Stream<Arguments> resolveRecipientTrustedLocked_ThreeExisting() {
+        return Arrays.stream(testInstancesThree).map(Arguments::of);
+    }
+
+    private static RecipientWithAddress rec(long recipientId, RecipientAddress address) {
+        return new RecipientWithAddress(new RecipientId(recipientId, null), address);
+    }
+
+    record T(
+            Set<RecipientWithAddress> input, RecipientAddress request, Set<RecipientWithAddress> output
+    ) {
+
+        @Override
+        public String toString() {
+            return "T{#input=%s, request=%s_%s_%s, #output=%s}".formatted(input.size(),
+                    request.aci().isPresent() ? "ACI" : "",
+                    request.pni().isPresent() ? "PNI" : "",
+                    request.number().isPresent() ? "NUM" : "",
+                    output.size());
+        }
+    }
+
+    static class TestStore implements MergeRecipientHelper.Store {
+
+        final Set<RecipientWithAddress> recipients;
+        long nextRecipientId = 1000000;
+
+        TestStore(final Set<RecipientWithAddress> recipients) {
+            this.recipients = new HashSet<>(recipients);
+        }
+
+        public Set<RecipientWithAddress> getRecipients() {
+            return recipients;
+        }
+
+        @Override
+        public Set<RecipientWithAddress> findAllByAddress(final RecipientAddress address) {
+            return recipients.stream().filter(r -> r.address().matches(address)).collect(Collectors.toSet());
+        }
+
+        @Override
+        public RecipientId addNewRecipient(final RecipientAddress address) {
+            final var recipientId = new RecipientId(nextRecipientId++, null);
+            recipients.add(new RecipientWithAddress(recipientId, address));
+            return recipientId;
+        }
+
+        @Override
+        public void updateRecipientAddress(final RecipientId recipientId, final RecipientAddress address) {
+            recipients.removeIf(r -> r.id().equals(recipientId));
+            recipients.add(new RecipientWithAddress(recipientId, address));
+        }
+
+        @Override
+        public void removeRecipientAddress(final RecipientId recipientId) {
+            recipients.removeIf(r -> r.id().equals(recipientId));
+        }
+    }
+
+    private record PartialAddresses(
+            RecipientAddress FULL,
+            RecipientAddress FULL_USERNAME,
+            RecipientAddress ACI,
+            RecipientAddress PNI,
+            RecipientAddress NUM,
+            RecipientAddress ACI_NUM,
+            RecipientAddress ACI_NUM_USERNAME,
+            RecipientAddress PNI_NUM,
+            RecipientAddress ACI_PNI,
+            RecipientAddress ACI_USERNAME
+    ) {
+
+        PartialAddresses(ACI aci, PNI pni, String number, String username) {
+            this(new RecipientAddress(aci, pni, number),
+                    new RecipientAddress(aci, pni, number, username),
+                    new RecipientAddress(aci, null, null),
+                    new RecipientAddress(null, pni, null),
+                    new RecipientAddress(null, null, number),
+                    new RecipientAddress(aci, null, number),
+                    new RecipientAddress(aci, null, number, username),
+                    new RecipientAddress(null, pni, number),
+                    new RecipientAddress(aci, pni, null),
+                    new RecipientAddress(aci, null, null, username));
+        }
+    }
+}
diff --git a/man/Makefile b/man/Makefile
index 55d27fd3..e3aca110 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,4 +1,6 @@
 A2X = a2x
+MKDIR = mkdir
+GZIP = gzip
 
 MANPAGESRC = signal-cli.1 signal-cli-dbus.5 signal-cli-jsonrpc.5
 
@@ -8,3 +10,13 @@ all: $(MANPAGESRC)
 %: %.adoc
 	@echo "Generating manpage for $@"
 	$(A2X) --no-xmllint --doctype manpage --format manpage "$^"
+
+.PHONY: install
+install: all
+	$(MKDIR) -p man1 man5
+	for f in *.1; do $(GZIP) < "$$f" > man1/"$$f".gz ; done
+	for f in *.5; do $(GZIP) < "$$f" > man5/"$$f".gz ; done
+
+.PHONY: clean
+clean:
+	rm -rf *.1 *.5 man1 man5
diff --git a/man/signal-cli-dbus.5.adoc b/man/signal-cli-dbus.5.adoc
index 2a83e50c..732efe43 100644
--- a/man/signal-cli-dbus.5.adoc
+++ b/man/signal-cli-dbus.5.adoc
@@ -5,6 +5,7 @@ vim:set ts=4 sw=4 tw=82 noet:
 :quotes.~:
 
 = signal-cli-dbus (5)
+:doctype: manpage
 
 == Name
 
@@ -67,9 +68,10 @@ This can be piped to a QR encoder to create a display that can be captured by a
 
 For example:
 
-```
+[source,bash]
+----
 dbus-send --session --dest=org.asamk.Signal --type=method_call --print-reply /org/asamk/Signal org.asamk.Signal.link string:"My secondary client" | tr '\n' '\0' | sed 's/.*string //g' | sed 's/\"//g' | qrencode -s10 -tANSI256
-```
+----
 
 listAccounts() -> accountList<as>::
 * accountList : Array of all attached accounts in DBus object path form
@@ -202,6 +204,15 @@ Depending on the type of the recipient(s) field this sends a reaction to one or
 
 Exceptions: Failure, InvalidNumber
 
+sendPaymentNotification(receipt<ay>, note<s>, recipient<s>) -> timestamp<x>::
+* receipt : Byte array with the payment receipt blob
+* note : String with a note for the payment
+* recipient : String with the phone number of a single recipient
+
+* timestamp : Long, can be used to identify the corresponding Signal reply
+
+Exceptions: Failure
+
 sendNoteToSelfMessage(message<s>, attachments<as>) -> timestamp<x>::
 * message : Text to send (can be UTF8)
 * attachments : String array of filenames to send as attachments (passed as filename, so need to be readable by the user signal-cli is running under)
@@ -406,6 +417,24 @@ Only works if sent from a secondary device.
 
 Exceptions: Failure
 
+==== Identity related methods
+
+listIdentities() -> identities<a(oss)>::
+* identities : Array of structs (objectPath, id, name)
+** objectPath : DBusPath representing the identity object path
+** uuid : Internal uuid of the identity
+** number : Phone number of the identity
+
+Lists all know identities
+
+getIdentity(Number<s>) -> identityPath<o>::
+* Number : Phone number
+* identityPath : DBusPath object for the identity
+
+Gets the identity Dbus path for a given phone number
+
+Exceptions: Failure
+
 === Signal.Group interface
 
 The following methods listen to the group's object path, which can be obtained from the listGroups() method and is constructed as follows:
@@ -453,6 +482,7 @@ addMembers(recipients<as>) -> <>::
 * recipients : String array of phone numbers
 
 Add recipients to group if they are pending members; otherwise add recipients to list of requesting members.
+This command is also used to accept group invitations by adding yourself to a group.
 
 Exceptions: Failure
 
@@ -520,6 +550,44 @@ removeDevice() -> <>::
 
 Exceptions: Failure
 
+=== Signal.Identity interface
+
+The following methods listen to the Identities object path, which is constructed as follows:
+
+<ACCOUNT_PATH> + "/Identities/" + identity
+
+identity : Either the phone number of a contact with underscore (_) replacing plus (+) , or if not known its uuid
+
+Identities have the following (case-sensitive) properties:
+
+* Number<s> (read-only) : Phone number of the contact
+* Uuid<x> (read-only) : Internal uuid representing the contact
+* Fingerprint<x> (read-only) : Byte array representing the fingerprint
+* SafetyNumber<s> (read-only) : String representation of the safety number used to verify trust
+* TrustLevel<s> (read-only) : Current trust level (UNSTRUSTED, TRUSTED_UNVERIFIED, TRUSTED_VERIFIED)
+* AddedDate<x> (read-only) : Long representing the number of milliseconds since the Unix epoch
+* ScannableSafetyNumber<x> (read-only) : Byte array representation of the safety number
+
+To get a property, use (replacing `--session` with `--system` if needed):
+`dbus-send --session --dest=org.asamk.Signal --print-reply $OBJECT_PATH org.freedesktop.DBus.Properties.Get string:org.asamk.Signal.Identity string:$PROPERTY_NAME`
+
+To get all properties, use:
+`dbus-send --session --dest=org.asamk.Signal --print-reply $OBJECT_PATH org.freedesktop.DBus.Properties.GetAll string:org.asamk.Signal.Identity`
+
+trust() -> <>::
+
+Establish trust with the given identity.
+TrustLevel will become TRUSTED_UNVERFIED
+
+Exceptions: Failure
+
+trustVerified(SafetyNumber<s>) -> <>::
+
+Establish trust with the given identity using their safety number.
+TrustLevel will become TRUSTED_VERIFIED
+
+Exceptions: Failure
+
 === Signal.Configuration interface
 
 The configuration's object path, which exists only for primary devices, is constructed as follows:
diff --git a/man/signal-cli-jsonrpc.5.adoc b/man/signal-cli-jsonrpc.5.adoc
index f0b62ca9..7f4aeeb3 100644
--- a/man/signal-cli-jsonrpc.5.adoc
+++ b/man/signal-cli-jsonrpc.5.adoc
@@ -5,6 +5,7 @@ vim:set ts=4 sw=4 tw=82 noet:
 :quotes.~:
 
 = signal-cli-jsonrpc (5)
+:doctype: manpage
 
 == Name
 
@@ -12,7 +13,7 @@ signal-cli-jsonrpc - A commandline and dbus interface for the Signal messenger
 
 == Synopsis
 
-*signal-cli* [--verbose] [--config CONFIG] [-a ACCOUNT] daemon [--socket] [--tcp]
+*signal-cli* [--verbose] [--config CONFIG] [-a ACCOUNT] daemon [--socket[=SOCKET_PATH]] [--tcp[=HOST:PORT]] [--http[=HOST:PORT]]
 
 *signal-cli* [--verbose] [--config CONFIG] [-a ACCOUNT] jsonRpc
 
@@ -25,16 +26,22 @@ signal-cli provides a JSON-RPC based API with the `jsonRpc` and `daemon` command
 - `jsonRpc` command accepts input on STDIN and responds on STDOUT.
 This is intended to make it easier to embed signal-cli in other applications.
 
-  `signal-cli -a _ACCOUNT_ jsonRpc`
+  `signal-cli -a _ACCOUNT_ jsonRpc` or for multi-account mode `signal-cli jsonRpc`
 
-- `daemon` command provides a UNIX or TCP socket and can handle requests from multiple clients.
+- `daemon` command provides a UNIX, TCP socket or HTTP endpoint and can handle requests from multiple clients.
 
   `signal-cli -a _ACCOUNT_ daemon --socket` or for multi-account mode `signal-cli daemon --socket`
 
+With `--http` signal-cli exposes three endpoints;
+
+* POST /api/v1/rpc : Expects a single or batch JSON-RPC request
+* GET /api/v1/events : Returns a Server-Sent Events (SSE) stream of incoming messages
+* GET /api/v1/check : Responds with 200 OK if daemon is running
+
 == Basic usage
 
 In JSON-RPC mode, signal-cli will read requests from stdin.
-Every requests must be a JSON object in a single line.
+Every request must be a JSON object in a single line.
 Requests must have a unique "id" value to be able to match the response to the corresponding request.
 
 Example:
@@ -47,15 +54,26 @@ From the command line:
 
 `echo '{"jsonrpc":"2.0","method":"listGroups","id":"my special mark"}' | signal-cli -u +33123456789 jsonRpc`
 
-Like in dbus daemon mode, messages are automatically received in jsonRpc mode.
+Like in dbus daemon mode, messages are automatically received in jsonRpc mode (`--receive-mode=on-start`).
 Incoming messages are sent as JSON-RPC notifications.
 
 Example:
 
 `{"jsonrpc":"2.0","method":"receive","params":{"envelope":{"source":"+33123456789","sourceNumber":"+33123456789","sourceUuid":"uuid","sourceName":"name","sourceDevice":1,"timestamp":1631458508784,"dataMessage":{"timestamp":1631458508784,"message":"foobar","expiresInSeconds":0,"viewOnce":false,"mentions":[],"attachments":[],"contacts":[]}}}}`
 
-=== Multi-account daemon mode
-When the daemon command is started without an account parameter (-a), signal-cli will provide all local accounts and additional commands to register and link new accounts.
+In order to not miss messages, automatic receiving of messages can be disabled with the `--receive-mode=manual` parameter.
+
+REQUEST: `{"jsonrpc":"2.0","id":"id","method":"subscribeReceive"}`
+
+RESPONSE: `{"jsonrpc":"2.0","result":0,"id":"id"}`
+
+Messages are then sent similar to the automatic mode, but wrapped in a subscription response object:
+
+`{"jsonrpc":"2.0","method":"receive","params":{"subscription":0,"result":{"envelope":{"source":"+33123456789","sourceNumber":"+33123456789","sourceUuid":"uuid","sourceName":"name","sourceDevice":2,"timestamp":1693064367769,"syncMessage":{"sentMessage":{"destination":"+33123456789","destinationNumber":"+33123456789","destinationUuid":"uuid","timestamp":1693064367769,"message":"j","expiresInSeconds":0,"viewOnce":false}}},"account":"+33123456789"}}}`
+
+=== Multi-account mode
+
+When the daemon/jsonRpc command is started without an account parameter (-a), signal-cli will provide all local accounts and additional commands to register (`register`) and link (`startLink`, `finishLink`) new accounts.
 
 In multi-account mode, requests for a single account require an additional `account` param.
 
@@ -78,10 +96,10 @@ The `method` field is the command name and the parameters can be sent as the `pa
 
 === Additional JSON-RPC commands
 
-For receiving message additional commands are provided in JSON-RPC mode with `--receive-mode=manual`.
-
 ==== subscribeReceive
 
+For receiving message with `--receive-mode=manual` parameter.
+
 Tells the daemon to start receiving messages, returns the subscription id as a single integer value in the result.
 
 ==== unsubscribeReceive
@@ -92,17 +110,51 @@ Params:
 
 - `subscription`: the subscription id returned by `subscribeReceive`
 
+==== startLink
+
+Starts the provisioning for a new linked account.
+Responds with a URI that can be used with the `addDevice` signal-cli command or encoded as a QR-code and scanned with a mobile phone.
+The URI is only valid for a short amount of time.
+
+REQUEST: `{"jsonrpc":"2.0","method":"startLink","id":"5"}`
+
+RESPONSE: `{"jsonrpc":"2.0","result":{"deviceLinkUri":"sgnl://linkdevice?uuid=X&pub_key=X"},"id":"5"}`
+
+==== finishLink
+
+Finish provisioning of a new linked account.
+Can be called immediately after `startLink`, it will wait for a response from the primary device.
+
+Params:
+
+- `deviceLinkUri`: the URI returned by `startLink`
+- `deviceName`: (optional) the name for the new linked device
+
+REQUEST: `{"jsonrpc":"2.0","method":"finishLink","id":"6","params":{"deviceLinkUri":"sgnl://linkdevice?uuid=X&pub_key=X","deviceName":"new-name"}}`
+
+RESPONSE: `{"jsonrpc":"2.0","result":{"deviceLinkUri":"sgnl://linkdevice?uuid=X&pub_key=X"},"id":"6"}`
+
 == Examples
 
-REQUEST: `{"jsonrpc":"2.0","method":"listGroups","id":"5"}` RESPONSE: `{"jsonrpc":"2.0","result":[...],"id":"5"}`
+REQUEST: `{"jsonrpc":"2.0","method":"listGroups","id":"5"}`
 
-REQUEST: `{"jsonrpc":"2.0","method":"send","params":{"recipient":["+YYY"],"message":"MESSAGE"},"id":4}` RESPONSE: `{"jsonrpc":"2.0","result":{"timestamp":999},"id":4}`
+RESPONSE: `{"jsonrpc":"2.0","result":[...],"id":"5"}`
 
-REQUEST: `{"jsonrpc":"2.0","method":"updateGroup","params":{"groupId":"GROUP_ID=","name":"new group name","members":["+ZZZ"],"link":"enabledWithApproval","setPermissionEditDetails":"only-admins"},"id":"someId"}` RESPONSE: `{"jsonrpc":"2.0","result":{"timestamp":9999},"id":"someId"}`
+REQUEST: `{"jsonrpc":"2.0","method":"send","params":{"recipient":["+YYY"],"message":"MESSAGE"},"id":4}`
 
-REQUEST: `{"jsonrpc":"2.0","method":"sendSyncRequest","id":9}` RESPONSE: `{"jsonrpc":"2.0","result":{},"id":9}`
+RESPONSE: `{"jsonrpc":"2.0","result":{"timestamp":999},"id":4}`
 
-REQUEST: `{"jsonrpc":"2.0"}` RESPONSE: `{"jsonrpc":"2.0","error":{"code":-32600,"message":"method field must be set","data":null},"id":null}`
+REQUEST: `{"jsonrpc":"2.0","method":"updateGroup","params":{"groupId":"GROUP_ID=","name":"new group name","members":["+ZZZ"],"link":"enabledWithApproval","setPermissionEditDetails":"only-admins"},"id":"someId"}`
+
+RESPONSE: `{"jsonrpc":"2.0","result":{"timestamp":9999},"id":"someId"}`
+
+REQUEST: `{"jsonrpc":"2.0","method":"sendSyncRequest","id":9}`
+
+RESPONSE: `{"jsonrpc":"2.0","result":{},"id":9}`
+
+REQUEST: `{"jsonrpc":"2.0"}`
+
+RESPONSE: `{"jsonrpc":"2.0","error":{"code":-32600,"message":"method field must be set","data":null},"id":null}`
 
 == Authors
 
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 6258243a..73286aac 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -5,6 +5,7 @@ vim:set ts=4 sw=4 tw=82 noet:
 :quotes.~:
 
 = signal-cli (1)
+:doctype: manpage
 
 == Name
 
@@ -22,25 +23,40 @@ For registering you need a phone number where you can receive SMS or incoming ca
 signal-cli was primarily developed to be used on servers to notify admins of important events.
 For this use-case, it has a dbus and a JSON-RPC interface, that can be used to send messages from other programs.
 
+Originally the Signal protocol only allowed sending messages to other phone numbers.
+Now with the introduction of phone number privacy, the phone number of a recipient is not always known.
+Only the recipient's ServiceId, ACI/PNI (a special UUID) is known.
+
+In all places where a RECIPIENT argument is expected in signal-cli's interface, one of the following can be used:
+
+- The phone number
+- The ACI, just a UUID
+- The PNI, just a UUID, with "PNI:" prefix
+- The username, with "u:" prefix, e.g. "u:test.000"
+
 For some functionality the Signal protocol requires that all messages have been received from the server.
 The `receive` command should be regularly executed.
-In daemon mode messages are continuously received.
+In daemon mode messages are by default continuously received.
 
 == Options
 
 *-h*, *--help*::
 Show help message and quit.
 
-*-v*, *--version*::
+*--version*::
 Print the version and quit.
 
-*--verbose*::
+*-v*, *--verbose*::
 Raise log level and include lib signal logs.
 
 *--log-file* LOG_FILE::
 Write log output to the given file.
 If `--verbose` is also given, the detailed logs will only be written to the log file.
 
+*--scrub-log*::
+Scrub possibly sensitive information from the log, like phone numbers and UUIDs.
+Doesn't work reliably on dbus logs with very verbose logging (`-vvv`)
+
 *--config* CONFIG::
 Set the path, where to store the config.
 Make sure you have full read/write access to the given directory.
@@ -66,6 +82,9 @@ Make request via user dbus.
 *--dbus-system*::
 Make request via system dbus.
 
+*--bus-name*::
+Connect to another D-Bus bus name than the default.
+
 *-o* OUTPUT-MODE, *--output* OUTPUT-MODE::
 Specify if you want commands to output in either "plain-text" mode or in "json".
 Defaults to "plain-text"
@@ -76,6 +95,9 @@ Choose when to trust new identities:
 - `always`: Trust any new identity key without verification
 - `never`: Don't trust any unknown identity key, every key must be verified manually
 
+*--disable-send-log*::
+Disable message send log (for resending messages that recipient couldn't decrypt).
+
 == Commands
 
 === register
@@ -89,12 +111,16 @@ If the account was deleted (with --delete-account) it cannot be reactivated.
 
 *-v*, *--voice*::
 The verification should be done over voice, not SMS.
+Voice verification only works if an SMS verification has been attempted before.
 
-*--captcha*::
+*--captcha* CAPTCHA::
 The captcha token, required if registration failed with a captcha required error.
 To get the token, go to https://signalcaptchas.org/registration/generate.html
 For the staging environment, use: https://signalcaptchas.org/staging/registration/generate.html
-Check the developer tools for a redirect starting with signalcaptcha:// Everything after signalcaptcha:// is the captcha token.
+After solving the captcha, right-click on the "Open Signal" link and copy the link.
+
+*--reregister*::
+Register even if account is already registered.
 
 === verify
 
@@ -139,6 +165,55 @@ Can fix problems with receiving messages.
 *-n* NAME, *--device-name* NAME::
 Set a new device name for the primary or linked device
 
+*-u* NAME *--username* NAME::
+Specify a username that can then be used to contact this account.
+This can either be just the nickname (e.g. test) or the complete username with discriminator (e.g. test.000).
+Returns the new username with discriminator and the username link.
+
+*--delete-username*::
+Delete the username associated with this account.
+
+*--unrestricted-unidentified-sender* {true,false}::
+Enable if anyone should be able to send you unidentified sender messages.
+
+*--discoverable-by-number* {true,false}::
+Enable/disable if the account should be discoverable by phone number
+
+*--number-sharing* {true,false}::
+Indicates if Signal should share its phone number when sending a message.
+
+=== startChangeNumber
+
+Change an account to a new phone number with SMS or voice verification.
+Use the finishChangeNumber command to complete the verification.
+
+RECIPIENT::
+The new phone number.
+
+*-v*, *--voice*::
+The verification should be done over voice, not SMS.
+Voice verification only works if an SMS verification has been attempted before.
+
+*--captcha*::
+The captcha token, required if registration failed with a captcha required error.
+To get the token, go to https://signalcaptchas.org/registration/generate.html
+For the staging environment, use: https://signalcaptchas.org/staging/registration/generate.html
+After solving the captcha, right-click on the "Open Signal" link and copy the link.
+
+=== finishChangeNumber
+
+Verify the number using the code received via SMS or voice.
+
+RECIPIENT::
+The new phone number.
+
+*-v*, *--verification-code*::
+The verification code.
+
+*-p* PIN, *--pin* PIN::
+The registration lock PIN, that was set by the user.
+Only required if a PIN was set.
+
 === updateConfiguration
 
 Update signal configs and sync them to linked devices.
@@ -158,7 +233,7 @@ Indicates if Signal should generate link previews.
 
 === setPin
 
-Set a registration lock pin, to prevent others from registering this number.
+Set a registration lock pin, to prevent others from registering your account's phone number.
 
 REGISTRATION_LOCK_PIN::
 The registration lock PIN, that will be required for new registrations (resets after 7 days of inactivity)
@@ -185,7 +260,7 @@ Only works, if this is the primary device.
 
 *--uri* URI::
 Specify the uri contained in the QR code shown by the new device.
-You will need the full URI such as "sgnl://linkdevice?uuid=..." (formerly "tsdevice:/?uuid=...") Make sure to enclose it in quotation marks for shells.
+You will need the full URI such as "sgnl://linkdevice?uuid=...&pub_key=..." (formerly "tsdevice:/?uuid=...") Make sure to enclose it in quotation marks for shells.
 
 === listDevices
 
@@ -202,19 +277,22 @@ Use listDevices to see the deviceIds.
 
 === getUserStatus
 
-Uses a list of phone numbers to determine the statuses of those users.
+Uses a list of phone numbers or usernames to determine the statuses of those users.
 Shows if they are registered on the Signal Servers or not.
 In json mode this is outputted as a list of objects.
 
-[NUMBER [NUMBER ...]]::
+[RECIPIENT [RECIPIENT ...]]::
 One or more numbers to check.
 
+[--username [USERNAME ...]]::
+One or more usernames to check.
+
 === send
 
 Send a message to another user or group.
 
 RECIPIENT::
-Specify the recipients’ phone number.
+Specify the recipients.
 
 *--note-to-self*::
 Send the message to self without notification.
@@ -222,15 +300,26 @@ Send the message to self without notification.
 *-g* GROUP, *--group-id* GROUP::
 Specify the recipient group ID in base64 encoding.
 
+*-u* USERNAME, *--username* USERNAME::
+Specify the recipient username or username link.
+
 *-m* MESSAGE, *--message* MESSAGE::
 Specify the message.
-Currently, signal-cli reads the message from stdin if `-m` is missing, but this will change in a future version and the explicit flag `--message-from-stdin` should be used instead.
 
 *--message-from-stdin*::
 Read the message from standard input.
 
 *-a* [ATTACHMENT [ATTACHMENT ...]], *--attachment* [ATTACHMENT [ATTACHMENT ...]]::
 Add one or more files as attachment.
+Can be either a file path or a data URI.
+Data URI encoded attachments must follow the RFC 2397.
+Additionally a file name can be added:
+e.g.: `data:<MIME-TYPE>;filename=<FILENAME>;base64,<BASE64 ENCODED DATA>`
+
+*--view-once*::
+Send the message as a view once message.
+A conformant client will only allow the receiver to view the message once.
+View Once is only supported for messages that include an image attachment.
 
 *--sticker* STICKER::
 Send a sticker of a locally known sticker pack (syntax: stickerPackId:stickerId).
@@ -239,13 +328,22 @@ e.g.: `--sticker 00abac3bc18d7f599bff2325dc306d43:2`
 
 *--mention*::
 Mention another group member (syntax: start:length:recipientNumber) In the apps the mention replaces part of the message text, which is specified by the start and length values.
+The units of start and length should be UTF-16 code units, NOT Unicode code points.
+For more information, see https://github.com/AsamK/signal-cli/wiki/FAQ#string-indexing-units
 e.g.: `-m "Hi X!" --mention "3:1:+123456789"`
 
+*--text-style*::
+Style parts of the message text (syntax: start:length:STYLE).
+Like `--mention`, the units are UTF-16 code units.
+Where STYLE is one of: BOLD, ITALIC, SPOILER, STRIKETHROUGH, MONOSPACE
+
+e.g.: `-m "Something BIG!" --text-style "10:3:BOLD"` or for a mixed text style `-m "Something BIG!" --text-style "0:9:ITALIC" "10:3:BOLD"`
+
 *--quote-timestamp*::
 Specify the timestamp of a previous message with the recipient or group to add a quote to the new message.
 
 *--quote-author*::
-Specify the number of the author of the original message.
+Specify the author of the original message.
 
 *--quote-message*::
 Specify the message of the original message.
@@ -253,10 +351,15 @@ Specify the message of the original message.
 *--quote-mention*::
 Specify the mentions of the original message (same format as `--mention`).
 
+*--quote-text-style*::
+Style parts of the original message text (same format as `--text-style`).
+
+*--quote-attachment*::
+Specify the attachments of the original message (syntax: contentType[:filename[:previewFile]]), e.g. 'audio/aac' or 'image/png:test.png:/tmp/preview.jpg'.
+
 *--preview-url*::
 Specify the url for the link preview.
-The same url must also appear in the message body, otherwise the preview won't be
-displayed by the apps.
+The same url must also appear in the message body, otherwise the preview won't be displayed by the apps.
 
 *--preview-title*::
 Specify the title for the link preview (mandatory).
@@ -267,15 +370,40 @@ Specify the description for the link preview (optional).
 *--preview-image*::
 Specify the image file for the link preview (optional).
 
+*--story-timestamp*::
+Specify the timestamp of a story to reply to.
+
+*--story-author*::
+Specify the author of the story.
+
 *-e*, *--end-session*::
 Clear session state and send end session message.
 
+*--edit-timestamp*::
+Specify the timestamp of a previous message with the recipient or group to send an edited message.
+
+=== sendMessageRequestResponse
+
+Send response to a message request to linked devices.
+
+RECIPIENT::
+Specify the recipients.
+
+*-g* GROUP, *--group-id* GROUP::
+Specify the recipient group ID in base64 encoding.
+
+*-u* USERNAME, *--username* USERNAME::
+Specify the recipient username or username link.
+
+*--type* TYPE::
+Type of message request response (accept, delete)
+
 === sendPaymentNotification
 
 Send a payment notification.
 
 RECIPIENT::
-Specify the recipient’s phone number.
+Specify the recipient.
 
 *--receipt* RECEIPT::
 The base64 encoded receipt blob.
@@ -288,16 +416,19 @@ Specify a note for the payment notification.
 Send reaction to a previously received or sent message.
 
 RECIPIENT::
-Specify the recipients’ phone number.
+Specify the recipients.
 
 *-g* GROUP, *--group-id* GROUP::
 Specify the recipient group ID in base64 encoding.
 
+*-u* USERNAME, *--username* USERNAME::
+Specify the recipient username or username link.
+
 *-e* EMOJI, *--emoji* EMOJI::
 Specify the emoji, should be a single unicode grapheme cluster.
 
-*-a* NUMBER, *--target-author* NUMBER::
-Specify the number of the author of the message to which to react.
+*-a* RECIPIENT, *--target-author* RECIPIENT::
+Specify the author of the message to which to react.
 
 *-t* TIMESTAMP, *--target-timestamp* TIMESTAMP::
 Specify the timestamp of the message to which to react.
@@ -305,12 +436,15 @@ Specify the timestamp of the message to which to react.
 *-r*, *--remove*::
 Remove a reaction.
 
+*--story*::
+React to a story instead of a normal message
+
 === sendReceipt
 
 Send a read or viewed receipt to a previously received message.
 
 RECIPIENT::
-Specify the sender’s phone number.
+Specify the sender.
 
 *-t* TIMESTAMP, *--target-timestamp* TIMESTAMP::
 Specify the timestamp of the message to which to react.
@@ -324,7 +458,7 @@ Send typing message to trigger a typing indicator for the recipient.
 Indicator will be shown for 15seconds unless a typing STOP message is sent first.
 
 RECIPIENT::
-Specify the recipients’ phone number.
+Specify the recipients.
 
 *-g* GROUP, *--group-id* GROUP::
 Specify the recipient group ID in base64 encoding.
@@ -337,11 +471,14 @@ Send a typing STOP message.
 Remotely delete a previously sent message.
 
 RECIPIENT::
-Specify the recipients’ phone number.
+Specify the recipients.
 
 *-g* GROUP, *--group-id* GROUP::
 Specify the recipient group ID in base64 encoding.
 
+*-u* USERNAME, *--username* USERNAME::
+Specify the recipient username or username link.
+
 *-t* TIMESTAMP, *--target-timestamp* TIMESTAMP::
 Specify the timestamp of the message to delete.
 
@@ -354,9 +491,17 @@ In json mode this is outputted as one json object per line.
 *-t* TIMEOUT, *--timeout* TIMEOUT::
 Number of seconds to wait for new messages (negative values disable timeout).
 Default is 5 seconds.
+
+*--max-messages*::
+Maximum number of messages to receive, before returning.
+
 *--ignore-attachments*::
 Don’t download attachments of received messages.
 
+*--ignore-stories*::
+Don’t receive story messages from the server.
+
+
 *--send-read-receipts*::
 Send read receipts for all incoming data messages (in addition to the default delivery receipts)
 
@@ -452,7 +597,7 @@ Show a list of known contacts with names and profiles.
 When a specific recipient is given, its profile will be refreshed.
 
 RECIPIENT::
-Specify the recipients’ phone number.
+Specify the recipients.
 
 *-a*, *--all-recipients*::
 Include all known recipients, not only contacts.
@@ -463,21 +608,28 @@ Specify if only blocked or unblocked contacts should be shown (default: all cont
 *--name*::
 Find contacts with the given contact or profile name.
 
+*--detailed*::
+List the contacts with more details.
+If output=json, then this is always set
+
+*--internal*::
+Include internal information that's normally not user visible
+
 === listIdentities
 
 List all known identity keys and their trust status, fingerprint and safety number.
 
-*-n* NUMBER, *--number* NUMBER::
-Only show identity keys for the given phone number.
+*-n* RECIPIENT, *--number* RECIPIENT::
+Only show identity keys for the given recipient.
 
 === trust
 
-Set the trust level of a given number.
-The first time a key for a number is seen, it is trusted by default (TOFU).
+Set the trust level of a given recipient.
+The first time a key for a recipient is seen, it is trusted by default (TOFU).
 If the key changes, the new key must be trusted manually.
 
-number::
-Specify the phone number, for which to set the trust.
+RECIPIENT::
+Specify the recipient, for which to set the trust.
 
 *-a*, *--trust-all-known-keys*::
 Trust all known keys of this user, only use this for testing.
@@ -510,23 +662,32 @@ Path to the new avatar image file.
 *--remove-avatar*::
 Remove the avatar
 
-*--mobile-coin-address*::
+*--mobile-coin-address*, **--mobilecoin-address**::
 New MobileCoin address (Base64 encoded public address)
 
 === updateContact
 
-Update the info associated to a number on our contact list.
+Update the info associated to a recipient on our contact list.
 This change is only local but can be synchronized to other devices by using `sendContacts` (see below).
 If the contact doesn't exist yet, it will be added.
 
-NUMBER::
-Specify the contact phone number.
+RECIPIENT::
+Specify the recipient.
 
-*--given-name* NAME, *--name* NAME::
-New (given) name.
+*--given-name* GIVEN_NAME, *--name* NAME::
+New system given name.
 
 *--family-name* FAMILY_NAME::
-New family name.
+New system family name.
+
+*--nick-given-name* NICK_GIVEN_NAME::
+New nick given name.
+
+*--nick-family-name* NICK_FAMILY_NAME::
+New nick family name.
+
+*--note* NOTE::
+New note.
 
 *-e*, *--expiration* EXPIRATION_SECONDS::
 Set expiration time of messages (seconds).
@@ -536,8 +697,11 @@ To disable expiration set expiration time to 0.
 
 Remove the info of a given contact
 
-NUMBER::
-Specify the contact phone number.
+RECIPIENT::
+Specify the recipient.
+
+*--hide*::
+Hide the contact in the contact list, but keep the data.
 
 *--forget*::
 Delete all data associated with this contact, including identity keys and sessions.
@@ -547,8 +711,8 @@ Delete all data associated with this contact, including identity keys and sessio
 Block the given contacts or groups (no messages will be received).
 This change is only local but can be synchronized to other devices by using `sendContacts` (see below).
 
-[CONTACT [CONTACT ...]]::
-Specify the phone numbers of contacts that should be blocked.
+[RECIPIENT [RECIPIENT ...]]::
+Specify the contacts that should be blocked.
 
 *-g* [GROUP [GROUP ...]], *--group-id* [GROUP [GROUP ...]]::
 Specify the group IDs that should be blocked in base64 encoding.
@@ -558,8 +722,8 @@ Specify the group IDs that should be blocked in base64 encoding.
 Unblock the given contacts or groups (messages will be received again).
 This change is only local but can be synchronized to other devices by using `sendContacts` (see below).
 
-[CONTACT [CONTACT ...]]::
-Specify the phone numbers of contacts that should be unblocked.
+[RECIPIENT [RECIPIENT ...]]::
+Specify the contacts that should be unblocked.
 
 *-g* [GROUP [GROUP ...]], *--group-id* [GROUP [GROUP ...]]::
 Specify the group IDs that should be unblocked in base64 encoding.
@@ -576,7 +740,7 @@ The primary device will respond with synchronization messages with full contact
 
 === uploadStickerPack
 
-Upload a new sticker pack, consisting of a manifest file and the sticker images.
+Upload a new sticker pack, consisting of a manifest file and the sticker images. +
 Images must conform to the following specification: (see https://support.signal.org/hc/en-us/articles/360031836512-Stickers#sticker_reqs )
 
 - Static stickers in PNG or WebP format
@@ -610,30 +774,95 @@ The required manifest.json has the following format:
 PATH::
 The path of the manifest.json or a zip file containing the sticker pack you wish to upload.
 
+=== listStickerPacks
+
+Show a list of known sticker packs.
+
+=== addStickerPack
+
+Install a sticker pack for this account.
+
+*--uri* [URI]::
+Specify the uri of the sticker pack.
+e.g. https://signal.art/addstickers/#pack_id=XXX&pack_key=XXX
+
+=== getAttachment
+
+Gets the raw data for a specified attachment.
+This is done using the ID of the attachment the recipient or group ID.
+The attachment data is returned as a Base64 String.
+
+*--id* [ID]::
+The ID of the attachment as given in the attachment list of the message.
+
+*--recipient* [RECIPIENT]::
+Specify the recipient which sent the attachment.
+Referred to generally as recipient.
+
+*-g* [GROUP], *--group-id* [GROUP]::
+Alternatively, specify the group IDs for which to get the attachment.
+
+=== getAvatar
+
+Gets the raw data for a specified contact, contact's profile or group avatar.
+The attachment data is returned as a Base64 String.
+
+*--contact* [RECIPIENT]::
+Specify the recipient.
+
+*--profile* [RECIPIENT]::
+Specify the recipient.
+
+*-g* [GROUP], *--group-id* [GROUP]::
+Alternatively, specify the group ID for which to get the avatar.
+
+=== getSticker
+
+Gets the raw data for a specified sticker.
+The attachment data is returned as a Base64 String.
+
+*--pack-id* [PACK_ID]::
+Specify the id of a sticker pack (hex encoded).
+
+*--sticker-id* [STICKER_ID]::
+Specify the index of a sticker in the sticker pack.
+
 === daemon
 
-signal-cli can run in daemon mode and provides an experimental dbus or JSON-RPC interface.
-If no `-a` account is given, all local accounts will be exported as separate dbus objects under the same bus name.
-
-*--dbus*::
-Export DBus interface on user bus.
-See signal-cli-dbus (5) for info on the dbus interface.
-
-*--dbus-system*::
-Export DBus interface on system bus.
-See signal-cli-dbus (5) for info on the dbus interface.
+signal-cli can run in daemon mode and provides JSON-RPC or an experimental dbus interface.
+If no `-a` account is given, all local accounts will be loaded.
+Multiple interfaces can be used at the same time, e.g. `daemon --socket --dbus`
 
 *--socket [SOCKET]*::
-Export a JSON-RPC interface on a UNIX socket (default $XDG_RUNTIME_DIR/signal-cli/socket).
-See signal-cli-jsonrpc (5) for info on the JSON-RPC interface.
+Export a JSON-RPC interface on a UNIX socket (default $XDG_RUNTIME_DIR/signal-cli/socket). +
+See **signal-cli-jsonrpc**(5) for info on the JSON-RPC interface.
 
 *--tcp [HOST:PORT]*::
-Export a JSON-RPC interface on a TCP socket (default localhost:7583).
-See signal-cli-jsonrpc (5) for info on the JSON-RPC interface.
+Export a JSON-RPC interface on a TCP socket (default localhost:7583). +
+See **signal-cli-jsonrpc**(5) for info on the JSON-RPC interface.
+
+*--http [HOST:PORT]*::
+Expose a JSON-RPC interface as http endpoint (default localhost:8080).
+The JSON-RPC endpoint is `/api/v1/rpc`. +
+See **signal-cli-jsonrpc**(5) for info on the JSON-RPC interface.
+
+*--dbus*::
+Export DBus interface on user bus. +
+See **signal-cli-dbus**(5) for info on the dbus interface.
+
+*--dbus-system*::
+Export DBus interface on system bus. +
+See **signal-cli-dbus**(5) for info on the dbus interface.
+
+*--bus-name*::
+Claim another D-Bus bus name than the default.
 
 *--ignore-attachments*::
 Don’t download attachments of received messages.
 
+*--ignore-stories*::
+Don’t receive story messages from the server.
+
 *--send-read-receipts*::
 Send read receipts for all incoming data messages (in addition to the default delivery receipts)
 
@@ -643,6 +872,36 @@ Don’t print received messages to stdout.
 *--receive-mode*::
 Specify when to start receiving messages (on-start, on-connection, manual)
 
+=== jsonRpc
+
+Run in signal-cli in JSON-RPC mode.
+Reads JSON-RPC requests on stdin and responds on stdout.
+See **signal-cli-jsonrpc**(5) for info on the JSON-RPC interface.
+
+*--ignore-attachments*::
+Don’t download attachments of received messages.
+
+*--ignore-stories*::
+Don’t receive story messages from the server.
+
+*--send-read-receipts*::
+Send read receipts for all incoming data messages (in addition to the default delivery receipts)
+
+*--receive-mode*::
+Specify when to start receiving messages (on-start, manual)
+
+=== submitRateLimitChallenge
+
+When running into rate limits, sometimes the limit can be lifted, by solving a CAPTCHA.
+To get the captcha token, go to https://signalcaptchas.org/challenge/generate.html
+For the staging environment, use: https://signalcaptchas.org/staging/registration/generate.html
+
+*--challenge* CHALLENGE_TOKEN::
+The challenge token from the failed send attempt.
+
+*--captcha* CAPTCHA::
+The captcha result, starting with signalcaptcha://
+
 == Examples
 
 Register a number (with SMS verification)::
@@ -673,10 +932,10 @@ Send a message to a group::
 signal-cli -a ACCOUNT send -m "This is a message" -g GROUP_ID
 
 Trust new key, after having verified it::
-signal-cli -a ACCOUNT trust -v SAFETY_NUMBER NUMBER
+signal-cli -a ACCOUNT trust -v SAFETY_NUMBER RECIPIENT
 
 Trust new key, without having verified it. Only use this if you don't care about security::
-signal-cli -a ACCOUNT trust -a NUMBER
+signal-cli -a ACCOUNT trust -a RECIPIENT
 
 == Exit codes
 
@@ -684,6 +943,7 @@ signal-cli -a ACCOUNT trust -a NUMBER
 * *2*: Some unexpected error
 * *3*: Server or IO error
 * *4*: Sending failed due to untrusted key
+* *5*: Server rate limiting error
 
 == Files
 
diff --git a/native.Containerfile b/native.Containerfile
new file mode 100644
index 00000000..60f89353
--- /dev/null
+++ b/native.Containerfile
@@ -0,0 +1,11 @@
+FROM docker.io/debian:testing-slim
+
+LABEL org.opencontainers.image.source=https://github.com/AsamK/signal-cli
+LABEL org.opencontainers.image.description="signal-cli provides an unofficial commandline, dbus and JSON-RPC interface for the Signal messenger."
+LABEL org.opencontainers.image.licenses=GPL-3.0-only
+
+RUN useradd signal-cli --system --create-home --home-dir /var/lib/signal-cli
+ADD build/native/nativeCompile/signal-cli /usr/bin/signal-cli
+
+USER signal-cli
+ENTRYPOINT ["/usr/bin/signal-cli", "--config=/var/lib/signal-cli"]
diff --git a/run_tests.sh b/run_tests.sh
index 94eb98d9..339d9d7b 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 if [ $# -ne 2 ]; then
   echo "Usage: $0 NUMBER_1 NUMBER_2"
   exit 1
@@ -11,8 +11,9 @@ NUMBER_2="$2"
 TEST_PIN_1=456test_pin_foo123
 NATIVE=0
 JSON_RPC=0
+TEST_REGISTER=0
 
-PATH_TEST_CONFIG="$PWD/build/test-config"
+PATH_TEST_CONFIG="$PWD/test-config"
 PATH_MAIN="$PATH_TEST_CONFIG/main"
 PATH_LINK="$PATH_TEST_CONFIG/link"
 
@@ -20,8 +21,8 @@ if [ "$NATIVE" -eq 1 ]; then
 	SIGNAL_CLI="$PWD/build/native/nativeCompile/signal-cli"
 elif [ "$JSON_RPC" -eq 1 ]; then
 	(cd client && cargo build)
-	"$PWD/build/install/signal-cli/bin/signal-cli" --verbose --verbose --trust-new-identities=always --config="$PATH_MAIN" --service-environment="staging" daemon --socket --receive-mode=manual&
-	"$PWD/build/install/signal-cli/bin/signal-cli" --verbose --verbose --trust-new-identities=always --config="$PATH_LINK" --service-environment="staging" daemon --tcp --receive-mode=manual&
+	"$PWD/build/install/signal-cli/bin/signal-cli" --verbose --verbose --trust-new-identities=always --config="$PATH_MAIN" --service-environment="staging" --log-file="$PATH_MAIN/log" daemon --socket --receive-mode=manual&
+	"$PWD/build/install/signal-cli/bin/signal-cli" --verbose --verbose --trust-new-identities=always --config="$PATH_LINK" --service-environment="staging" --log-file="$PATH_LINK/log" daemon --tcp --receive-mode=manual&
 	sleep 5
 	SIGNAL_CLI="$PWD/client/target/debug/signal-cli-client"
 else
@@ -31,7 +32,7 @@ fi
 
 run() {
   # To update graalvm config, set GRAALVM_HOME, e.g:
-  # export GRAALVM_HOME=/usr/lib/jvm/java-17-graalvm
+  # export GRAALVM_HOME=/usr/lib/jvm/java-21-graalvm
   if [ ! -z "$GRAALVM_HOME" ]; then
     export JAVA_HOME=$GRAALVM_HOME
     export SIGNAL_CLI_OPTS="-agentlib:native-image-agent=config-merge-dir=graalvm-config-dir-${SIGNAL_CLI_AGENT_ID}/"
@@ -41,7 +42,7 @@ run() {
   if [ "$JSON_RPC" -eq 1 ]; then
     "$SIGNAL_CLI" $@
   else
-    "$SIGNAL_CLI" --service-environment="staging" $@
+    "$SIGNAL_CLI" --service-environment="staging" --verbose --verbose $@
   fi
   set +x
 }
@@ -51,7 +52,7 @@ run_main() {
   if [ "$JSON_RPC" -eq 1 ]; then
     run --json-rpc-socket="$XDG_RUNTIME_DIR/signal-cli/socket" $@
   else
-    run --config="$PATH_MAIN" $@
+    run --config="$PATH_MAIN" --log-file="$PATH_MAIN/log" $@
   fi
   unset SIGNAL_CLI_AGENT_ID
 }
@@ -61,7 +62,7 @@ run_linked() {
   if [ "$JSON_RPC" -eq 1 ]; then
     run --json-rpc-tcp="127.0.0.1:7583" $@
   else
-    run --config="$PATH_LINK" $@
+    run --config="$PATH_LINK" --log-file="$PATH_LINK/log" $@
   fi
   unset SIGNAL_CLI_AGENT_ID
 }
@@ -97,16 +98,20 @@ link() {
 }
 
 run_main --version
+run_main version
 run_main --help
 
 ## Register
-register "$NUMBER_1" "$TEST_PIN_1"
-register "$NUMBER_2"
+if [ "$TEST_REGISTER" -eq 1 ]; then
+	register "$NUMBER_1" "$TEST_PIN_1"
+	register "$NUMBER_2"
+fi
 
 sleep 5
 
 run_main listAccounts
 run_main --output=json listAccounts
+run_main --scrub-log listAccounts
 
 if [ "$JSON_RPC" -eq 0 ]; then
 ## DBus
@@ -128,7 +133,7 @@ mkfifo "$FIFO_FILE"
 run_main -a "$NUMBER_1" send "$NUMBER_2" -m hi
 run_main -a "$NUMBER_2" jsonRpc < "$FIFO_FILE" &
 
-exec 3<> "$FIFO_FILE"
+exec 3> "$FIFO_FILE"
   echo '{"jsonrpc":"2.0","id":"id","method":"updateContact","params":{"recipient":"'"$NUMBER_1"'","name":"NUMBER_1","expiration":10}}' >&3
   echo '{"jsonrpc":"2.0","id":5,"method":"block","params":{"recipient":"'"$NUMBER_1"'"}}' >&3
   echo '{"jsonrpc":"2.0","id":null,"method":"unblock","params":{"recipient":"'"$NUMBER_1"'"}}' >&3
@@ -136,6 +141,7 @@ exec 3<> "$FIFO_FILE"
   echo '{"jsonrpc":"2.0","id":"id","method":"listGroups"}' >&3
   echo '{"jsonrpc":"2.0","id":"id","method":"listDevices"}' >&3
   echo '{"jsonrpc":"2.0","id":"id","method":"listIdentities"}' >&3
+  echo '{"jsonrpc":"2.0","id":"id","method":"listStickerPacks"}' >&3
   echo '{"jsonrpc":"2.0","id":"id","method":"sendSyncRequest"}' >&3
   echo '{"jsonrpc":"2.0","id":"id","method":"sendContacts"}' >&3
   echo '{"jsonrpc":"2.0","id":"id","method":"version"}' >&3
@@ -144,6 +150,7 @@ exec 3<> "$FIFO_FILE"
   echo '{"jsonrpc":"2.0","id":7,"method":"sendTyping","params":{"recipient":"'"$NUMBER_1"'"}}' >&3
   echo '{"jsonrpc":"2.0","id":7,"method":"send","params":{"recipient":"'"$NUMBER_1"'","message":"some text"}}' >&3
   echo '{"jsonrpc":"2.0","id":7,"method":"send","params":{"recipients":["'"$NUMBER_1"'","'"$NUMBER_2"'"],"message":"some other text"}}' >&3
+  echo '{"jsonrpc":"2.0","id":7,"method":"sendReaction","params":{"recipients":["'"$NUMBER_2"'"],"targetAuthor":"'"$NUMBER_1"'","emoji":"👍","targetTimestamp":4756473756}}' >&3
   echo '{"jsonrpc":"2.0","id":7,"method":"updateProfile","params":{"givenName":"n1","familyName":"n2","about":"ABA","aboutEmoji":"EMO","avatar":"LICENSE"}}' >&3
   echo '{"jsonrpc":"2.0","id":7,"method":"getUserStatus","params":{"recipient":"'"$NUMBER_1"'"}}' >&3
 
@@ -155,6 +162,7 @@ wait
 fi
 
 run_main -a "$NUMBER_1" setPin "$TEST_PIN_1"
+run_main -a "$NUMBER_1" register --reregister
 run_main -a "$NUMBER_2" removePin
 
 ## Contacts
@@ -168,6 +176,17 @@ run_main -a "$NUMBER_2" receive
 run_main -a "$NUMBER_2" send "$NUMBER_1" -m hi
 run_main -a "$NUMBER_1" receive
 run_main -a "$NUMBER_2" receive
+run_main -a "$NUMBER_1" updateAccount --discoverable-by-number=true
+run_main -a "$NUMBER_2" removeContact --forget "$NUMBER_1"
+run_main -a "$NUMBER_2" send "$NUMBER_1" -m hi
+run_main -a "$NUMBER_2" send "$NUMBER_1" -m hii
+run_main -a "$NUMBER_1" updateAccount --discoverable-by-number=false
+run_main -a "$NUMBER_1" receive
+run_main -a "$NUMBER_2" receive
+run_main -a "$NUMBER_2" send "$NUMBER_1" -m hi
+run_main -a "$NUMBER_2" send "$NUMBER_1" -m hii
+run_main -a "$NUMBER_1" receive
+run_main -a "$NUMBER_2" receive
 ## Groups
 GROUP_ID=$(run_main -a "$NUMBER_1" --output=json updateGroup -n GRUPPE -a LICENSE -m "$NUMBER_1" | jq -r '.groupId')
 run_main -a "$NUMBER_1" send "$NUMBER_2" -m first
@@ -177,22 +196,15 @@ run_main -a "$NUMBER_1" updateGroup -g "$GROUP_ID" -r "$NUMBER_2"
 run_main -a "$NUMBER_1" updateGroup -g "$GROUP_ID" -m "$NUMBER_2"
 run_main -a "$NUMBER_1" listGroups -d
 run_main -a "$NUMBER_1" --output=json listGroups -d
-run_main -a "$NUMBER_2" --verbose receive
+run_main -a "$NUMBER_2" receive
 run_main -a "$NUMBER_2" quitGroup -g "$GROUP_ID"
 run_main -a "$NUMBER_2" listGroups -d
 run_main -a "$NUMBER_2" --output=json listGroups -d
 run_main -a "$NUMBER_1" receive
 run_main -a "$NUMBER_1" updateGroup -g "$GROUP_ID" -m "$NUMBER_2"
-run_main -a "$NUMBER_1" --verbose block -g "$GROUP_ID"
-run_main -a "$NUMBER_1" --verbose unblock -g "$GROUP_ID"
-
-## Configuration
-run_main -a "$NUMBER_1" updateConfiguration --read-receipts=true
-
-## Identities
-run_main -a "$NUMBER_1" listIdentities
-run_main -a "$NUMBER_2" listIdentities
-run_main -a "$NUMBER_2" trust "$NUMBER_1" -a
+run_main -a "$NUMBER_1" block -g "$GROUP_ID"
+run_main -a "$NUMBER_1" unblock -g "$GROUP_ID"
+run_main -a "$NUMBER_1" submitRateLimitChallenge --challenge 8xxxxxx8-0xx2-4xx9-9xx2-4xxxxxxxxxx7 --captcha signalcaptcha://signal-hcaptcha.5fa.registration.P.h.-K || true
 
 ## Basic send/receive
 for OUTPUT in "plain-text" "json"; do
@@ -200,7 +212,7 @@ for OUTPUT in "plain-text" "json"; do
   run_main -a "$NUMBER_1" --output="$OUTPUT" send "$NUMBER_2" -m hi
   run_main -a "$NUMBER_2" --output="$OUTPUT" send "$NUMBER_1" -m hi
   run_main -a "$NUMBER_1" --output="$OUTPUT" send -g "$GROUP_ID" -m hi -a LICENSE --mention "1:1:$NUMBER_2"
-  TIMESTAMP=$(uname -a | run_main -a "$NUMBER_1" --output=json send "$NUMBER_2" | jq '.timestamp')
+  TIMESTAMP=$(uname -a | run_main -a "$NUMBER_1" --output=json send --message-from-stdin "$NUMBER_2" | jq '.timestamp')
   run_main -a "$NUMBER_2" --output="$OUTPUT" sendReaction "$NUMBER_1" -e 🍀 -a "$NUMBER_1" -t "$TIMESTAMP"
   run_main -a "$NUMBER_1" --output="$OUTPUT" remoteDelete "$NUMBER_2" -t "$TIMESTAMP"
   run_main -a "$NUMBER_2" --output="$OUTPUT" receive
@@ -210,7 +222,7 @@ for OUTPUT in "plain-text" "json"; do
 done
 
 ## Profile
-run_main -a "$NUMBER_1" updateProfile --given-name=GIVEN --family-name=FAMILY --about=ABOUT --about-emoji=EMOJI --avatar=LICENSE
+run_main -a "$NUMBER_1" updateProfile --given-name=GIVEN --family-name=FAMILY --about=ABOUT --about-emoji=EMOJI --avatar=LICENSE --mobile-coin-address="YWJjCg=="
 
 ## Provisioning
 link "$NUMBER_1"
@@ -219,19 +231,34 @@ run_main -a "$NUMBER_1" listDevices
 run_linked -a "$NUMBER_1" sendSyncRequest
 run_main -a "$NUMBER_1" sendContacts
 
+## Configuration
+run_main -a "$NUMBER_1" updateConfiguration --read-receipts=true
+
+## Identities
+run_main -a "$NUMBER_1" listIdentities
+run_main -a "$NUMBER_2" listIdentities
+run_main -a "$NUMBER_2" trust "$NUMBER_1" -a
+
 for OUTPUT in "plain-text" "json"; do
   run_main -a "$NUMBER_1" --output="$OUTPUT" send "$NUMBER_2" -m hi
-  run_main -a "$NUMBER_2" --output="$OUTPUT" send "$NUMBER_1" -m hi
+  run_main -a "$NUMBER_1" --output="$OUTPUT" send "$NUMBER_2" -m hi --edit-timestamp 123456677
+  run_main -a "$NUMBER_2" --output="$OUTPUT" send "$NUMBER_1" -m hi --text-style "1:1:BOLD" --quote-timestamp 12345 --quote-author "$NUMBER_1" --quote-message hitest --quote-text-style "1:1:BOLD" --preview-url "https://example.com" --preview-title preview --preview-description foo --preview-image LICENSE --story-timestamp 1234567 --story-author "$NUMBER_1"
+  run_main -a "$NUMBER_1" --output="$OUTPUT" sendPaymentNotification --receipt "YWJjCg==" --note notefoo "$NUMBER_2"
   run_main -a "$NUMBER_2" --output="$OUTPUT" receive
   run_main -a "$NUMBER_1" --output="$OUTPUT" receive
   run_linked -a "$NUMBER_1" --output="$OUTPUT" receive
 done
 
-run_main -a "$NUMBER_1" removeDevice -d 2
+run_main -a "$NUMBER_1" --output="$OUTPUT" receive
+run_main -a "$NUMBER_1" removeDevice -d 2 || true
+run_main -a "$NUMBER_1" removeDevice -d 2 || true
 
 ## Unregister
-run_main -a "$NUMBER_1" unregister
-run_main -a "$NUMBER_2" unregister --delete-account
+if [ "$TEST_REGISTER" -eq 1 ]; then
+	run_main -a "$NUMBER_1" unregister
+	run_main -a "$NUMBER_2" unregister --delete-account
+fi
+run_main -a "$NUMBER_2" deleteLocalAccountData || true
 
 if [ ! -z "$GRAALVM_HOME" ]; then
   "$GRAALVM_HOME"/lib/svm/bin/native-image-configure generate --input-dir=graalvm-config-dir/ --input-dir=graalvm-config-dir-linked/ --input-dir=graalvm-config-dir-main/ --output-dir=graalvm-config-dir//
diff --git a/settings.gradle.kts b/settings.gradle.kts
index eb34b67b..45e6390c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,2 +1,11 @@
+dependencyResolutionManagement {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+}
+
 rootProject.name = "signal-cli"
-include("lib")
+
+include("libsignal-cli")
+project(":libsignal-cli").projectDir = file("lib")
diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java
index caf55555..ac1f6d50 100644
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -27,48 +27,53 @@ public interface Signal extends DBusInterface {
     void unsubscribeReceive();
 
     long sendMessage(
-            String message, List<String> attachments, String recipient
+            String message,
+            List<String> attachments,
+            String recipient
     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.UntrustedIdentity;
 
     long sendMessage(
-            String message, List<String> attachments, List<String> recipients
+            String message,
+            List<String> attachments,
+            List<String> recipients
     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.UntrustedIdentity;
 
-    void sendTyping(
-            String recipient, boolean stop
-    ) throws Error.Failure, Error.UntrustedIdentity;
+    void sendTyping(String recipient, boolean stop) throws Error.Failure, Error.UntrustedIdentity;
 
-    void sendReadReceipt(
-            String recipient, List<Long> messageIds
-    ) throws Error.Failure, Error.UntrustedIdentity;
+    void sendReadReceipt(String recipient, List<Long> messageIds) throws Error.Failure, Error.UntrustedIdentity;
 
-    void sendViewedReceipt(
-            String recipient, List<Long> messageIds
-    ) throws Error.Failure, Error.UntrustedIdentity;
+    void sendViewedReceipt(String recipient, List<Long> messageIds) throws Error.Failure, Error.UntrustedIdentity;
+
+    long sendRemoteDeleteMessage(long targetSentTimestamp, String recipient) throws Error.Failure, Error.InvalidNumber;
 
     long sendRemoteDeleteMessage(
-            long targetSentTimestamp, String recipient
-    ) throws Error.Failure, Error.InvalidNumber;
-
-    long sendRemoteDeleteMessage(
-            long targetSentTimestamp, List<String> recipients
+            long targetSentTimestamp,
+            List<String> recipients
     ) throws Error.Failure, Error.InvalidNumber;
 
     long sendMessageReaction(
-            String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, String recipient
+            String emoji,
+            boolean remove,
+            String targetAuthor,
+            long targetSentTimestamp,
+            String recipient
     ) throws Error.InvalidNumber, Error.Failure;
 
     long sendMessageReaction(
-            String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, List<String> recipients
+            String emoji,
+            boolean remove,
+            String targetAuthor,
+            long targetSentTimestamp,
+            List<String> recipients
     ) throws Error.InvalidNumber, Error.Failure;
 
+    long sendPaymentNotification(byte[] receipt, String note, String recipient) throws Error.Failure;
+
     void sendContacts() throws Error.Failure;
 
     void sendSyncRequest() throws Error.Failure;
 
-    long sendNoteToSelfMessage(
-            String message, List<String> attachments
-    ) throws Error.AttachmentInvalid, Error.Failure;
+    long sendNoteToSelfMessage(String message, List<String> attachments) throws Error.AttachmentInvalid, Error.Failure;
 
     void sendEndSessionMessage(List<String> recipients) throws Error.Failure, Error.InvalidNumber, Error.UntrustedIdentity;
 
@@ -77,19 +82,27 @@ public interface Signal extends DBusInterface {
     void deleteContact(final String recipient) throws Error.Failure;
 
     long sendGroupMessage(
-            String message, List<String> attachments, byte[] groupId
+            String message,
+            List<String> attachments,
+            byte[] groupId
     ) throws Error.GroupNotFound, Error.Failure, Error.AttachmentInvalid, Error.InvalidGroupId;
 
     void sendGroupTyping(
-            final byte[] groupId, final boolean stop
+            final byte[] groupId,
+            final boolean stop
     ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity;
 
     long sendGroupRemoteDeleteMessage(
-            long targetSentTimestamp, byte[] groupId
+            long targetSentTimestamp,
+            byte[] groupId
     ) throws Error.Failure, Error.GroupNotFound, Error.InvalidGroupId;
 
     long sendGroupMessageReaction(
-            String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, byte[] groupId
+            String emoji,
+            boolean remove,
+            String targetAuthor,
+            long targetSentTimestamp,
+            byte[] groupId
     ) throws Error.GroupNotFound, Error.Failure, Error.InvalidNumber, Error.InvalidGroupId;
 
     String getContactName(String number) throws Error.InvalidNumber;
@@ -117,12 +130,17 @@ public interface Signal extends DBusInterface {
     List<String> getGroupMembers(byte[] groupId) throws Error.InvalidGroupId;
 
     byte[] createGroup(
-            String name, List<String> members, String avatar
+            String name,
+            List<String> members,
+            String avatar
     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber;
 
     @Deprecated
     byte[] updateGroup(
-            byte[] groupId, String name, List<String> members, String avatar
+            byte[] groupId,
+            String name,
+            List<String> members,
+            String avatar
     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.GroupNotFound, Error.InvalidGroupId;
 
     @Deprecated
@@ -136,6 +154,10 @@ public interface Signal extends DBusInterface {
 
     DBusPath getDevice(long deviceId);
 
+    DBusPath getIdentity(String number);
+
+    List<StructIdentity> listIdentities();
+
     List<StructDevice> listDevices() throws Error.Failure;
 
     DBusPath getThisDevice();
@@ -150,7 +172,11 @@ public interface Signal extends DBusInterface {
     ) throws Error.Failure;
 
     void updateProfile(
-            String name, String about, String aboutEmoji, String avatarPath, boolean removeAvatar
+            String name,
+            String about,
+            String aboutEmoji,
+            String avatarPath,
+            boolean removeAvatar
     ) throws Error.Failure;
 
     void removePin();
@@ -229,6 +255,58 @@ public interface Signal extends DBusInterface {
         }
     }
 
+    class EditMessageReceived extends DBusSignal {
+
+        private final long timestamp;
+        private final long targetSentTimestamp;
+        private final String sender;
+        private final byte[] groupId;
+        private final String message;
+        private final Map<String, Variant<?>> extras;
+
+        public EditMessageReceived(
+                String objectpath,
+                long timestamp,
+                final long targetSentTimestamp,
+                String sender,
+                byte[] groupId,
+                String message,
+                final Map<String, Variant<?>> extras
+        ) throws DBusException {
+            super(objectpath, timestamp, targetSentTimestamp, sender, groupId, message, extras);
+            this.timestamp = timestamp;
+            this.targetSentTimestamp = targetSentTimestamp;
+            this.sender = sender;
+            this.groupId = groupId;
+            this.message = message;
+            this.extras = extras;
+        }
+
+        public long getTimestamp() {
+            return timestamp;
+        }
+
+        public long getTargetSentTimestamp() {
+            return targetSentTimestamp;
+        }
+
+        public String getSender() {
+            return sender;
+        }
+
+        public byte[] getGroupId() {
+            return groupId;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        public Map<String, Variant<?>> getExtras() {
+            return extras;
+        }
+    }
+
     class MessageReceived extends DBusSignal {
 
         private final long timestamp;
@@ -439,13 +517,13 @@ public interface Signal extends DBusInterface {
     class StructDevice extends Struct {
 
         @Position(0)
-        DBusPath objectPath;
+        final DBusPath objectPath;
 
         @Position(1)
-        Long id;
+        final Long id;
 
         @Position(2)
-        String name;
+        final String name;
 
         public StructDevice(final DBusPath objectPath, final Long id, final String name) {
             this.objectPath = objectPath;
@@ -484,13 +562,13 @@ public interface Signal extends DBusInterface {
     class StructGroup extends Struct {
 
         @Position(0)
-        DBusPath objectPath;
+        final DBusPath objectPath;
 
         @Position(1)
-        byte[] id;
+        final byte[] id;
 
         @Position(2)
-        String name;
+        final String name;
 
         public StructGroup(final DBusPath objectPath, final byte[] id, final String name) {
             this.objectPath = objectPath;
@@ -549,6 +627,50 @@ public interface Signal extends DBusInterface {
         void enableLink(boolean requiresApproval) throws Error.Failure;
     }
 
+    class StructIdentity extends Struct {
+
+        @Position(0)
+        final DBusPath objectPath;
+
+        @Position(1)
+        final String uuid;
+
+        @Position(2)
+        final String number;
+
+        public StructIdentity(final DBusPath objectPath, final String uuid, final String number) {
+            this.objectPath = objectPath;
+            this.uuid = uuid;
+            this.number = number;
+        }
+
+        public DBusPath getObjectPath() {
+            return objectPath;
+        }
+
+        public String getUuid() {
+            return uuid;
+        }
+
+        public String getNumber() {
+            return number;
+        }
+    }
+
+    @DBusProperty(name = "Number", type = String.class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "Uuid", type = String.class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "Fingerprint", type = Byte[].class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "SafetyNumber", type = String.class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "TrustLevel", type = String.class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "AddedDate", type = Long.class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "ScannableSafetyNumber", type = Byte[].class, access = DBusProperty.Access.READ)
+    interface Identity extends DBusInterface, Properties {
+
+        void trust() throws Error.Failure;
+
+        void trustVerified(String safetyNumber) throws Error.Failure;
+    }
+
     interface Error {
 
         class AttachmentInvalid extends DBusExecutionException {
@@ -590,6 +712,13 @@ public interface Signal extends DBusInterface {
             }
         }
 
+        class NotAGroupMember extends DBusExecutionException {
+
+            public NotAGroupMember(final String message) {
+                super("Not a group member: " + message);
+            }
+        }
+
         class InvalidGroupId extends DBusExecutionException {
 
             public InvalidGroupId(final String message) {
diff --git a/src/main/java/org/asamk/SignalControl.java b/src/main/java/org/asamk/SignalControl.java
index fe51a7f7..3eea790f 100644
--- a/src/main/java/org/asamk/SignalControl.java
+++ b/src/main/java/org/asamk/SignalControl.java
@@ -13,11 +13,14 @@ import java.util.List;
 public interface SignalControl extends DBusInterface {
 
     void register(
-            String number, boolean voiceVerification
+            String number,
+            boolean voiceVerification
     ) throws Error.Failure, Error.InvalidNumber, Error.RequiresCaptcha;
 
     void registerWithCaptcha(
-            String number, boolean voiceVerification, String captcha
+            String number,
+            boolean voiceVerification,
+            String captcha
     ) throws Error.Failure, Error.InvalidNumber, Error.RequiresCaptcha;
 
     void verify(String number, String verificationCode) throws Error.Failure, Error.InvalidNumber;
diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index 37f5feec..6352aa13 100644
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -5,9 +5,8 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.ArgumentParser;
 import net.sourceforge.argparse4j.inf.Namespace;
 
-import org.asamk.Signal;
-import org.asamk.SignalControl;
 import org.asamk.signal.commands.Command;
+import org.asamk.signal.commands.CommandHandler;
 import org.asamk.signal.commands.Commands;
 import org.asamk.signal.commands.LocalCommand;
 import org.asamk.signal.commands.MultiLocalCommand;
@@ -17,28 +16,18 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
-import org.asamk.signal.dbus.DbusManagerImpl;
-import org.asamk.signal.dbus.DbusMultiAccountManagerImpl;
-import org.asamk.signal.dbus.DbusProvisioningManagerImpl;
-import org.asamk.signal.dbus.DbusRegistrationManagerImpl;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.RegistrationManager;
+import org.asamk.signal.manager.Settings;
 import org.asamk.signal.manager.SignalAccountFiles;
 import org.asamk.signal.manager.api.AccountCheckException;
 import org.asamk.signal.manager.api.NotRegisteredException;
-import org.asamk.signal.manager.config.ServiceConfig;
-import org.asamk.signal.manager.config.ServiceEnvironment;
-import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
+import org.asamk.signal.manager.api.ServiceEnvironment;
+import org.asamk.signal.manager.api.TrustNewIdentity;
 import org.asamk.signal.output.JsonWriterImpl;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriterImpl;
 import org.asamk.signal.util.IOUtils;
-import org.freedesktop.dbus.connections.impl.DBusConnection;
-import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder;
-import org.freedesktop.dbus.errors.ServiceUnknown;
-import org.freedesktop.dbus.errors.UnknownMethod;
-import org.freedesktop.dbus.exceptions.DBusException;
-import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,12 +35,14 @@ import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.util.Set;
 
 import static net.sourceforge.argparse4j.DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS;
+import static org.asamk.signal.dbus.DbusCommandHandler.initDbusClient;
 
 public class App {
 
-    private final static Logger logger = LoggerFactory.getLogger(App.class);
+    private static final Logger logger = LoggerFactory.getLogger(App.class);
 
     private final Namespace ns;
 
@@ -63,13 +54,16 @@ public class App {
                 .description("Commandline interface for Signal.")
                 .version(BaseConfig.PROJECT_NAME + " " + BaseConfig.PROJECT_VERSION);
 
-        parser.addArgument("-v", "--version").help("Show package version.").action(Arguments.version());
-        parser.addArgument("--verbose")
+        parser.addArgument("--version").help("Show package version.").action(Arguments.version());
+        parser.addArgument("-v", "--verbose")
                 .help("Raise log level and include lib signal logs. Specify multiple times for even more logs.")
                 .action(Arguments.count());
         parser.addArgument("--log-file")
                 .type(File.class)
                 .help("Write log output to the given file. If --verbose is also given, the detailed logs will only be written to the log file.");
+        parser.addArgument("--scrub-log")
+                .action(Arguments.storeTrue())
+                .help("Scrub possibly sensitive information from the log, like phone numbers and UUIDs.");
         parser.addArgument("-c", "--config")
                 .help("Set the path, where to store the config (Default: $XDG_DATA_HOME/signal-cli , $HOME/.local/share/signal-cli).");
 
@@ -82,6 +76,10 @@ public class App {
                 .dest("global-dbus-system")
                 .help("Make request via system dbus.")
                 .action(Arguments.storeTrue());
+        parser.addArgument("--bus-name")
+                .dest("global-bus-name")
+                .setDefault(DbusConfig.getBusname())
+                .help("Specify the D-Bus bus name to connect to.");
 
         parser.addArgument("-o", "--output")
                 .help("Choose to output in plain text or JSON")
@@ -97,6 +95,13 @@ public class App {
                 .type(Arguments.enumStringType(TrustNewIdentityCli.class))
                 .setDefault(TrustNewIdentityCli.ON_FIRST_USE);
 
+        parser.addArgument("--disable-send-log")
+                .help("Disable message send log (for resending messages that recipient couldn't decrypt)")
+                .action(Arguments.storeTrue());
+
+        parser.epilog(
+                "The global arguments are shown with 'signal-cli -h' and need to come before the subcommand, while the subcommand-specific arguments (shown with 'signal-cli SUBCOMMAND -h') need to be given after the subcommand.");
+
         var subparsers = parser.addSubparsers().title("subcommands").dest("command");
 
         Commands.getCommandSubparserAttachers().forEach((key, value) -> {
@@ -112,41 +117,110 @@ public class App {
     }
 
     public void init() throws CommandException {
+        logger.debug("Starting {}", BaseConfig.PROJECT_NAME + " " + BaseConfig.PROJECT_VERSION);
         var commandKey = ns.getString("command");
         var command = Commands.getCommand(commandKey);
         if (command == null) {
             throw new UserErrorException("Command not implemented!");
         }
 
-        var outputTypeInput = ns.<OutputType>get("output");
-        var outputType = outputTypeInput == null
-                ? command.getSupportedOutputTypes().stream().findFirst().orElse(null)
-                : outputTypeInput;
-        var writer = new BufferedWriter(new OutputStreamWriter(System.out, IOUtils.getConsoleCharset()));
-        var outputWriter = outputType == null
-                ? null
-                : outputType == OutputType.JSON ? new JsonWriterImpl(writer) : new PlainTextWriterImpl(writer);
-
-        if (outputWriter != null && !command.getSupportedOutputTypes().contains(outputType)) {
-            throw new UserErrorException("Command doesn't support output type " + outputType);
-        }
+        final var outputWriter = getOutputWriter(command);
+        final var commandHandler = new CommandHandler(ns, outputWriter);
 
         var account = ns.getString("account");
 
         final var useDbus = Boolean.TRUE.equals(ns.getBoolean("global-dbus"));
         final var useDbusSystem = Boolean.TRUE.equals(ns.getBoolean("global-dbus-system"));
         if (useDbus || useDbusSystem) {
+            final var busName = ns.getString("global-bus-name");
             // If account is null, it will connect to the default object path
-            initDbusClient(command, account, useDbusSystem, outputWriter);
+            initDbusClient(command, account, useDbusSystem, busName, commandHandler);
             return;
         }
 
-        if (!ServiceConfig.isSignalClientAvailable()) {
+        if (!Manager.isSignalClientAvailable()) {
             throw new UserErrorException("Missing required native library dependency: libsignal-client");
         }
 
+        final var signalAccountFiles = loadSignalAccountFiles();
+
+        handleCommand(command, commandHandler, account, signalAccountFiles);
+    }
+
+    private void handleCommand(
+            final Command command,
+            final CommandHandler commandHandler,
+            String account,
+            final SignalAccountFiles signalAccountFiles
+    ) throws CommandException {
+        if (command instanceof ProvisioningCommand provisioningCommand) {
+            if (account != null) {
+                throw new UserErrorException("You cannot specify a account (phone number) when linking");
+            }
+
+            handleProvisioningCommand(provisioningCommand, signalAccountFiles, commandHandler);
+            return;
+        }
+
+        if (account == null) {
+            if (command instanceof MultiLocalCommand multiLocalCommand) {
+                handleMultiLocalCommand(multiLocalCommand, signalAccountFiles, commandHandler);
+                return;
+            }
+
+            account = getAccountIfOnlyOne(signalAccountFiles);
+        } else if (!Manager.isValidNumber(account, null)) {
+            throw new UserErrorException("Invalid account (phone number), make sure you include the country code.");
+        }
+
+        if (command instanceof RegistrationCommand registrationCommand) {
+            handleRegistrationCommand(registrationCommand, account, signalAccountFiles, commandHandler);
+            return;
+        }
+
+        if (command instanceof LocalCommand localCommand) {
+            handleLocalCommand(localCommand, account, signalAccountFiles, commandHandler);
+            return;
+        }
+
+        throw new UserErrorException("Command only works in multi-account mode");
+    }
+
+    private static String getAccountIfOnlyOne(final SignalAccountFiles signalAccountFiles) throws IOErrorException, UserErrorException {
+        Set<String> accounts;
+        try {
+            accounts = signalAccountFiles.getAllLocalAccountNumbers();
+        } catch (IOException e) {
+            throw new IOErrorException("Failed to load local accounts file", e);
+        }
+        if (accounts.isEmpty()) {
+            throw new UserErrorException("No local users found, you first need to register or link an account");
+        } else if (accounts.size() > 1) {
+            throw new UserErrorException("Multiple users found, you need to specify an account (phone number) with -a");
+        }
+        return accounts.stream().findFirst().get();
+    }
+
+    private OutputWriter getOutputWriter(final Command command) throws UserErrorException {
+        final var outputTypeInput = ns.<OutputType>get("output");
+        final var outputType = outputTypeInput == null ? command.getSupportedOutputTypes()
+                .stream()
+                .findFirst()
+                .orElse(null) : outputTypeInput;
+        final var writer = new BufferedWriter(new OutputStreamWriter(System.out, IOUtils.getConsoleCharset()));
+        final var outputWriter = outputType == null
+                ? null
+                : outputType == OutputType.JSON ? new JsonWriterImpl(writer) : new PlainTextWriterImpl(writer);
+
+        if (outputWriter != null && !command.getSupportedOutputTypes().contains(outputType)) {
+            throw new UserErrorException("Command doesn't support output type " + outputType);
+        }
+        return outputWriter;
+    }
+
+    private SignalAccountFiles loadSignalAccountFiles() throws IOErrorException {
         final File configPath;
-        var config = ns.getString("config");
+        final var config = ns.getString("config");
         if (config != null) {
             configPath = new File(config);
         } else {
@@ -163,160 +237,68 @@ public class App {
                 ? TrustNewIdentity.ON_FIRST_USE
                 : trustNewIdentityCli == TrustNewIdentityCli.ALWAYS ? TrustNewIdentity.ALWAYS : TrustNewIdentity.NEVER;
 
-        final SignalAccountFiles signalAccountFiles;
+        final var disableSendLog = Boolean.TRUE.equals(ns.getBoolean("disable-send-log"));
+
         try {
-            signalAccountFiles = new SignalAccountFiles(configPath,
+            return new SignalAccountFiles(configPath,
                     serviceEnvironment,
                     BaseConfig.USER_AGENT,
-                    trustNewIdentity);
+                    new Settings(trustNewIdentity, disableSendLog));
         } catch (IOException e) {
             throw new IOErrorException("Failed to read local accounts list", e);
         }
-
-        if (command instanceof ProvisioningCommand provisioningCommand) {
-            if (account != null) {
-                throw new UserErrorException("You cannot specify a account (phone number) when linking");
-            }
-
-            handleProvisioningCommand(provisioningCommand, signalAccountFiles, outputWriter);
-            return;
-        }
-
-        if (account == null) {
-            if (command instanceof MultiLocalCommand multiLocalCommand) {
-                handleMultiLocalCommand(multiLocalCommand, signalAccountFiles, outputWriter);
-                return;
-            }
-
-            var accounts = signalAccountFiles.getAllLocalAccountNumbers();
-            if (accounts.size() == 0) {
-                throw new UserErrorException("No local users found, you first need to register or link an account");
-            } else if (accounts.size() > 1) {
-                throw new UserErrorException(
-                        "Multiple users found, you need to specify an account (phone number) with -a");
-            }
-
-            account = accounts.stream().findFirst().get();
-        } else if (!Manager.isValidNumber(account, null)) {
-            throw new UserErrorException("Invalid account (phone number), make sure you include the country code.");
-        }
-
-        if (command instanceof RegistrationCommand registrationCommand) {
-            handleRegistrationCommand(registrationCommand, account, signalAccountFiles);
-            return;
-        }
-
-        if (!(command instanceof LocalCommand)) {
-            throw new UserErrorException("Command only works in multi-account mode");
-        }
-
-        handleLocalCommand((LocalCommand) command, account, signalAccountFiles, outputWriter);
     }
 
     private void handleProvisioningCommand(
             final ProvisioningCommand command,
             final SignalAccountFiles signalAccountFiles,
-            final OutputWriter outputWriter
+            final CommandHandler commandHandler
     ) throws CommandException {
         var pm = signalAccountFiles.initProvisioningManager();
-        command.handleCommand(ns, pm, outputWriter);
-    }
-
-    private void handleProvisioningCommand(
-            final ProvisioningCommand c, final DBusConnection dBusConn, final OutputWriter outputWriter
-    ) throws CommandException, DBusException {
-        final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(),
-                DbusConfig.getObjectPath(),
-                SignalControl.class);
-        final var provisioningManager = new DbusProvisioningManagerImpl(signalControl, dBusConn);
-        try {
-            c.handleCommand(ns, provisioningManager, outputWriter);
-        } catch (UnsupportedOperationException e) {
-            throw new UserErrorException("Command is not yet implemented via dbus", e);
-        } catch (DBusExecutionException e) {
-            throw new UnexpectedErrorException(e.getMessage(), e);
-        }
+        commandHandler.handleProvisioningCommand(command, pm);
     }
 
     private void handleRegistrationCommand(
-            final RegistrationCommand command, final String account, final SignalAccountFiles signalAccountFiles
+            final RegistrationCommand command,
+            final String account,
+            final SignalAccountFiles signalAccountFiles,
+            final CommandHandler commandHandler
     ) throws CommandException {
-        try (final var manager = loadRegistrationManager(account, signalAccountFiles)) {
-            command.handleCommand(ns, manager);
+        try (final var rm = loadRegistrationManager(account, signalAccountFiles)) {
+            commandHandler.handleRegistrationCommand(command, rm);
         } catch (IOException e) {
             logger.warn("Cleanup failed", e);
         }
     }
 
-    private void handleRegistrationCommand(
-            final RegistrationCommand c, String account, final DBusConnection dBusConn, final OutputWriter outputWriter
-    ) throws CommandException, DBusException {
-        final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(),
-                DbusConfig.getObjectPath(),
-                SignalControl.class);
-        try (final var registrationManager = new DbusRegistrationManagerImpl(account, signalControl, dBusConn)) {
-            c.handleCommand(ns, registrationManager);
-        } catch (UnsupportedOperationException e) {
-            throw new UserErrorException("Command is not yet implemented via dbus", e);
-        } catch (DBusExecutionException e) {
-            throw new UnexpectedErrorException(e.getMessage(), e);
-        }
-    }
-
     private void handleLocalCommand(
             final LocalCommand command,
             final String account,
             final SignalAccountFiles signalAccountFiles,
-            final OutputWriter outputWriter
+            final CommandHandler commandHandler
     ) throws CommandException {
         try (var m = loadManager(account, signalAccountFiles)) {
-            command.handleCommand(ns, m, outputWriter);
-        } catch (IOException e) {
-            logger.warn("Cleanup failed", e);
-        }
-    }
-
-    private void handleLocalCommand(
-            final LocalCommand c,
-            String accountObjectPath,
-            final DBusConnection dBusConn,
-            final OutputWriter outputWriter
-    ) throws CommandException, DBusException {
-        var signal = dBusConn.getRemoteObject(DbusConfig.getBusname(), accountObjectPath, Signal.class);
-        try (final var m = new DbusManagerImpl(signal, dBusConn)) {
-            c.handleCommand(ns, m, outputWriter);
-        } catch (UnsupportedOperationException e) {
-            throw new UserErrorException("Command is not yet implemented via dbus", e);
-        } catch (DBusExecutionException e) {
-            throw new UnexpectedErrorException(e.getMessage(), e);
+            commandHandler.handleLocalCommand(command, m);
         }
     }
 
     private void handleMultiLocalCommand(
             final MultiLocalCommand command,
             final SignalAccountFiles signalAccountFiles,
-            final OutputWriter outputWriter
+            final CommandHandler commandHandler
     ) throws CommandException {
         try (var multiAccountManager = signalAccountFiles.initMultiAccountManager()) {
-            command.handleCommand(ns, multiAccountManager, outputWriter);
-        }
-    }
-
-    private void handleMultiLocalCommand(
-            final MultiLocalCommand c, final DBusConnection dBusConn, final OutputWriter outputWriter
-    ) throws CommandException, DBusException {
-        final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(),
-                DbusConfig.getObjectPath(),
-                SignalControl.class);
-        try (final var multiAccountManager = new DbusMultiAccountManagerImpl(signalControl, dBusConn)) {
-            c.handleCommand(ns, multiAccountManager, outputWriter);
-        } catch (UnsupportedOperationException e) {
-            throw new UserErrorException("Command is not yet implemented via dbus", e);
+            commandHandler.handleMultiLocalCommand(command, multiAccountManager);
+        } catch (IOException e) {
+            throw new IOErrorException("Failed to load local accounts file", e);
+        } catch (AccountCheckException e) {
+            throw new UnexpectedErrorException("Failed to load account file", e);
         }
     }
 
     private RegistrationManager loadRegistrationManager(
-            final String account, final SignalAccountFiles signalAccountFiles
+            final String account,
+            final SignalAccountFiles signalAccountFiles
     ) throws UnexpectedErrorException {
         try {
             return signalAccountFiles.initRegistrationManager(account);
@@ -330,7 +312,8 @@ public class App {
     }
 
     private Manager loadManager(
-            final String account, final SignalAccountFiles signalAccountFiles
+            final String account,
+            final SignalAccountFiles signalAccountFiles
     ) throws CommandException {
         logger.trace("Loading account file for {}", account);
         try {
@@ -355,74 +338,6 @@ public class App {
         }
     }
 
-    private void initDbusClient(
-            final Command command, final String account, final boolean systemBus, final OutputWriter outputWriter
-    ) throws CommandException {
-        try {
-            DBusConnection.DBusBusType busType;
-            if (systemBus) {
-                busType = DBusConnection.DBusBusType.SYSTEM;
-            } else {
-                busType = DBusConnection.DBusBusType.SESSION;
-            }
-            try (var dBusConn = DBusConnectionBuilder.forType(busType).build()) {
-                if (command instanceof ProvisioningCommand c) {
-                    if (account != null) {
-                        throw new UserErrorException("You cannot specify a account (phone number) when linking");
-                    }
-
-                    handleProvisioningCommand(c, dBusConn, outputWriter);
-                    return;
-                }
-
-                if (account == null && command instanceof MultiLocalCommand c) {
-                    handleMultiLocalCommand(c, dBusConn, outputWriter);
-                    return;
-                }
-                if (account != null && command instanceof RegistrationCommand c) {
-                    handleRegistrationCommand(c, account, dBusConn, outputWriter);
-                    return;
-                }
-                if (!(command instanceof LocalCommand localCommand)) {
-                    throw new UserErrorException("Command only works in multi-account mode");
-                }
-
-                var accountObjectPath = account == null ? tryGetSingleAccountObjectPath(dBusConn) : null;
-                if (accountObjectPath == null) {
-                    accountObjectPath = DbusConfig.getObjectPath(account);
-                }
-                handleLocalCommand(localCommand, accountObjectPath, dBusConn, outputWriter);
-            }
-        } catch (ServiceUnknown e) {
-            throw new UserErrorException("signal-cli DBus daemon not running on "
-                    + (systemBus ? "system" : "session")
-                    + " bus: "
-                    + e.getMessage(), e);
-        } catch (DBusExecutionException | DBusException | IOException e) {
-            throw new UnexpectedErrorException("Dbus client failed: " + e.getMessage(), e);
-        }
-    }
-
-    private String tryGetSingleAccountObjectPath(final DBusConnection dBusConn) throws DBusException, CommandException {
-        var control = dBusConn.getRemoteObject(DbusConfig.getBusname(),
-                DbusConfig.getObjectPath(),
-                SignalControl.class);
-        try {
-            final var accounts = control.listAccounts();
-            if (accounts.size() == 0) {
-                throw new UserErrorException("No local users found, you first need to register or link an account");
-            } else if (accounts.size() > 1) {
-                throw new UserErrorException(
-                        "Multiple users found, you need to specify an account (phone number) with -a");
-            }
-
-            return accounts.get(0).getPath();
-        } catch (UnknownMethod e) {
-            // dbus daemon not running in multi-account mode
-            return null;
-        }
-    }
-
     /**
      * @return the default data directory to be used by signal-cli.
      */
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 04c1ac8a..730485bc 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -1,15 +1,18 @@
 package org.asamk.signal;
 
+import java.util.Optional;
+
 public class BaseConfig {
 
-    public final static String PROJECT_NAME = BaseConfig.class.getPackage().getImplementationTitle();
-    public final static String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
+    public static final String PROJECT_NAME = BaseConfig.class.getPackage().getImplementationTitle();
+    public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
-    final static String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/5.22.3";
-    final static String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
+    static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
+            .orElse("Signal-Android/7.47.1");
+    static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;
-    final static String USER_AGENT = USER_AGENT_SIGNAL_ANDROID + " " + USER_AGENT_SIGNAL_CLI;
+    static final String USER_AGENT = USER_AGENT_SIGNAL_ANDROID + " " + USER_AGENT_SIGNAL_CLI;
 
     private BaseConfig() {
     }
diff --git a/src/main/java/org/asamk/signal/DbusConfig.java b/src/main/java/org/asamk/signal/DbusConfig.java
index ddd534c4..39fbf68e 100644
--- a/src/main/java/org/asamk/signal/DbusConfig.java
+++ b/src/main/java/org/asamk/signal/DbusConfig.java
@@ -1,12 +1,21 @@
 package org.asamk.signal;
 
+import org.asamk.signal.dbus.DbusUtils;
+
+import java.io.File;
+
 public class DbusConfig {
 
     private static final String SIGNAL_BUSNAME = "org.asamk.Signal";
+    private static final String SIGNAL_BUSNAME_FLATPAK = "org.asamk.SignalCli";
     private static final String SIGNAL_OBJECT_BASE_PATH = "/org/asamk/Signal";
 
     public static String getBusname() {
-        return SIGNAL_BUSNAME;
+        if (new File("/.flatpak-info").exists()) {
+            return SIGNAL_BUSNAME_FLATPAK;
+        } else {
+            return SIGNAL_BUSNAME;
+        }
     }
 
     public static String getObjectPath() {
@@ -18,6 +27,6 @@ public class DbusConfig {
             return SIGNAL_OBJECT_BASE_PATH;
         }
 
-        return SIGNAL_OBJECT_BASE_PATH + "/" + account.replace('+', '_');
+        return SIGNAL_OBJECT_BASE_PATH + "/" + DbusUtils.makeValidObjectPathElement(account);
     }
 }
diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 14bdc4c9..9219a1d6 100644
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -24,9 +24,11 @@ import net.sourceforge.argparse4j.inf.Namespace;
 
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.RateLimitErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.logging.LogConfigurator;
 import org.asamk.signal.manager.ManagerLogger;
 import org.asamk.signal.util.SecurityProvider;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -43,29 +45,26 @@ public class Main {
         installSecurityProviderWorkaround();
 
         // Configuring the logger needs to happen before any logger is initialized
+        final var loggingConfig = parseLoggingConfig(args);
+        configureLogging(loggingConfig);
 
-        final var nsLog = parseArgs(args);
-        final var verboseLevel = nsLog == null ? 0 : nsLog.getInt("verbose");
-        final var logFile = nsLog == null ? null : nsLog.<File>get("log-file");
-        configureLogging(verboseLevel, logFile);
-
-        var parser = App.buildArgumentParser();
-
-        var ns = parser.parseArgsOrFail(args);
+        final var parser = App.buildArgumentParser();
+        final var ns = parser.parseArgsOrFail(args);
 
         int status = 0;
         try {
             new App(ns).init();
         } catch (CommandException e) {
             System.err.println(e.getMessage());
-            if (verboseLevel > 0 && e.getCause() != null) {
-                e.getCause().printStackTrace();
+            if (loggingConfig.verboseLevel > 0 && e.getCause() != null) {
+                e.getCause().printStackTrace(System.err);
             }
             status = getStatusForError(e);
         } catch (Throwable e) {
-            e.printStackTrace();
+            e.printStackTrace(System.err);
             status = 2;
         }
+        Shutdown.shutdownComplete();
         System.exit(status);
     }
 
@@ -75,13 +74,29 @@ public class Main {
         Security.addProvider(new BouncyCastleProvider());
     }
 
+    private static LoggingConfig parseLoggingConfig(final String[] args) {
+        final var nsLog = parseArgs(args);
+        if (nsLog == null) {
+            return new LoggingConfig(0, null, false);
+        }
+
+        final var verboseLevel = nsLog.getInt("verbose");
+        final var logFile = nsLog.<File>get("log-file");
+        final var scrubLog = nsLog.getBoolean("scrub-log");
+        return new LoggingConfig(verboseLevel, logFile, scrubLog);
+    }
+
+    /**
+     * This method only parses commandline args relevant for logging configuration.
+     */
     private static Namespace parseArgs(String[] args) {
         var parser = ArgumentParsers.newFor("signal-cli", DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS)
                 .includeArgumentNamesAsKeysInResult(true)
                 .build()
                 .defaultHelp(false);
-        parser.addArgument("--verbose").action(Arguments.count());
+        parser.addArgument("-v", "--verbose").action(Arguments.count());
         parser.addArgument("--log-file").type(File.class);
+        parser.addArgument("--scrub-log").action(Arguments.storeTrue());
 
         try {
             return parser.parseKnownArgs(args, null);
@@ -90,13 +105,16 @@ public class Main {
         }
     }
 
-    private static void configureLogging(final int verboseLevel, final File logFile) {
-        LogConfigurator.setVerboseLevel(verboseLevel);
-        LogConfigurator.setLogFile(logFile);
+    private static void configureLogging(final LoggingConfig loggingConfig) {
+        LogConfigurator.setVerboseLevel(loggingConfig.verboseLevel);
+        LogConfigurator.setLogFile(loggingConfig.logFile);
+        LogConfigurator.setScrubSensitiveInformation(loggingConfig.scrubLog);
 
-        if (verboseLevel > 0) {
+        if (loggingConfig.verboseLevel > 0) {
             java.util.logging.Logger.getLogger("")
-                    .setLevel(verboseLevel > 2 ? java.util.logging.Level.FINEST : java.util.logging.Level.INFO);
+                    .setLevel(loggingConfig.verboseLevel > 2
+                            ? java.util.logging.Level.FINEST
+                            : java.util.logging.Level.INFO);
             ManagerLogger.initLogger();
         }
         SLF4JBridgeHandler.removeHandlersForRootLogger();
@@ -104,16 +122,15 @@ public class Main {
     }
 
     private static int getStatusForError(final CommandException e) {
-        if (e instanceof UserErrorException) {
-            return 1;
-        } else if (e instanceof UnexpectedErrorException) {
-            return 2;
-        } else if (e instanceof IOErrorException) {
-            return 3;
-        } else if (e instanceof UntrustedKeyErrorException) {
-            return 4;
-        } else {
-            return 2;
-        }
+        return switch (e) {
+            case UserErrorException userErrorException -> 1;
+            case UnexpectedErrorException unexpectedErrorException -> 2;
+            case IOErrorException ioErrorException -> 3;
+            case UntrustedKeyErrorException untrustedKeyErrorException -> 4;
+            case RateLimitErrorException rateLimitErrorException -> 5;
+            case null -> 2;
+        };
     }
+
+    private record LoggingConfig(int verboseLevel, File logFile, boolean scrubLog) {}
 }
diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index 04a7be03..d7fd1104 100644
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -1,11 +1,12 @@
 package org.asamk.signal;
 
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.RecipientAddress;
 import org.asamk.signal.manager.api.RecipientIdentifier;
+import org.asamk.signal.manager.api.TextStyle;
 import org.asamk.signal.manager.api.UntrustedIdentityException;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.output.PlainTextWriter;
 import org.asamk.signal.util.DateUtils;
 import org.asamk.signal.util.Hex;
@@ -33,9 +34,10 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
 
     private void handleMessageInternal(MessageEnvelope envelope, Throwable exception) {
         var source = envelope.sourceAddress();
-        writer.println("Envelope from: {} (device: {})",
+        writer.println("Envelope from: {} (device: {}) to {}",
                 source.map(this::formatContact).orElse("unknown source"),
-                envelope.sourceDevice());
+                envelope.sourceDevice(),
+                m.getSelfNumber());
         writer.println("Timestamp: {}", DateUtils.formatTimestamp(envelope.timestamp()));
         writer.println("Server timestamps: received: {} delivered: {}",
                 DateUtils.formatTimestamp(envelope.serverReceivedTimestamp()),
@@ -68,6 +70,14 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             var message = envelope.data().get();
             printDataMessage(writer, message);
         }
+        if (envelope.edit().isPresent()) {
+            var message = envelope.edit().get();
+            printEditMessage(writer, message);
+        }
+        if (envelope.story().isPresent()) {
+            var message = envelope.story().get();
+            printStoryMessage(writer.indentedWriter(), message);
+        }
         if (envelope.sync().isPresent()) {
             writer.println("Received a sync message");
             var syncMessage = envelope.sync().get();
@@ -91,9 +101,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         writer.println();
     }
 
-    private void printDataMessage(
-            PlainTextWriter writer, MessageEnvelope.Data message
-    ) {
+    private void printDataMessage(PlainTextWriter writer, MessageEnvelope.Data message) {
         writer.println("Message timestamp: {}", DateUtils.formatTimestamp(message.timestamp()));
         if (message.isViewOnce()) {
             writer.println("=VIEW ONCE=");
@@ -107,12 +115,17 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             final var groupContext = message.groupContext().get();
             printGroupContext(writer.indentedWriter(), groupContext);
         }
+        if (message.storyContext().isPresent()) {
+            writer.println("Story reply:");
+            final var storyContext = message.storyContext().get();
+            printStoryContext(writer.indentedWriter(), storyContext);
+        }
         if (message.groupCallUpdate().isPresent()) {
             writer.println("Group call update:");
             final var groupCallUpdate = message.groupCallUpdate().get();
             writer.indentedWriter().println("Era id: {}", groupCallUpdate.eraId());
         }
-        if (message.previews().size() > 0) {
+        if (!message.previews().isEmpty()) {
             writer.println("Previews:");
             final var previews = message.previews();
             for (var preview : previews) {
@@ -120,7 +133,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
                 printPreview(writer.indentedWriter(), preview);
             }
         }
-        if (message.sharedContacts().size() > 0) {
+        if (!message.sharedContacts().isEmpty()) {
             writer.println("Contacts:");
             for (var contact : message.sharedContacts()) {
                 writer.println("- Contact:");
@@ -141,9 +154,12 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         if (message.expiresInSeconds() > 0) {
             writer.println("Expires in: {} seconds", message.expiresInSeconds());
         }
-        if (message.hasProfileKey()) {
+        if (message.isProfileKeyUpdate()) {
             writer.println("Profile key update");
         }
+        if (message.hasProfileKey()) {
+            writer.println("With profile key");
+        }
         if (message.reaction().isPresent()) {
             writer.println("Reaction:");
             final var reaction = message.reaction().get();
@@ -158,13 +174,19 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             final var remoteDelete = message.remoteDeleteId().get();
             writer.println("Remote delete message: timestamp = {}", remoteDelete);
         }
-        if (message.mentions().size() > 0) {
+        if (!message.mentions().isEmpty()) {
             writer.println("Mentions:");
             for (var mention : message.mentions()) {
                 printMention(writer, mention);
             }
         }
-        if (message.attachments().size() > 0) {
+        if (!message.textStyles().isEmpty()) {
+            writer.println("Text styles:");
+            for (var textStyle : message.textStyles()) {
+                printTextStyle(writer, textStyle);
+            }
+        }
+        if (!message.attachments().isEmpty()) {
             writer.println("Attachments:");
             for (var attachment : message.attachments()) {
                 writer.println("- Attachment:");
@@ -173,9 +195,32 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
     }
 
-    private void printTypingMessage(
-            final PlainTextWriter writer, final MessageEnvelope.Typing typingMessage
-    ) {
+    private void printEditMessage(PlainTextWriter writer, MessageEnvelope.Edit message) {
+        writer.println("Edit: Target message timestamp: {}", DateUtils.formatTimestamp(message.targetSentTimestamp()));
+        printDataMessage(writer.indentedWriter(), message.dataMessage());
+    }
+
+    private void printStoryMessage(PlainTextWriter writer, MessageEnvelope.Story message) {
+        writer.println("Story: with replies: {}", message.allowsReplies());
+        if (message.groupId().isPresent()) {
+            writer.println("Group info:");
+            printGroupInfo(writer.indentedWriter(), message.groupId().get());
+        }
+        if (message.textAttachment().isPresent()) {
+            writer.println("Body: {}", message.textAttachment().get().text().orElse(""));
+
+            if (message.textAttachment().get().preview().isPresent()) {
+                writer.println("Preview:");
+                printPreview(writer.indentedWriter(), message.textAttachment().get().preview().get());
+            }
+        }
+        if (message.fileAttachment().isPresent()) {
+            writer.println("Attachments:");
+            printAttachment(writer.indentedWriter(), message.fileAttachment().get());
+        }
+    }
+
+    private void printTypingMessage(final PlainTextWriter writer, final MessageEnvelope.Typing typingMessage) {
         writer.println("Action: {}", typingMessage.type());
         writer.println("Timestamp: {}", DateUtils.formatTimestamp(typingMessage.timestamp()));
         if (typingMessage.groupId().isPresent()) {
@@ -185,9 +230,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
     }
 
-    private void printReceiptMessage(
-            final PlainTextWriter writer, final MessageEnvelope.Receipt receiptMessage
-    ) {
+    private void printReceiptMessage(final PlainTextWriter writer, final MessageEnvelope.Receipt receiptMessage) {
         writer.println("When: {}", DateUtils.formatTimestamp(receiptMessage.when()));
         if (receiptMessage.type() == MessageEnvelope.Receipt.Type.DELIVERY) {
             writer.println("Is delivery receipt");
@@ -204,9 +247,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
     }
 
-    private void printCallMessage(
-            final PlainTextWriter writer, final MessageEnvelope.Call callMessage
-    ) {
+    private void printCallMessage(final PlainTextWriter writer, final MessageEnvelope.Call callMessage) {
         if (callMessage.destinationDeviceId().isPresent()) {
             final var deviceId = callMessage.destinationDeviceId().get();
             writer.println("Destination device id: {}", deviceId);
@@ -220,7 +261,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
         if (callMessage.answer().isPresent()) {
             var answerMessage = callMessage.answer().get();
-            writer.println("Answer message: {}, sdp: {})", answerMessage.id(), answerMessage.sdp());
+            writer.println("Answer message: {}, opaque length: {})", answerMessage.id(), answerMessage.opaque().length);
         }
         if (callMessage.busy().isPresent()) {
             var busyMessage = callMessage.busy().get();
@@ -230,16 +271,16 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             var hangupMessage = callMessage.hangup().get();
             writer.println("Hangup message: {}", hangupMessage.id());
         }
-        if (callMessage.iceUpdate().size() > 0) {
+        if (!callMessage.iceUpdate().isEmpty()) {
             writer.println("Ice update messages:");
             var iceUpdateMessages = callMessage.iceUpdate();
             for (var iceUpdateMessage : iceUpdateMessages) {
-                writer.println("- {}, sdp: {}", iceUpdateMessage.id(), iceUpdateMessage.sdp());
+                writer.println("- {}, opaque length: {}", iceUpdateMessage.id(), iceUpdateMessage.opaque().length);
             }
         }
         if (callMessage.offer().isPresent()) {
             var offerMessage = callMessage.offer().get();
-            writer.println("Offer message: {}, sdp: {}", offerMessage.id(), offerMessage.sdp());
+            writer.println("Offer message: {}, opaque length: {}", offerMessage.id(), offerMessage.opaque().length);
         }
         if (callMessage.opaque().isPresent()) {
             final var opaqueMessage = callMessage.opaque().get();
@@ -249,9 +290,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
     }
 
-    private void printSyncMessage(
-            final PlainTextWriter writer, final MessageEnvelope.Sync syncMessage
-    ) {
+    private void printSyncMessage(final PlainTextWriter writer, final MessageEnvelope.Sync syncMessage) {
         if (syncMessage.contacts().isPresent()) {
             final var contactsMessage = syncMessage.contacts().get();
             var type = contactsMessage.isComplete() ? "complete" : "partial";
@@ -260,7 +299,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         if (syncMessage.groups().isPresent()) {
             writer.println("Received sync groups.");
         }
-        if (syncMessage.read().size() > 0) {
+        if (!syncMessage.read().isEmpty()) {
             writer.println("Received sync read messages list");
             for (var rm : syncMessage.read()) {
                 writer.println("- From: {} Message timestamp: {}",
@@ -268,7 +307,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
                         DateUtils.formatTimestamp(rm.timestamp()));
             }
         }
-        if (syncMessage.viewed().size() > 0) {
+        if (!syncMessage.viewed().isEmpty()) {
             writer.println("Received sync viewed messages list");
             for (var vm : syncMessage.viewed()) {
                 writer.println("- From: {} Message timestamp: {}",
@@ -282,7 +321,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             String to;
             if (sentTranscriptMessage.destination().isPresent()) {
                 to = formatContact(sentTranscriptMessage.destination().get());
-            } else if (sentTranscriptMessage.recipients().size() > 0) {
+            } else if (!sentTranscriptMessage.recipients().isEmpty()) {
                 to = sentTranscriptMessage.recipients()
                         .stream()
                         .map(this::formatContact)
@@ -302,6 +341,10 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
                 var message = sentTranscriptMessage.message().get();
                 printDataMessage(writer.indentedWriter(), message);
             }
+            if (sentTranscriptMessage.story().isPresent()) {
+                var message = sentTranscriptMessage.story().get();
+                printStoryMessage(writer.indentedWriter(), message);
+            }
         }
         if (syncMessage.blocked().isPresent()) {
             writer.println("Received sync message with block list");
@@ -335,9 +378,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
     }
 
-    private void printPreview(
-            final PlainTextWriter writer, final MessageEnvelope.Data.Preview preview
-    ) {
+    private void printPreview(final PlainTextWriter writer, final MessageEnvelope.Data.Preview preview) {
         writer.println("Title: {}", preview.title());
         writer.println("Description: {}", preview.description());
         writer.println("Date: {}", DateUtils.formatTimestamp(preview.date()));
@@ -348,37 +389,31 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
     }
 
-    private void printSticker(
-            final PlainTextWriter writer, final MessageEnvelope.Data.Sticker sticker
-    ) {
+    private void printSticker(final PlainTextWriter writer, final MessageEnvelope.Data.Sticker sticker) {
         writer.println("Pack id: {}", Hex.toStringCondensed(sticker.packId().serialize()));
         writer.println("Sticker id: {}", sticker.stickerId());
     }
 
-    private void printReaction(
-            final PlainTextWriter writer, final MessageEnvelope.Data.Reaction reaction
-    ) {
+    private void printReaction(final PlainTextWriter writer, final MessageEnvelope.Data.Reaction reaction) {
         writer.println("Emoji: {}", reaction.emoji());
         writer.println("Target author: {}", formatContact(reaction.targetAuthor()));
         writer.println("Target timestamp: {}", DateUtils.formatTimestamp(reaction.targetSentTimestamp()));
         writer.println("Is remove: {}", reaction.isRemove());
     }
 
-    private void printQuote(
-            final PlainTextWriter writer, final MessageEnvelope.Data.Quote quote
-    ) {
+    private void printQuote(final PlainTextWriter writer, final MessageEnvelope.Data.Quote quote) {
         writer.println("Id: {}", quote.id());
         writer.println("Author: {}", formatContact(quote.author()));
         if (quote.text().isPresent()) {
             writer.println("Text: {}", quote.text().get());
         }
-        if (quote.mentions() != null && quote.mentions().size() > 0) {
+        if (quote.mentions() != null && !quote.mentions().isEmpty()) {
             writer.println("Mentions:");
             for (var mention : quote.mentions()) {
                 printMention(writer, mention);
             }
         }
-        if (quote.attachments().size() > 0) {
+        if (!quote.attachments().isEmpty()) {
             writer.println("Attachments:");
             for (var attachment : quote.attachments()) {
                 writer.println("- Attachment:");
@@ -391,9 +426,6 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         writer.println("Name:");
         var name = contact.name();
         writer.indent(w -> {
-            if (name.display().isPresent() && !name.display().get().isBlank()) {
-                w.println("Display name: {}", name.display().get());
-            }
             if (name.given().isPresent() && !name.given().get().isBlank()) {
                 w.println("First name: {}", name.given().get());
             }
@@ -409,6 +441,9 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             if (name.suffix().isPresent() && !name.suffix().get().isBlank()) {
                 w.println("Suffix name: {}", name.suffix().get());
             }
+            if (name.nickname().isPresent() && !name.nickname().get().isBlank()) {
+                w.println("Display name: {}", name.nickname().get());
+            }
         });
 
         if (contact.avatar().isPresent()) {
@@ -421,7 +456,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             writer.println("Organisation: {}", contact.organization().get());
         }
 
-        if (contact.phone().size() > 0) {
+        if (!contact.phone().isEmpty()) {
             writer.println("Phone details:");
             for (var phone : contact.phone()) {
                 writer.println("- Phone:");
@@ -435,7 +470,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             }
         }
 
-        if (contact.email().size() > 0) {
+        if (!contact.email().isEmpty()) {
             writer.println("Email details:");
             for (var email : contact.email()) {
                 writer.println("- Email:");
@@ -449,7 +484,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             }
         }
 
-        if (contact.address().size() > 0) {
+        if (!contact.address().isEmpty()) {
             writer.println("Address details:");
             for (var address : contact.address()) {
                 writer.println("- Address:");
@@ -484,14 +519,17 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
     }
 
-    private void printGroupContext(
-            final PlainTextWriter writer, final MessageEnvelope.Data.GroupContext groupContext
-    ) {
+    private void printGroupContext(final PlainTextWriter writer, final MessageEnvelope.Data.GroupContext groupContext) {
         printGroupInfo(writer, groupContext.groupId());
         writer.println("Revision: {}", groupContext.revision());
         writer.println("Type: {}", groupContext.isGroupUpdate() ? "UPDATE" : "DELIVER");
     }
 
+    private void printStoryContext(final PlainTextWriter writer, final MessageEnvelope.Data.StoryContext storyContext) {
+        writer.println("Sender: {}", formatContact(storyContext.author()));
+        writer.println("Sent timestamp: {}", storyContext.sentTimestamp());
+    }
+
     private void printGroupInfo(final PlainTextWriter writer, final GroupId groupId) {
         writer.println("Id: {}", groupId.toBase64());
 
@@ -503,12 +541,14 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
     }
 
-    private void printMention(
-            PlainTextWriter writer, MessageEnvelope.Data.Mention mention
-    ) {
+    private void printMention(PlainTextWriter writer, MessageEnvelope.Data.Mention mention) {
         writer.println("- {}: {} (length: {})", formatContact(mention.recipient()), mention.start(), mention.length());
     }
 
+    private void printTextStyle(PlainTextWriter writer, TextStyle textStyle) {
+        writer.println("- {}: {} (length: {})", textStyle.style().name(), textStyle.start(), textStyle.length());
+    }
+
     private void printAttachment(PlainTextWriter writer, MessageEnvelope.Data.Attachment attachment) {
         writer.println("Content-Type: {}", attachment.contentType());
         writer.println("Type: {}", attachment.id().isPresent() ? "Pointer" : "Stream");
@@ -545,7 +585,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         if (attachment.isGif()) {
             flags.add("video gif");
         }
-        if (flags.size() > 0) {
+        if (!flags.isEmpty()) {
             writer.println("Flags: {}", String.join(", ", flags));
         }
         if (attachment.width().isPresent() || attachment.height().isPresent()) {
diff --git a/src/main/java/org/asamk/signal/Shutdown.java b/src/main/java/org/asamk/signal/Shutdown.java
new file mode 100644
index 00000000..c51c12e4
--- /dev/null
+++ b/src/main/java/org/asamk/signal/Shutdown.java
@@ -0,0 +1,75 @@
+package org.asamk.signal;
+
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+import sun.misc.Signal;
+
+public class Shutdown {
+
+    private static final Logger logger = LoggerFactory.getLogger(Shutdown.class);
+    private static final CompletableFuture<Object> shutdown = new CompletableFuture<>();
+    private static final CompletableFuture<Void> shutdownComplete = new CompletableFuture<>();
+    private static boolean initialized = false;
+
+    public static void installHandler() {
+        if (initialized) {
+            return;
+        }
+        initialized = true;
+        Signal.handle(new Signal("INT"), Shutdown::handleSignal);
+        Signal.handle(new Signal("TERM"), Shutdown::handleSignal);
+        Runtime.getRuntime().addShutdownHook(Thread.ofPlatform().unstarted(() -> {
+            logger.debug("JVM is shutting down");
+            if (!shutdown.isDone()) {
+                triggerShutdown();
+            }
+
+            try {
+                logger.debug("Waiting for app to shut down");
+                shutdownComplete.get();
+                logger.debug("Exiting");
+            } catch (InterruptedException | ExecutionException e) {
+                throw new RuntimeException(e);
+            }
+        }));
+    }
+
+    public static void triggerShutdown() {
+        logger.debug("Triggering shutdown.");
+        shutdown.complete(null);
+    }
+
+    public static void triggerShutdown(CommandException exception) {
+        logger.debug("Triggering shutdown with exception.", exception);
+        shutdown.complete(exception);
+    }
+
+    public static void waitForShutdown() throws InterruptedException, CommandException {
+        try {
+            final var result = shutdown.get();
+            if (result instanceof CommandException e) {
+                throw e;
+            }
+        } catch (ExecutionException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void registerShutdownListener(Runnable action) {
+        shutdown.thenRun(action);
+    }
+
+    static void shutdownComplete() {
+        shutdownComplete.complete(null);
+    }
+
+    private static void handleSignal(Signal signal) {
+        logger.info("Received {} signal, shutting down ...", signal);
+        triggerShutdown();
+    }
+}
diff --git a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
index eb218c70..43e1a0b7 100644
--- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
@@ -7,7 +7,10 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.DeviceLimitExceededException;
+import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
+import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.output.OutputWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,7 +21,7 @@ import java.net.URISyntaxException;
 
 public class AddDeviceCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(AddDeviceCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(AddDeviceCommand.class);
 
     @Override
     public String getName() {
@@ -35,7 +38,9 @@ public class AddDeviceCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final URI linkUri;
         try {
@@ -45,13 +50,18 @@ public class AddDeviceCommand implements JsonRpcLocalCommand {
         }
 
         try {
-            m.addDeviceLink(linkUri);
+            var deviceLinkUrl = DeviceLinkUrl.parseDeviceLinkUri(linkUri);
+            m.addDeviceLink(deviceLinkUrl);
         } catch (IOException e) {
-            logger.error("Add device link failed", e);
+            logger.error("Add device link failed: {}", e.getMessage());
             throw new IOErrorException("Add device link failed", e);
         } catch (InvalidDeviceLinkException e) {
-            logger.error("Add device link failed", e);
-            throw new UserErrorException("Add device link failed.", e);
+            logger.info("Invalid device link");
+            throw new UserErrorException("Invalid device link", e);
+        } catch (DeviceLimitExceededException e) {
+            throw new UserErrorException("Account has too many linked devices already", e);
+        } catch (NotPrimaryDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java b/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
new file mode 100644
index 00000000..2d720362
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
@@ -0,0 +1,64 @@
+package org.asamk.signal.commands;
+
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.StickerPackUrl;
+import org.asamk.signal.output.OutputWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+public class AddStickerPackCommand implements JsonRpcLocalCommand {
+
+    private static final Logger logger = LoggerFactory.getLogger(AddStickerPackCommand.class);
+
+    @Override
+    public String getName() {
+        return "addStickerPack";
+    }
+
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
+        subparser.help("Install a sticker pack for this account.");
+        subparser.addArgument("--uri")
+                .required(true)
+                .nargs("+")
+                .help("Specify the uri of the sticker pack. (e.g. https://signal.art/addstickers/#pack_id=XXX&pack_key=XXX)");
+    }
+
+    @Override
+    public void handleCommand(
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
+    ) throws CommandException {
+        final var uris = ns.<String>getList("uri");
+        for (final var uri : uris) {
+            final URI stickerUri;
+            try {
+                stickerUri = new URI(uri);
+            } catch (URISyntaxException e) {
+                throw new UserErrorException("Sticker pack uri has invalid format: " + e.getMessage());
+            }
+
+            try {
+                var stickerPackUrl = StickerPackUrl.fromUri(stickerUri);
+                m.installStickerPack(stickerPackUrl);
+            } catch (IOException e) {
+                logger.error("Install sticker pack failed: {}", e.getMessage());
+                throw new IOErrorException("Install sticker pack failed", e);
+            } catch (StickerPackUrl.InvalidStickerPackLinkException e) {
+                logger.error("Invalid sticker pack link");
+                throw new UserErrorException("Invalid sticker pack link", e);
+            }
+        }
+    }
+}
diff --git a/src/main/java/org/asamk/signal/commands/BlockCommand.java b/src/main/java/org/asamk/signal/commands/BlockCommand.java
index 682ff63f..e7d0af49 100644
--- a/src/main/java/org/asamk/signal/commands/BlockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java
@@ -7,9 +7,9 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.GroupNotFoundException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 import org.slf4j.Logger;
@@ -19,7 +19,7 @@ import java.io.IOException;
 
 public class BlockCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(BlockCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(BlockCommand.class);
 
     @Override
     public String getName() {
@@ -35,7 +35,9 @@ public class BlockCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var contacts = ns.<String>getList("recipient");
         final var recipients = CommandUtil.getSingleRecipientIdentifiers(contacts, m.getSelfNumber());
diff --git a/src/main/java/org/asamk/signal/commands/CommandHandler.java b/src/main/java/org/asamk/signal/commands/CommandHandler.java
new file mode 100644
index 00000000..86fede61
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/CommandHandler.java
@@ -0,0 +1,46 @@
+package org.asamk.signal.commands;
+
+import net.sourceforge.argparse4j.inf.Namespace;
+
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.MultiAccountManager;
+import org.asamk.signal.manager.ProvisioningManager;
+import org.asamk.signal.manager.RegistrationManager;
+import org.asamk.signal.output.OutputWriter;
+
+public class CommandHandler {
+
+    final Namespace ns;
+    final OutputWriter outputWriter;
+
+    public CommandHandler(final Namespace ns, final OutputWriter outputWriter) {
+        this.ns = ns;
+        this.outputWriter = outputWriter;
+    }
+
+    public void handleProvisioningCommand(
+            final ProvisioningCommand command,
+            final ProvisioningManager provisioningManager
+    ) throws CommandException {
+        command.handleCommand(ns, provisioningManager, outputWriter);
+    }
+
+    public void handleRegistrationCommand(
+            final RegistrationCommand command,
+            final RegistrationManager registrationManager
+    ) throws CommandException {
+        command.handleCommand(ns, registrationManager);
+    }
+
+    public void handleLocalCommand(final LocalCommand command, final Manager manager) throws CommandException {
+        command.handleCommand(ns, manager, outputWriter);
+    }
+
+    public void handleMultiLocalCommand(
+            final MultiLocalCommand command,
+            MultiAccountManager multiAccountManager
+    ) throws CommandException {
+        command.handleCommand(ns, multiAccountManager, outputWriter);
+    }
+}
diff --git a/src/main/java/org/asamk/signal/commands/Commands.java b/src/main/java/org/asamk/signal/commands/Commands.java
index 1c4251da..51620a7f 100644
--- a/src/main/java/org/asamk/signal/commands/Commands.java
+++ b/src/main/java/org/asamk/signal/commands/Commands.java
@@ -14,8 +14,13 @@ public class Commands {
         addCommand(new BlockCommand());
         addCommand(new DaemonCommand());
         addCommand(new DeleteLocalAccountDataCommand());
+        addCommand(new FinishChangeNumberCommand());
         addCommand(new FinishLinkCommand());
+        addCommand(new GetAttachmentCommand());
+        addCommand(new GetAvatarCommand());
+        addCommand(new GetStickerCommand());
         addCommand(new GetUserStatusCommand());
+        addCommand(new AddStickerPackCommand());
         addCommand(new JoinGroupCommand());
         addCommand(new JsonRpcDispatcherCommand());
         addCommand(new LinkCommand());
@@ -34,6 +39,7 @@ public class Commands {
         addCommand(new RemoteDeleteCommand());
         addCommand(new SendCommand());
         addCommand(new SendContactsCommand());
+        addCommand(new SendMessageRequestResponseCommand());
         addCommand(new SendPaymentNotificationCommand());
         addCommand(new SendReactionCommand());
         addCommand(new SendReceiptCommand());
@@ -41,6 +47,7 @@ public class Commands {
         addCommand(new SendTypingCommand());
         addCommand(new SetPinCommand());
         addCommand(new SubmitRateLimitChallengeCommand());
+        addCommand(new StartChangeNumberCommand());
         addCommand(new StartLinkCommand());
         addCommand(new TrustCommand());
         addCommand(new UnblockCommand());
@@ -68,8 +75,8 @@ public class Commands {
 
     private static void addCommand(Command command) {
         commands.put(command.getName(), command);
-        if (command instanceof CliCommand) {
-            commandSubparserAttacher.put(command.getName(), ((CliCommand) command)::attachToSubparser);
+        if (command instanceof CliCommand cliCommand) {
+            commandSubparserAttacher.put(command.getName(), cliCommand::attachToSubparser);
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index cec7cd03..6790c65d 100644
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -7,43 +7,36 @@ import net.sourceforge.argparse4j.inf.Subparser;
 import org.asamk.signal.DbusConfig;
 import org.asamk.signal.OutputType;
 import org.asamk.signal.ReceiveMessageHandler;
+import org.asamk.signal.Shutdown;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
-import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
-import org.asamk.signal.commands.exceptions.UserErrorException;
-import org.asamk.signal.dbus.DbusSignalControlImpl;
-import org.asamk.signal.dbus.DbusSignalImpl;
+import org.asamk.signal.dbus.DbusHandler;
+import org.asamk.signal.http.HttpServerHandler;
 import org.asamk.signal.json.JsonReceiveMessageHandler;
-import org.asamk.signal.jsonrpc.SignalJsonRpcDispatcherHandler;
+import org.asamk.signal.jsonrpc.SocketHandler;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.MultiAccountManager;
-import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.output.JsonWriter;
-import org.asamk.signal.output.JsonWriterImpl;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
 import org.asamk.signal.util.IOUtils;
-import org.freedesktop.dbus.connections.impl.DBusConnection;
-import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder;
-import org.freedesktop.dbus.exceptions.DBusException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.InetSocketAddress;
 import java.net.UnixDomainSocketAddress;
 import java.nio.channels.Channel;
-import java.nio.channels.Channels;
 import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Consumer;
+
+import static org.asamk.signal.util.CommandUtil.getReceiveConfig;
 
 public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(DaemonCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(DaemonCommand.class);
 
     @Override
     public String getName() {
@@ -53,13 +46,14 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
     @Override
     public void attachToSubparser(final Subparser subparser) {
         final var defaultSocketPath = new File(new File(IOUtils.getRuntimeDir(), "signal-cli"), "socket");
-        subparser.help("Run in daemon mode and provide an experimental dbus or JSON-RPC interface.");
-        subparser.addArgument("--dbus")
-                .action(Arguments.storeTrue())
-                .help("Expose a DBus interface on the user bus (the default, if no other options are given).");
+        subparser.help("Run in daemon mode and provide a JSON-RPC or an experimental dbus interface.");
+        subparser.addArgument("--dbus").action(Arguments.storeTrue()).help("Expose a DBus interface on the user bus.");
         subparser.addArgument("--dbus-system", "--system")
                 .action(Arguments.storeTrue())
                 .help("Expose a DBus interface on the system bus.");
+        subparser.addArgument("--bus-name")
+                .setDefault(DbusConfig.getBusname())
+                .help("Specify the D-Bus bus name to connect to.");
         subparser.addArgument("--socket")
                 .nargs("?")
                 .type(File.class)
@@ -69,6 +63,10 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                 .nargs("?")
                 .setConst("localhost:7583")
                 .help("Expose a JSON-RPC interface on a TCP socket (default localhost:7583).");
+        subparser.addArgument("--http")
+                .nargs("?")
+                .setConst("localhost:8080")
+                .help("Expose a JSON-RPC interface as http endpoint (default localhost:8080).");
         subparser.addArgument("--no-receive-stdout")
                 .help("Don’t print received messages to stdout.")
                 .action(Arguments.storeTrue());
@@ -79,6 +77,9 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         subparser.addArgument("--ignore-attachments")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
+        subparser.addArgument("--ignore-stories")
+                .help("Don’t receive story messages from the server.")
+                .action(Arguments.storeTrue());
         subparser.addArgument("--send-read-receipts")
                 .help("Send read receipts for all incoming data messages (in addition to the default delivery receipts)")
                 .action(Arguments.storeTrue());
@@ -91,62 +92,26 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
-        logger.info("Starting daemon in single-account mode for " + m.getSelfNumber());
+        Shutdown.installHandler();
+        logger.info("Starting daemon in single-account mode for {}", m.getSelfNumber());
         final var noReceiveStdOut = Boolean.TRUE.equals(ns.getBoolean("no-receive-stdout"));
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
-        final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
-        final boolean sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
+        final var receiveConfig = getReceiveConfig(ns);
 
-        m.setReceiveConfig(new ReceiveConfig(ignoreAttachments, sendReadReceipts));
+        m.setReceiveConfig(receiveConfig);
         addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);
 
-        final Channel inheritedChannel;
-        try {
-            inheritedChannel = System.inheritedChannel();
-            if (inheritedChannel instanceof ServerSocketChannel serverChannel) {
-                logger.info("Using inherited socket: " + serverChannel.getLocalAddress());
-                runSocketSingleAccount(m, serverChannel, receiveMode == ReceiveMode.MANUAL);
-            }
-        } catch (IOException e) {
-            throw new IOErrorException("Failed to use inherited socket", e);
-        }
-        final var socketFile = ns.<File>get("socket");
-        if (socketFile != null) {
-            final var address = UnixDomainSocketAddress.of(socketFile.toPath());
-            final var serverChannel = IOUtils.bindSocket(address);
-            runSocketSingleAccount(m, serverChannel, receiveMode == ReceiveMode.MANUAL);
-        }
-        final var tcpAddress = ns.getString("tcp");
-        if (tcpAddress != null) {
-            final var address = IOUtils.parseInetSocketAddress(tcpAddress);
-            final var serverChannel = IOUtils.bindSocket(address);
-            runSocketSingleAccount(m, serverChannel, receiveMode == ReceiveMode.MANUAL);
-        }
-        final var isDbusSystem = Boolean.TRUE.equals(ns.getBoolean("dbus-system"));
-        if (isDbusSystem) {
-            runDbusSingleAccount(m, true, receiveMode != ReceiveMode.ON_START);
-        }
-        final var isDbusSession = Boolean.TRUE.equals(ns.getBoolean("dbus"));
-        if (isDbusSession || (
-                !isDbusSystem
-                        && socketFile == null
-                        && tcpAddress == null
-                        && !(inheritedChannel instanceof ServerSocketChannel)
-        )) {
-            runDbusSingleAccount(m, false, receiveMode != ReceiveMode.ON_START);
-        }
+        try (final var daemonHandler = new SingleAccountDaemonHandler(m, receiveMode)) {
+            setup(ns, daemonHandler);
 
-        m.addClosedListener(() -> {
-            synchronized (this) {
-                notifyAll();
-            }
-        });
+            m.addClosedListener(Shutdown::triggerShutdown);
 
-        synchronized (this) {
             try {
-                wait();
+                Shutdown.waitForShutdown();
             } catch (InterruptedException ignored) {
             }
         }
@@ -154,15 +119,15 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter
+            final Namespace ns,
+            final MultiAccountManager c,
+            final OutputWriter outputWriter
     ) throws CommandException {
+        Shutdown.installHandler();
         logger.info("Starting daemon in multi-account mode");
         final var noReceiveStdOut = Boolean.TRUE.equals(ns.getBoolean("no-receive-stdout"));
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
-        final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
-        final boolean sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
-
-        final var receiveConfig = new ReceiveConfig(ignoreAttachments, sendReadReceipts);
+        final var receiveConfig = getReceiveConfig(ns);
         c.getManagers().forEach(m -> {
             m.setReceiveConfig(receiveConfig);
             addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);
@@ -172,222 +137,181 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
             addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);
         });
 
+        try (final var daemonHandler = new MultiAccountDaemonHandler(c, receiveMode)) {
+            setup(ns, daemonHandler);
+
+            synchronized (this) {
+                try {
+                    Shutdown.waitForShutdown();
+                } catch (InterruptedException ignored) {
+                }
+            }
+        }
+    }
+
+    private static void setup(final Namespace ns, final DaemonHandler daemonHandler) throws CommandException {
         final Channel inheritedChannel;
         try {
-            inheritedChannel = System.inheritedChannel();
-            if (inheritedChannel instanceof ServerSocketChannel serverChannel) {
+            if (System.inheritedChannel() instanceof ServerSocketChannel serverChannel) {
+                inheritedChannel = serverChannel;
                 logger.info("Using inherited socket: " + serverChannel.getLocalAddress());
-                runSocketMultiAccount(c, serverChannel, receiveMode == ReceiveMode.MANUAL);
+                daemonHandler.runSocket(serverChannel);
+            } else {
+                inheritedChannel = null;
             }
         } catch (IOException e) {
             throw new IOErrorException("Failed to use inherited socket", e);
         }
+
         final var socketFile = ns.<File>get("socket");
         if (socketFile != null) {
             final var address = UnixDomainSocketAddress.of(socketFile.toPath());
             final var serverChannel = IOUtils.bindSocket(address);
-            runSocketMultiAccount(c, serverChannel, receiveMode == ReceiveMode.MANUAL);
+            daemonHandler.runSocket(serverChannel);
         }
+
         final var tcpAddress = ns.getString("tcp");
         if (tcpAddress != null) {
             final var address = IOUtils.parseInetSocketAddress(tcpAddress);
             final var serverChannel = IOUtils.bindSocket(address);
-            runSocketMultiAccount(c, serverChannel, receiveMode == ReceiveMode.MANUAL);
-        }
-        final var isDbusSystem = Boolean.TRUE.equals(ns.getBoolean("dbus-system"));
-        if (isDbusSystem) {
-            runDbusMultiAccount(c, receiveMode != ReceiveMode.ON_START, true);
-        }
-        final var isDbusSession = Boolean.TRUE.equals(ns.getBoolean("dbus"));
-        if (isDbusSession || (
-                !isDbusSystem
-                        && socketFile == null
-                        && tcpAddress == null
-                        && !(inheritedChannel instanceof ServerSocketChannel)
-        )) {
-            runDbusMultiAccount(c, receiveMode != ReceiveMode.ON_START, false);
+            daemonHandler.runSocket(serverChannel);
         }
 
-        synchronized (this) {
-            try {
-                wait();
-            } catch (InterruptedException ignored) {
-            }
+        final var httpAddress = ns.getString("http");
+        if (httpAddress != null) {
+            final var address = IOUtils.parseInetSocketAddress(httpAddress);
+            daemonHandler.runHttp(address);
+        }
+
+        final var isDbusSystem = Boolean.TRUE.equals(ns.getBoolean("dbus-system"));
+        if (isDbusSystem) {
+            final var busName = ns.getString("bus-name");
+            daemonHandler.runDbus(true, busName);
+        }
+
+        final var isDbusSession = Boolean.TRUE.equals(ns.getBoolean("dbus"));
+        if (isDbusSession) {
+            final var busName = ns.getString("bus-name");
+            daemonHandler.runDbus(false, busName);
+        }
+
+        if (!isDbusSystem
+                && !isDbusSession
+                && socketFile == null
+                && tcpAddress == null
+                && httpAddress == null
+                && inheritedChannel == null) {
+            logger.warn(
+                    "Running daemon command without explicit mode is deprecated. Use 'daemon --dbus' to use the dbus interface.");
+            daemonHandler.runDbus(false, DbusConfig.getBusname());
         }
     }
 
     private void addDefaultReceiveHandler(Manager m, OutputWriter outputWriter, final boolean isWeakListener) {
-        final var handler = outputWriter instanceof JsonWriter o
-                ? new JsonReceiveMessageHandler(m, o)
-                : outputWriter instanceof PlainTextWriter o
-                        ? new ReceiveMessageHandler(m, o)
-                        : Manager.ReceiveMessageHandler.EMPTY;
+        final var handler = switch (outputWriter) {
+            case PlainTextWriter writer -> new ReceiveMessageHandler(m, writer);
+            case JsonWriter writer -> new JsonReceiveMessageHandler(m, writer);
+            case null -> Manager.ReceiveMessageHandler.EMPTY;
+        };
         m.addReceiveHandler(handler, isWeakListener);
     }
 
-    private void runSocketSingleAccount(
-            final Manager m, final ServerSocketChannel serverChannel, final boolean noReceiveOnStart
-    ) {
-        runSocket(serverChannel, channel -> {
-            final var handler = getSignalJsonRpcDispatcherHandler(channel, noReceiveOnStart);
-            handler.handleConnection(m);
-        });
-    }
+    private static abstract class DaemonHandler implements AutoCloseable {
 
-    private void runSocketMultiAccount(
-            final MultiAccountManager c, final ServerSocketChannel serverChannel, final boolean noReceiveOnStart
-    ) {
-        runSocket(serverChannel, channel -> {
-            final var handler = getSignalJsonRpcDispatcherHandler(channel, noReceiveOnStart);
-            handler.handleConnection(c);
-        });
-    }
+        protected final ReceiveMode receiveMode;
+        protected final List<AutoCloseable> closeables = new ArrayList<>();
 
-    private static final AtomicInteger threadNumber = new AtomicInteger(0);
+        protected DaemonHandler(final ReceiveMode receiveMode) {
+            this.receiveMode = receiveMode;
+        }
 
-    private void runSocket(final ServerSocketChannel serverChannel, Consumer<SocketChannel> socketHandler) {
-        final var thread = new Thread(() -> {
-            while (true) {
-                final var connectionId = threadNumber.getAndIncrement();
-                final SocketChannel channel;
-                final String clientString;
-                try {
-                    channel = serverChannel.accept();
-                    clientString = channel.getRemoteAddress() + " " + IOUtils.getUnixDomainPrincipal(channel);
-                    logger.info("Accepted new client connection {}: {}", connectionId, clientString);
-                } catch (IOException e) {
-                    logger.error("Failed to accept new socket connection", e);
-                    synchronized (this) {
-                        notifyAll();
-                    }
-                    break;
-                }
-                final var connectionThread = new Thread(() -> {
-                    try (final var c = channel) {
-                        socketHandler.accept(c);
-                    } catch (IOException e) {
-                        logger.warn("Failed to close channel", e);
-                    } catch (Throwable e) {
-                        logger.warn("Connection handler failed, closing connection", e);
-                    }
-                    logger.info("Connection {} closed: {}", connectionId, clientString);
-                });
-                connectionThread.setName("daemon-connection-" + connectionId);
-                connectionThread.start();
-            }
-        });
-        thread.setName("daemon-listener");
-        thread.start();
-    }
+        public abstract void runSocket(ServerSocketChannel serverChannel) throws CommandException;
 
-    private SignalJsonRpcDispatcherHandler getSignalJsonRpcDispatcherHandler(
-            final SocketChannel c, final boolean noReceiveOnStart
-    ) {
-        final var lineSupplier = IOUtils.getLineSupplier(Channels.newReader(c, StandardCharsets.UTF_8));
-        final var jsonOutputWriter = new JsonWriterImpl(Channels.newWriter(c, StandardCharsets.UTF_8));
+        public abstract void runDbus(boolean isDbusSystem, final String busname) throws CommandException;
 
-        return new SignalJsonRpcDispatcherHandler(jsonOutputWriter, lineSupplier, noReceiveOnStart);
-    }
+        public abstract void runHttp(InetSocketAddress address) throws CommandException;
 
-    private void runDbusSingleAccount(
-            final Manager m, final boolean isDbusSystem, final boolean noReceiveOnStart
-    ) throws CommandException {
-        runDbus(isDbusSystem, (conn, objectPath) -> {
+        protected final void runSocket(final SocketHandler socketHandler) {
+            socketHandler.init();
+            this.closeables.add(socketHandler);
+        }
+
+        protected final void runDbus(
+                DbusHandler dbusHandler
+        ) throws CommandException {
+            dbusHandler.init();
+            this.closeables.add(dbusHandler);
+        }
+
+        protected final void runHttp(final HttpServerHandler handler) throws CommandException {
             try {
-                exportDbusObject(conn, objectPath, m, noReceiveOnStart).join();
-            } catch (InterruptedException ignored) {
+                handler.init();
+            } catch (IOException ex) {
+                throw new IOErrorException("Failed to initialize HTTP Server", ex);
             }
-        });
-    }
+            this.closeables.add(handler);
+        }
 
-    private void runDbusMultiAccount(
-            final MultiAccountManager c, final boolean noReceiveOnStart, final boolean isDbusSystem
-    ) throws CommandException {
-        runDbus(isDbusSystem, (connection, objectPath) -> {
-            final var signalControl = new DbusSignalControlImpl(c, objectPath);
-            connection.exportObject(signalControl);
-
-            c.addOnManagerAddedHandler(m -> {
-                final var thread = exportMultiAccountManager(connection, m, noReceiveOnStart);
+        @Override
+        public void close() {
+            for (final var closeable : new ArrayList<>(this.closeables)) {
                 try {
-                    thread.join();
-                } catch (InterruptedException ignored) {
-                }
-            });
-            c.addOnManagerRemovedHandler(m -> {
-                final var path = DbusConfig.getObjectPath(m.getSelfNumber());
-                try {
-                    final var object = connection.getExportedObject(null, path);
-                    if (object instanceof DbusSignalImpl dbusSignal) {
-                        dbusSignal.close();
-                    }
-                } catch (DBusException ignored) {
-                }
-            });
-
-            final var initThreads = c.getManagers()
-                    .stream()
-                    .map(m -> exportMultiAccountManager(connection, m, noReceiveOnStart))
-                    .toList();
-
-            for (var t : initThreads) {
-                try {
-                    t.join();
-                } catch (InterruptedException ignored) {
+                    closeable.close();
+                } catch (Exception e) {
+                    logger.warn("Failed to close daemon handler", e);
                 }
             }
-        });
+            this.closeables.clear();
+        }
     }
 
-    private void runDbus(
-            final boolean isDbusSystem, DbusRunner dbusRunner
-    ) throws CommandException {
-        DBusConnection.DBusBusType busType;
-        if (isDbusSystem) {
-            busType = DBusConnection.DBusBusType.SYSTEM;
-        } else {
-            busType = DBusConnection.DBusBusType.SESSION;
-        }
-        DBusConnection conn;
-        try {
-            conn = DBusConnectionBuilder.forType(busType).build();
-            dbusRunner.run(conn, DbusConfig.getObjectPath());
-        } catch (DBusException e) {
-            throw new UnexpectedErrorException("Dbus command failed: " + e.getMessage(), e);
-        } catch (UnsupportedOperationException e) {
-            throw new UserErrorException("Failed to connect to Dbus: " + e.getMessage(), e);
+    private static final class SingleAccountDaemonHandler extends DaemonHandler {
+
+        private final Manager m;
+
+        public SingleAccountDaemonHandler(final Manager m, final ReceiveMode receiveMode) {
+            super(receiveMode);
+            this.m = m;
         }
 
-        try {
-            conn.requestBusName(DbusConfig.getBusname());
-        } catch (DBusException e) {
-            throw new UnexpectedErrorException("Dbus command failed, maybe signal-cli dbus daemon is already running: "
-                    + e.getMessage(), e);
+        @Override
+        public void runSocket(final ServerSocketChannel serverChannel) {
+            runSocket(new SocketHandler(serverChannel, m, receiveMode == ReceiveMode.MANUAL));
         }
 
-        logger.info("DBus daemon running on {} bus: {}", busType, DbusConfig.getBusname());
+        @Override
+        public void runDbus(final boolean isDbusSystem, final String busname) throws CommandException {
+            runDbus(new DbusHandler(isDbusSystem, busname, m, receiveMode != ReceiveMode.ON_START));
+        }
+
+        @Override
+        public void runHttp(InetSocketAddress address) throws CommandException {
+            runHttp(new HttpServerHandler(address, m));
+        }
     }
 
-    private Thread exportMultiAccountManager(
-            final DBusConnection conn, final Manager m, final boolean noReceiveOnStart
-    ) {
-        final var objectPath = DbusConfig.getObjectPath(m.getSelfNumber());
-        return exportDbusObject(conn, objectPath, m, noReceiveOnStart);
-    }
+    private static final class MultiAccountDaemonHandler extends DaemonHandler {
 
-    private Thread exportDbusObject(
-            final DBusConnection conn, final String objectPath, final Manager m, final boolean noReceiveOnStart
-    ) {
-        final var signal = new DbusSignalImpl(m, conn, objectPath, noReceiveOnStart);
-        final var initThread = new Thread(signal::initObjects);
-        initThread.setName("dbus-init");
-        initThread.start();
+        private final MultiAccountManager c;
 
-        return initThread;
-    }
+        public MultiAccountDaemonHandler(final MultiAccountManager c, final ReceiveMode receiveMode) {
+            super(receiveMode);
+            this.c = c;
+        }
 
-    interface DbusRunner {
+        @Override
+        public void runSocket(final ServerSocketChannel serverChannel) {
+            runSocket(new SocketHandler(serverChannel, c, receiveMode == ReceiveMode.MANUAL));
+        }
 
-        void run(DBusConnection connection, String objectPath) throws DBusException;
+        @Override
+        public void runDbus(final boolean isDbusSystem, final String busname) throws CommandException {
+            runDbus(new DbusHandler(isDbusSystem, busname, c, receiveMode != ReceiveMode.ON_START));
+        }
+
+        @Override
+        public void runHttp(final InetSocketAddress address) throws CommandException {
+            runHttp(new HttpServerHandler(address, c));
+        }
     }
 }
diff --git a/src/main/java/org/asamk/signal/commands/DeleteLocalAccountDataCommand.java b/src/main/java/org/asamk/signal/commands/DeleteLocalAccountDataCommand.java
index 51c8582d..71f8867c 100644
--- a/src/main/java/org/asamk/signal/commands/DeleteLocalAccountDataCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DeleteLocalAccountDataCommand.java
@@ -60,7 +60,9 @@ public class DeleteLocalAccountDataCommand implements RegistrationCommand, JsonR
 
     @Override
     public void handleCommand(
-            Map<String, Object> request, RegistrationManager m, JsonWriter jsonWriter
+            Map<String, Object> request,
+            RegistrationManager m,
+            JsonWriter jsonWriter
     ) throws CommandException {
         Namespace commandNamespace = new JsonRpcNamespace(request == null ? Map.of() : request);
         handleCommand(commandNamespace, m);
diff --git a/src/main/java/org/asamk/signal/commands/FinishChangeNumberCommand.java b/src/main/java/org/asamk/signal/commands/FinishChangeNumberCommand.java
new file mode 100644
index 00000000..1242c194
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/FinishChangeNumberCommand.java
@@ -0,0 +1,63 @@
+package org.asamk.signal.commands;
+
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.IncorrectPinException;
+import org.asamk.signal.manager.api.NotPrimaryDeviceException;
+import org.asamk.signal.manager.api.PinLockMissingException;
+import org.asamk.signal.manager.api.PinLockedException;
+import org.asamk.signal.output.OutputWriter;
+
+import java.io.IOException;
+
+public class FinishChangeNumberCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "finishChangeNumber";
+    }
+
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
+        subparser.help("Verify the new number using the code received via SMS or voice.");
+        subparser.addArgument("number").help("The new phone number in E164 format.").required(true);
+        subparser.addArgument("-v", "--verification-code")
+                .help("The verification code you received via sms or voice call.")
+                .required(true);
+        subparser.addArgument("-p", "--pin").help("The registration lock PIN, that was set by the user (Optional)");
+    }
+
+    @Override
+    public void handleCommand(
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
+    ) throws CommandException {
+        final var newNumber = ns.getString("number");
+        final var verificationCode = ns.getString("verification-code");
+        final var pin = ns.getString("pin");
+
+        try {
+            m.finishChangeNumber(newNumber, verificationCode, pin);
+        } catch (PinLockedException e) {
+            throw new UserErrorException(
+                    "Verification failed! This number is locked with a pin. Hours remaining until reset: "
+                            + (e.getTimeRemaining() / 1000 / 60 / 60)
+                            + "\nUse '--pin PIN_CODE' to specify the registration lock PIN");
+        } catch (IncorrectPinException e) {
+            throw new UserErrorException("Verification failed! Invalid pin, tries remaining: " + e.getTriesRemaining());
+        } catch (PinLockMissingException e) {
+            throw new UserErrorException("Account is pin locked, but pin data has been deleted on the server.");
+        } catch (NotPrimaryDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");
+        } catch (IOException e) {
+            throw new IOErrorException("Failed to change number: %s (%s)".formatted(e.getMessage(),
+                    e.getClass().getSimpleName()), e);
+        }
+    }
+}
diff --git a/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java b/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java
index f49de103..c9282616 100644
--- a/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java
@@ -18,7 +18,7 @@ import java.util.concurrent.TimeoutException;
 
 public class FinishLinkCommand implements JsonRpcMultiCommand<FinishLinkCommand.FinishLinkParams> {
 
-    private final static Logger logger = LoggerFactory.getLogger(FinishLinkCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(FinishLinkCommand.class);
 
     @Override
     public String getName() {
@@ -32,8 +32,13 @@ public class FinishLinkCommand implements JsonRpcMultiCommand<FinishLinkCommand.
 
     @Override
     public void handleCommand(
-            final FinishLinkParams request, final MultiAccountManager m, final JsonWriter jsonWriter
+            final FinishLinkParams request,
+            final MultiAccountManager m,
+            final JsonWriter jsonWriter
     ) throws CommandException {
+        if (request.deviceLinkUri() == null) {
+            throw new UserErrorException("Missing deviceLinkUri.");
+        }
         final URI deviceLinkUri;
         try {
             deviceLinkUri = new URI(request.deviceLinkUri());
@@ -55,7 +60,11 @@ public class FinishLinkCommand implements JsonRpcMultiCommand<FinishLinkCommand.
         } catch (TimeoutException e) {
             throw new UserErrorException("Link request timed out, please try again.");
         } catch (IOException e) {
-            throw new IOErrorException("Link request error: " + e.getMessage(), e);
+            throw new IOErrorException("Link request error: "
+                    + e.getMessage()
+                    + " ("
+                    + e.getClass().getSimpleName()
+                    + ")", e);
         } catch (UserAlreadyExistsException e) {
             throw new UserErrorException("The user "
                     + e.getNumber()
@@ -67,7 +76,7 @@ public class FinishLinkCommand implements JsonRpcMultiCommand<FinishLinkCommand.
         jsonWriter.write(new JsonFinishLink(number));
     }
 
-    record FinishLinkParams(String deviceLinkUri, String deviceName) {}
+    public record FinishLinkParams(String deviceLinkUri, String deviceName) {}
 
     private record JsonFinishLink(String number) {}
 }
diff --git a/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java b/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
new file mode 100644
index 00000000..cf716194
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
@@ -0,0 +1,58 @@
+package org.asamk.signal.commands;
+
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.json.JsonAttachmentData;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Base64;
+
+public class GetAttachmentCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "getAttachment";
+    }
+
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
+        subparser.help("Retrieve an already downloaded attachment base64 encoded.");
+        subparser.addArgument("--id").required(true).help("The ID of the attachment file.");
+        var mut = subparser.addMutuallyExclusiveGroup().required(true);
+        mut.addArgument("--recipient").help("Sender of the attachment");
+        mut.addArgument("-g", "--group-id").help("Group in which the attachment was received");
+    }
+
+    @Override
+    public void handleCommand(
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
+    ) throws CommandException {
+
+        final var id = ns.getString("id");
+
+        try (InputStream attachment = m.retrieveAttachment(id)) {
+            final var bytes = attachment.readAllBytes();
+            final var base64 = Base64.getEncoder().encodeToString(bytes);
+            switch (outputWriter) {
+                case PlainTextWriter writer -> writer.println(base64);
+                case JsonWriter writer -> writer.write(new JsonAttachmentData(base64));
+            }
+        } catch (FileNotFoundException ex) {
+            throw new UserErrorException("Could not find attachment with ID: " + id, ex);
+        } catch (IOException ex) {
+            throw new UnexpectedErrorException("An error occurred reading attachment: " + id, ex);
+        }
+    }
+}
diff --git a/src/main/java/org/asamk/signal/commands/GetAvatarCommand.java b/src/main/java/org/asamk/signal/commands/GetAvatarCommand.java
new file mode 100644
index 00000000..7b2be6d4
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/GetAvatarCommand.java
@@ -0,0 +1,78 @@
+package org.asamk.signal.commands;
+
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.json.JsonAttachmentData;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.UnregisteredRecipientException;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
+import org.asamk.signal.util.CommandUtil;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Base64;
+
+public class GetAvatarCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "getAvatar";
+    }
+
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
+        subparser.help("Retrieve the avatar of a contact, contact's profile or group base64 encoded.");
+        var mut = subparser.addMutuallyExclusiveGroup().required(true);
+        mut.addArgument("-c", "--contact").help("Get a contact avatar");
+        mut.addArgument("-p", "--profile").help("Get a profile avatar");
+        mut.addArgument("-g", "--group-id").help("Get a group avatar");
+    }
+
+    @Override
+    public void handleCommand(
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
+    ) throws CommandException {
+        final var contactRecipient = ns.getString("contact");
+        final var profileRecipient = ns.getString("profile");
+        final var groupId = ns.getString("groupId");
+
+        final InputStream data;
+        try {
+            if (contactRecipient != null) {
+                data = m.retrieveContactAvatar(CommandUtil.getSingleRecipientIdentifier(contactRecipient,
+                        m.getSelfNumber()));
+            } else if (profileRecipient != null) {
+                data = m.retrieveProfileAvatar(CommandUtil.getSingleRecipientIdentifier(profileRecipient,
+                        m.getSelfNumber()));
+            } else {
+                data = m.retrieveGroupAvatar(CommandUtil.getGroupId(groupId));
+            }
+        } catch (FileNotFoundException ex) {
+            throw new UserErrorException("Could not find avatar", ex);
+        } catch (IOException ex) {
+            throw new UnexpectedErrorException("An error occurred reading avatar", ex);
+        } catch (UnregisteredRecipientException e) {
+            throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
+        }
+
+        try (data) {
+            final var bytes = data.readAllBytes();
+            final var base64 = Base64.getEncoder().encodeToString(bytes);
+            switch (outputWriter) {
+                case PlainTextWriter writer -> writer.println(base64);
+                case JsonWriter writer -> writer.write(new JsonAttachmentData(base64));
+            }
+        } catch (IOException ex) {
+            throw new UnexpectedErrorException("An error occurred reading avatar", ex);
+        }
+    }
+}
diff --git a/src/main/java/org/asamk/signal/commands/GetStickerCommand.java b/src/main/java/org/asamk/signal/commands/GetStickerCommand.java
new file mode 100644
index 00000000..efd79d94
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/GetStickerCommand.java
@@ -0,0 +1,62 @@
+package org.asamk.signal.commands;
+
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.json.JsonAttachmentData;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.StickerPackId;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
+import org.asamk.signal.util.Hex;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Base64;
+
+public class GetStickerCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "getSticker";
+    }
+
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
+        subparser.help("Retrieve the sticker of a sticker pack base64 encoded.");
+        subparser.addArgument("--pack-id").required(true).help("The ID of the sticker pack.");
+        subparser.addArgument("--sticker-id").type(int.class).required(true).help("The ID of the sticker.");
+    }
+
+    @Override
+    public void handleCommand(
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
+    ) throws CommandException {
+
+        final var packId = StickerPackId.deserialize(Hex.toByteArray(ns.getString("pack-id")));
+        final var stickerId = ns.getInt("sticker-id");
+
+        try (InputStream data = m.retrieveSticker(packId, stickerId)) {
+            final var bytes = data.readAllBytes();
+            final var base64 = Base64.getEncoder().encodeToString(bytes);
+            switch (outputWriter) {
+                case PlainTextWriter writer -> writer.println(base64);
+                case JsonWriter writer -> writer.write(new JsonAttachmentData(base64));
+            }
+        } catch (FileNotFoundException ex) {
+            throw new UserErrorException("Could not find sticker with ID: " + stickerId + " in pack " + packId, ex);
+        } catch (IOException ex) {
+            throw new UnexpectedErrorException("An error occurred reading sticker with ID: "
+                    + stickerId
+                    + " in pack "
+                    + packId, ex);
+        }
+    }
+}
diff --git a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
index 8c89dd4f..eab4155c 100644
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -1,25 +1,33 @@
 package org.asamk.signal.commands;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.RateLimitErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.UserStatus;
+import org.asamk.signal.manager.api.UsernameStatus;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
+import org.asamk.signal.util.CommandUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Stream;
 
 public class GetUserStatusCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(GetUserStatusCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(GetUserStatusCommand.class);
 
     @Override
     public String getName() {
@@ -29,17 +37,36 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Check if the specified phone number/s have been registered");
-        subparser.addArgument("recipient").help("Phone number").nargs("+");
+        subparser.addArgument("recipient").help("Phone number").nargs("*");
+        subparser.addArgument("--username").help("Specify the recipient username or username link.").nargs("*");
     }
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         // Get a map of registration statuses
         Map<String, UserStatus> registered;
         try {
-            registered = m.getUserStatus(new HashSet<>(ns.getList("recipient")));
+            final var recipient = ns.<String>getList("recipient");
+            registered = m.getUserStatus(recipient == null ? Set.of() : new HashSet<>(recipient));
+        } catch (RateLimitException e) {
+            final var message = CommandUtil.getRateLimitMessage(e);
+            throw new RateLimitErrorException(message, e);
+        } catch (IOException e) {
+            throw new IOErrorException("Unable to check if users are registered: "
+                    + e.getMessage()
+                    + " ("
+                    + e.getClass().getSimpleName()
+                    + ")", e);
+        }
+
+        final var usernames = ns.<String>getList("username");
+        final Map<String, UsernameStatus> registeredUsernames;
+        try {
+            registeredUsernames = usernames == null ? Map.of() : m.getUsernameStatus(new HashSet<>(usernames));
         } catch (IOException e) {
             throw new IOErrorException("Unable to check if users are registered: "
                     + e.getMessage()
@@ -49,27 +76,51 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
         }
 
         // Output
-        if (outputWriter instanceof JsonWriter jsonWriter) {
-
-            var jsonUserStatuses = registered.entrySet().stream().map(entry -> {
-                final var number = entry.getValue().number();
-                final var uuid = entry.getValue().uuid();
-                return new JsonUserStatus(entry.getKey(), number, uuid == null ? null : uuid.toString(), uuid != null);
-            }).toList();
-
-            jsonWriter.write(jsonUserStatuses);
-        } else {
-            final var writer = (PlainTextWriter) outputWriter;
-
-            for (var entry : registered.entrySet()) {
-                final var userStatus = entry.getValue();
-                writer.println("{}: {}{}",
-                        entry.getKey(),
-                        userStatus.uuid() != null,
-                        userStatus.unrestrictedUnidentifiedAccess() ? " (unrestricted sealed sender)" : "");
+        switch (outputWriter) {
+            case JsonWriter writer -> {
+                var jsonUserStatuses = Stream.concat(registered.entrySet().stream().map(entry -> {
+                    final var number = entry.getValue().number();
+                    final var uuid = entry.getValue().uuid();
+                    return new JsonUserStatus(entry.getKey(),
+                            number,
+                            null,
+                            uuid == null ? null : uuid.toString(),
+                            uuid != null);
+                }), registeredUsernames.entrySet().stream().map(entry -> {
+                    final var username = entry.getValue().username();
+                    final var uuid = entry.getValue().uuid();
+                    return new JsonUserStatus(entry.getKey(),
+                            null,
+                            username,
+                            uuid == null ? null : uuid.toString(),
+                            uuid != null);
+                })).toList();
+                writer.write(jsonUserStatuses);
+            }
+            case PlainTextWriter writer -> {
+                for (var entry : registered.entrySet()) {
+                    final var userStatus = entry.getValue();
+                    writer.println("{}: {}{}",
+                            entry.getKey(),
+                            userStatus.uuid() != null,
+                            userStatus.unrestrictedUnidentifiedAccess() ? " (unrestricted sealed sender)" : "");
+                }
+                for (var entry : registeredUsernames.entrySet()) {
+                    final var userStatus = entry.getValue();
+                    writer.println("{}: {}{}",
+                            entry.getKey(),
+                            userStatus.uuid() != null,
+                            userStatus.unrestrictedUnidentifiedAccess() ? " (unrestricted sealed sender)" : "");
+                }
             }
         }
     }
 
-    private record JsonUserStatus(String recipient, String number, String uuid, boolean isRegistered) {}
+    private record JsonUserStatus(
+            String recipient,
+            @JsonInclude(JsonInclude.Include.NON_NULL) String number,
+            @JsonInclude(JsonInclude.Include.NON_NULL) String username,
+            String uuid,
+            boolean isRegistered
+    ) {}
 }
diff --git a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
index 31fc4caf..1ecc5aca 100644
--- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
@@ -5,16 +5,15 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
-import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.PendingAdminApprovalException;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
 import org.asamk.signal.util.SendMessageResultUtils;
-import org.freedesktop.dbus.exceptions.DBusExecutionException;
 
 import java.io.IOException;
 import java.util.Map;
@@ -34,7 +33,9 @@ public class JoinGroupCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final GroupInviteLinkUrl linkUrl;
         var uri = ns.getString("uri");
@@ -53,35 +54,38 @@ public class JoinGroupCommand implements JsonRpcLocalCommand {
         try {
             final var results = m.joinGroup(linkUrl);
             var newGroupId = results.first();
-            if (outputWriter instanceof JsonWriter writer) {
-                var jsonResults = SendMessageResultUtils.getJsonSendMessageResults(results.second().results());
-                if (!m.getGroup(newGroupId).isMember()) {
-                    writer.write(Map.of("timestamp",
-                            results.second().timestamp(),
-                            "results",
-                            jsonResults,
-                            "groupId",
-                            newGroupId.toBase64(),
-                            "onlyRequested",
-                            true));
-                } else {
-                    writer.write(Map.of("timestamp",
-                            results.second().timestamp(),
-                            "results",
-                            jsonResults,
-                            "groupId",
-                            newGroupId.toBase64()));
+            switch (outputWriter) {
+                case JsonWriter writer -> {
+                    var jsonResults = SendMessageResultUtils.getJsonSendMessageResults(results.second().results());
+                    if (!m.getGroup(newGroupId).isMember()) {
+                        writer.write(Map.of("timestamp",
+                                results.second().timestamp(),
+                                "results",
+                                jsonResults,
+                                "groupId",
+                                newGroupId.toBase64(),
+                                "onlyRequested",
+                                true));
+                    } else {
+                        writer.write(Map.of("timestamp",
+                                results.second().timestamp(),
+                                "results",
+                                jsonResults,
+                                "groupId",
+                                newGroupId.toBase64()));
+                    }
                 }
-            } else {
-                final var writer = (PlainTextWriter) outputWriter;
-                if (!m.getGroup(newGroupId).isMember()) {
-                    writer.println("Requested to join group \"{}\"", newGroupId.toBase64());
-                } else {
-                    writer.println("Joined group \"{}\"", newGroupId.toBase64());
+                case PlainTextWriter writer -> {
+                    if (!m.getGroup(newGroupId).isMember()) {
+                        writer.println("Requested to join group \"{}\"", newGroupId.toBase64());
+                    } else {
+                        writer.println("Joined group \"{}\"", newGroupId.toBase64());
+                    }
+                    var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.second()
+                            .results());
+                    SendMessageResultUtils.printSendMessageResultErrors(writer, errors);
+                    writer.println("{}", results.second().timestamp());
                 }
-                var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.second().results());
-                SendMessageResultUtils.printSendMessageResultErrors(writer, errors);
-                writer.println("{}", results.second().timestamp());
             }
         } catch (IOException e) {
             throw new IOErrorException("Failed to send message: "
@@ -89,11 +93,10 @@ public class JoinGroupCommand implements JsonRpcLocalCommand {
                     + " ("
                     + e.getClass().getSimpleName()
                     + ")", e);
-        } catch (DBusExecutionException e) {
-            throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
-                    .getSimpleName() + ")", e);
         } catch (InactiveGroupLinkException e) {
             throw new UserErrorException("Group link is not valid: " + e.getMessage());
+        } catch (PendingAdminApprovalException e) {
+            throw new UserErrorException("Pending admin approval: " + e.getMessage());
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
index ef33a6e8..5ce9daf4 100644
--- a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
@@ -5,23 +5,29 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.OutputType;
+import org.asamk.signal.Shutdown;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.jsonrpc.SignalJsonRpcDispatcherHandler;
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.api.ReceiveConfig;
+import org.asamk.signal.manager.MultiAccountManager;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
 import java.io.InputStreamReader;
+import java.nio.channels.Channels;
 import java.util.List;
 import java.util.function.Supplier;
 
-public class JsonRpcDispatcherCommand implements LocalCommand {
+import static org.asamk.signal.util.CommandUtil.getReceiveConfig;
 
-    private final static Logger logger = LoggerFactory.getLogger(JsonRpcDispatcherCommand.class);
+public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand {
+
+    private static final Logger logger = LoggerFactory.getLogger(JsonRpcDispatcherCommand.class);
 
     @Override
     public String getName() {
@@ -34,9 +40,16 @@ public class JsonRpcDispatcherCommand implements LocalCommand {
         subparser.addArgument("--ignore-attachments")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
+        subparser.addArgument("--ignore-stories")
+                .help("Don’t receive story messages from the server.")
+                .action(Arguments.storeTrue());
         subparser.addArgument("--send-read-receipts")
                 .help("Send read receipts for all incoming data messages (in addition to the default delivery receipts)")
                 .action(Arguments.storeTrue());
+        subparser.addArgument("--receive-mode")
+                .help("Specify when to start receiving messages.")
+                .type(Arguments.enumStringType(ReceiveMode.class))
+                .setDefault(ReceiveMode.ON_START);
     }
 
     @Override
@@ -46,17 +59,52 @@ public class JsonRpcDispatcherCommand implements LocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
-        final boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
-        final boolean sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
-        m.setReceiveConfig(new ReceiveConfig(ignoreAttachments, sendReadReceipts));
+        Shutdown.installHandler();
+        final var receiveMode = ns.<ReceiveMode>get("receive-mode");
+        final var receiveConfig = getReceiveConfig(ns);
+        m.setReceiveConfig(receiveConfig);
 
         final var jsonOutputWriter = (JsonWriter) outputWriter;
-        final Supplier<String> lineSupplier = IOUtils.getLineSupplier(new InputStreamReader(System.in,
-                IOUtils.getConsoleCharset()));
+        final var lineSupplier = getLineSupplier();
 
-        final var handler = new SignalJsonRpcDispatcherHandler(jsonOutputWriter, lineSupplier, false);
+        final var handler = new SignalJsonRpcDispatcherHandler(jsonOutputWriter,
+                lineSupplier,
+                receiveMode == ReceiveMode.MANUAL);
+        final var thread = Thread.currentThread();
+        Shutdown.registerShutdownListener(thread::interrupt);
         handler.handleConnection(m);
     }
+
+    @Override
+    public void handleCommand(
+            final Namespace ns,
+            final MultiAccountManager c,
+            final OutputWriter outputWriter
+    ) throws CommandException {
+        Shutdown.installHandler();
+        final var receiveMode = ns.<ReceiveMode>get("receive-mode");
+        final var receiveConfig = getReceiveConfig(ns);
+        c.getManagers().forEach(m -> m.setReceiveConfig(receiveConfig));
+        c.addOnManagerAddedHandler(m -> m.setReceiveConfig(receiveConfig));
+
+        final var jsonOutputWriter = (JsonWriter) outputWriter;
+        final var lineSupplier = getLineSupplier();
+
+        final var handler = new SignalJsonRpcDispatcherHandler(jsonOutputWriter,
+                lineSupplier,
+                receiveMode == ReceiveMode.MANUAL);
+        final var thread = Thread.currentThread();
+        Shutdown.registerShutdownListener(thread::interrupt);
+        handler.handleConnection(c);
+    }
+
+    private static Supplier<String> getLineSupplier() {
+        // Use FileChannel for stdin, because System.in is uninterruptible
+        final var stdInCh = Channels.newInputStream((new FileInputStream(FileDescriptor.in)).getChannel());
+        return IOUtils.getLineSupplier(new InputStreamReader(stdInCh, IOUtils.getConsoleCharset()));
+    }
 }
diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
index d87b97cd..212c3e87 100644
--- a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
@@ -18,9 +18,7 @@ public interface JsonRpcLocalCommand extends JsonRpcSingleCommand<Map<String, Ob
         return new TypeReference<>() {};
     }
 
-    default void handleCommand(
-            Map<String, Object> request, Manager m, JsonWriter jsonWriter
-    ) throws CommandException {
+    default void handleCommand(Map<String, Object> request, Manager m, JsonWriter jsonWriter) throws CommandException {
         Namespace commandNamespace = new JsonRpcNamespace(request == null ? Map.of() : request);
         handleCommand(commandNamespace, m, jsonWriter);
     }
diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java
index 6082f6c5..f14edeff 100644
--- a/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java
@@ -19,7 +19,9 @@ public interface JsonRpcMultiLocalCommand extends JsonRpcMultiCommand<Map<String
     }
 
     default void handleCommand(
-            Map<String, Object> request, MultiAccountManager c, JsonWriter jsonWriter
+            Map<String, Object> request,
+            MultiAccountManager c,
+            JsonWriter jsonWriter
     ) throws CommandException {
         Namespace commandNamespace = new JsonRpcNamespace(request == null ? Map.of() : request);
         handleCommand(commandNamespace, c, jsonWriter);
diff --git a/src/main/java/org/asamk/signal/commands/LinkCommand.java b/src/main/java/org/asamk/signal/commands/LinkCommand.java
index f49e0c24..7c29a3a9 100644
--- a/src/main/java/org/asamk/signal/commands/LinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java
@@ -18,7 +18,7 @@ import java.util.concurrent.TimeoutException;
 
 public class LinkCommand implements ProvisioningCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(LinkCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(LinkCommand.class);
 
     @Override
     public String getName() {
@@ -33,7 +33,9 @@ public class LinkCommand implements ProvisioningCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final ProvisioningManager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final ProvisioningManager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var writer = (PlainTextWriter) outputWriter;
 
diff --git a/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java b/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java
index 68b56f29..b9542934 100644
--- a/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java
@@ -23,15 +23,20 @@ public class ListAccountsCommand implements JsonRpcMultiLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter
+            final Namespace ns,
+            final MultiAccountManager c,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var accountNumbers = c.getAccountNumbers();
-        if (outputWriter instanceof JsonWriter jsonWriter) {
-            final var jsonAccounts = accountNumbers.stream().map(JsonAccount::new).toList();
-            jsonWriter.write(jsonAccounts);
-        } else if (outputWriter instanceof PlainTextWriter plainTextWriter) {
-            for (final var number : accountNumbers) {
-                plainTextWriter.println("Number: {}", number);
+        switch (outputWriter) {
+            case JsonWriter jsonWriter -> {
+                final var jsonAccounts = accountNumbers.stream().map(JsonAccount::new).toList();
+                jsonWriter.write(jsonAccounts);
+            }
+            case PlainTextWriter plainTextWriter -> {
+                for (final var number : accountNumbers) {
+                    plainTextWriter.println("Number: {}", number);
+                }
             }
         }
     }
diff --git a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
index 8fc6f2d1..81a1bcb1 100644
--- a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
@@ -5,9 +5,11 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.json.JsonContact;
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.storage.recipients.Contact;
-import org.asamk.signal.manager.storage.recipients.Profile;
+import org.asamk.signal.manager.api.Contact;
+import org.asamk.signal.manager.api.PhoneNumberSharingMode;
+import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
@@ -35,11 +37,19 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
                 .type(Boolean.class)
                 .help("Specify if only blocked or unblocked contacts should be shown (default: all contacts)");
         subparser.addArgument("--name").help("Find contacts with the given contact or profile name.");
+        subparser.addArgument("--detailed")
+                .action(Arguments.storeTrue())
+                .help("List the contacts with more details. If output=json, then this is always set");
+        subparser.addArgument("--internal")
+                .action(Arguments.storeTrue())
+                .help("Include internal information that's normally not user visible");
     }
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var allRecipients = Boolean.TRUE.equals(ns.getBoolean("all-recipients"));
         final var blocked = ns.getBoolean("blocked");
@@ -51,57 +61,110 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
                 recipientIdentifiers,
                 Optional.ofNullable(name));
 
-        if (outputWriter instanceof PlainTextWriter writer) {
-            for (var r : recipients) {
-                final var contact = r.getContact() == null ? Contact.newBuilder().build() : r.getContact();
-                final var profile = r.getProfile() == null ? Profile.newBuilder().build() : r.getProfile();
-                writer.println("Number: {} Name: {} Profile name: {} Blocked: {} Message expiration: {}",
-                        r.getAddress().getLegacyIdentifier(),
-                        contact.getName(),
-                        profile.getDisplayName(),
-                        contact.isBlocked(),
-                        contact.getMessageExpirationTime() == 0
-                                ? "disabled"
-                                : contact.getMessageExpirationTime() + "s");
-            }
-        } else {
-            final var writer = (JsonWriter) outputWriter;
-            final var jsonContacts = recipients.stream().map(r -> {
-                final var address = r.getAddress();
-                final var contact = r.getContact() == null ? Contact.newBuilder().build() : r.getContact();
-                return new JsonContact(address.number().orElse(null),
-                        address.uuid().map(UUID::toString).orElse(null),
-                        contact.getName(),
-                        contact.isBlocked(),
-                        contact.getMessageExpirationTime(),
-                        r.getProfile() == null
-                                ? null
-                                : new JsonContact.JsonProfile(r.getProfile().getLastUpdateTimestamp(),
-                                        r.getProfile().getGivenName(),
-                                        r.getProfile().getFamilyName(),
-                                        r.getProfile().getAbout(),
-                                        r.getProfile().getAboutEmoji(),
-                                        r.getProfile().getMobileCoinAddress() == null
-                                                ? null
-                                                : Base64.getEncoder()
-                                                        .encodeToString(r.getProfile().getMobileCoinAddress())));
-            }).toList();
+        final var detailed = Boolean.TRUE.equals(ns.getBoolean("detailed"));
+        final var internal = Boolean.TRUE.equals(ns.getBoolean("internal"));
 
-            writer.write(jsonContacts);
+        switch (outputWriter) {
+            case PlainTextWriter writer -> {
+                for (var r : recipients) {
+                    final var contact = r.getContact() == null ? Contact.newBuilder().build() : r.getContact();
+                    final var profile = r.getProfile() == null ? Profile.newBuilder().build() : r.getProfile();
+                    writer.println(
+                            "Number: {} ACI: {} Name: {} Profile name: {} Username: {} Color: {} Blocked: {} Message expiration: {}",
+                            r.getAddress().number().orElse(""),
+                            r.getAddress().aci().orElse(""),
+                            contact.getName(),
+                            profile.getDisplayName(),
+                            r.getAddress().username().orElse(""),
+                            Optional.ofNullable(contact.color()).orElse(""),
+                            contact.isBlocked(),
+                            contact.messageExpirationTime() == 0 ? "disabled" : contact.messageExpirationTime() + "s");
+                    if (detailed) {
+                        writer.indentedWriter()
+                                .println(
+                                        "PNI: {} Given name: {} Family name: {}, Nick name: {} Nick given name: {} Nick family name {} Note: {} Archived: {} Hidden: {} Profile sharing: {} About: {} About Emoji: {} Unregistered: {}",
+                                        r.getAddress().pni().orElse(""),
+                                        Optional.ofNullable(r.getContact().givenName()).orElse(""),
+                                        Optional.ofNullable(r.getContact().familyName()).orElse(""),
+                                        Optional.ofNullable(r.getContact().nickName()).orElse(""),
+                                        Optional.ofNullable(r.getContact().nickNameGivenName()).orElse(""),
+                                        Optional.ofNullable(r.getContact().nickNameFamilyName()).orElse(""),
+                                        Optional.ofNullable(r.getContact().note()).orElse(""),
+                                        r.getContact().isArchived(),
+                                        r.getContact().isHidden(),
+                                        r.getContact().isProfileSharingEnabled(),
+                                        Optional.ofNullable(r.getProfile().getAbout()).orElse(""),
+                                        Optional.ofNullable(r.getProfile().getAboutEmoji()).orElse(""),
+                                        r.getContact().unregisteredTimestamp() != null);
+                    }
+                    if (internal) {
+                        writer.indentedWriter()
+                                .println(
+                                        "Capabilities: {} Unidentified access mode: {} Shares number: {} Discoverable by number: {}",
+                                        r.getProfile().getCapabilities().stream().map(Enum::name).toList(),
+                                        Optional.ofNullable(r.getProfile().getUnidentifiedAccessMode()
+                                                == Profile.UnidentifiedAccessMode.UNKNOWN
+                                                ? null
+                                                : r.getProfile().getUnidentifiedAccessMode().name()).orElse(""),
+                                        r.getProfile().getPhoneNumberSharingMode() == null
+                                                ? ""
+                                                : String.valueOf(r.getProfile().getPhoneNumberSharingMode()
+                                                        == PhoneNumberSharingMode.EVERYBODY),
+                                        r.getDiscoverable() == null ? "" : String.valueOf(r.getDiscoverable()));
+                    }
+                }
+            }
+            case JsonWriter writer -> {
+                final var jsonContacts = recipients.stream().map(r -> {
+                    final var address = r.getAddress();
+                    final var contact = r.getContact() == null ? Contact.newBuilder().build() : r.getContact();
+                    final var jsonInternal = !internal
+                            ? null
+                            : new JsonContact.JsonInternal(r.getProfile()
+                                    .getCapabilities()
+                                    .stream()
+                                    .map(Enum::name)
+                                    .toList(),
+                                    r.getProfile().getUnidentifiedAccessMode() == Profile.UnidentifiedAccessMode.UNKNOWN
+                                            ? null
+                                            : r.getProfile().getUnidentifiedAccessMode().name(),
+                                    r.getProfile().getPhoneNumberSharingMode() == null
+                                            ? null
+                                            : r.getProfile().getPhoneNumberSharingMode()
+                                                    == PhoneNumberSharingMode.EVERYBODY,
+                                    r.getDiscoverable());
+                    return new JsonContact(address.number().orElse(null),
+                            address.uuid().map(UUID::toString).orElse(null),
+                            address.username().orElse(null),
+                            contact.getName(),
+                            contact.givenName(),
+                            contact.familyName(),
+                            contact.nickName(),
+                            contact.nickNameGivenName(),
+                            contact.nickNameFamilyName(),
+                            contact.note(),
+                            contact.color(),
+                            contact.isBlocked(),
+                            contact.isHidden(),
+                            contact.messageExpirationTime(),
+                            r.getContact().isProfileSharingEnabled(),
+                            r.getContact().unregisteredTimestamp() != null,
+                            r.getProfile() == null
+                                    ? null
+                                    : new JsonContact.JsonProfile(r.getProfile().getLastUpdateTimestamp(),
+                                            r.getProfile().getGivenName(),
+                                            r.getProfile().getFamilyName(),
+                                            r.getProfile().getAbout(),
+                                            r.getProfile().getAboutEmoji(),
+                                            r.getProfile().getAvatarUrlPath() != null,
+                                            r.getProfile().getMobileCoinAddress() == null
+                                                    ? null
+                                                    : Base64.getEncoder()
+                                                            .encodeToString(r.getProfile().getMobileCoinAddress())),
+                            jsonInternal);
+                }).toList();
+                writer.write(jsonContacts);
+            }
         }
     }
-
-    private record JsonContact(
-            String number, String uuid, String name, boolean isBlocked, int messageExpirationTime, JsonProfile profile
-    ) {
-
-        private record JsonProfile(
-                long lastUpdateTimestamp,
-                String givenName,
-                String familyName,
-                String about,
-                String aboutEmoji,
-                String mobileCoinAddress
-        ) {}
-    }
 }
diff --git a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
index 7920243e..e9b03a17 100644
--- a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
@@ -19,7 +19,7 @@ import java.util.List;
 
 public class ListDevicesCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(ListDevicesCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(ListDevicesCommand.class);
 
     @Override
     public String getName() {
@@ -33,7 +33,9 @@ public class ListDevicesCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         List<Device> devices;
         try {
@@ -42,21 +44,23 @@ public class ListDevicesCommand implements JsonRpcLocalCommand {
             throw new IOErrorException("Failed to get linked devices: " + e.getMessage(), e);
         }
 
-        if (outputWriter instanceof PlainTextWriter writer) {
-            for (var d : devices) {
-                writer.println("- Device {}{}:", d.id(), (d.isThisDevice() ? " (this device)" : ""));
-                writer.indent(w -> {
-                    w.println("Name: {}", d.name());
-                    w.println("Created: {}", DateUtils.formatTimestamp(d.created()));
-                    w.println("Last seen: {}", DateUtils.formatTimestamp(d.lastSeen()));
-                });
+        switch (outputWriter) {
+            case PlainTextWriter writer -> {
+                for (var d : devices) {
+                    writer.println("- Device {}{}:", d.id(), (d.isThisDevice() ? " (this device)" : ""));
+                    writer.indent(w -> {
+                        w.println("Name: {}", d.name());
+                        w.println("Created: {}", DateUtils.formatTimestamp(d.created()));
+                        w.println("Last seen: {}", DateUtils.formatTimestamp(d.lastSeen()));
+                    });
+                }
+            }
+            case JsonWriter writer -> {
+                final var jsonDevices = devices.stream()
+                        .map(d -> new JsonDevice(d.id(), d.name(), d.created(), d.lastSeen()))
+                        .toList();
+                writer.write(jsonDevices);
             }
-        } else {
-            final var writer = (JsonWriter) outputWriter;
-            final var jsonDevices = devices.stream()
-                    .map(d -> new JsonDevice(d.id(), d.name(), d.created(), d.lastSeen()))
-                    .toList();
-            writer.write(jsonDevices);
         }
     }
 
diff --git a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
index c08571f7..62bb4f14 100644
--- a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
@@ -7,7 +7,7 @@ import net.sourceforge.argparse4j.inf.Subparser;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.Group;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.asamk.signal.manager.api.RecipientAddress;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
@@ -21,7 +21,7 @@ import java.util.stream.Collectors;
 
 public class ListGroupsCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(ListGroupsCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(ListGroupsCommand.class);
 
     @Override
     public String getName() {
@@ -48,9 +48,7 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
                 .collect(Collectors.toSet());
     }
 
-    private static void printGroupPlainText(
-            PlainTextWriter writer, Group group, boolean detailed
-    ) {
+    private static void printGroupPlainText(PlainTextWriter writer, Group group, boolean detailed) {
         if (detailed) {
             final var groupInviteLink = group.groupInviteLinkUrl();
 
@@ -79,44 +77,46 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         var groups = m.getGroups();
 
         final var groupIdStrings = ns.<String>getList("group-id");
         final var groupIds = CommandUtil.getGroupIds(groupIdStrings);
-        if (groupIds.size() > 0) {
+        if (!groupIds.isEmpty()) {
             groups = groups.stream().filter(g -> groupIds.contains(g.groupId())).toList();
         }
 
-        if (outputWriter instanceof JsonWriter jsonWriter) {
+        switch (outputWriter) {
+            case JsonWriter jsonWriter -> {
+                var jsonGroups = groups.stream().map(group -> {
+                    final var groupInviteLink = group.groupInviteLinkUrl();
 
-            var jsonGroups = groups.stream().map(group -> {
-                final var groupInviteLink = group.groupInviteLinkUrl();
-
-                return new JsonGroup(group.groupId().toBase64(),
-                        group.title(),
-                        group.description(),
-                        group.isMember(),
-                        group.isBlocked(),
-                        group.messageExpirationTimer(),
-                        resolveJsonMembers(group.members()),
-                        resolveJsonMembers(group.pendingMembers()),
-                        resolveJsonMembers(group.requestingMembers()),
-                        resolveJsonMembers(group.adminMembers()),
-                        resolveJsonMembers(group.bannedMembers()),
-                        group.permissionAddMember().name(),
-                        group.permissionEditDetails().name(),
-                        group.permissionSendMessage().name(),
-                        groupInviteLink == null ? null : groupInviteLink.getUrl());
-            }).toList();
-
-            jsonWriter.write(jsonGroups);
-        } else {
-            final var writer = (PlainTextWriter) outputWriter;
-            boolean detailed = Boolean.TRUE.equals(ns.getBoolean("detailed"));
-            for (var group : groups) {
-                printGroupPlainText(writer, group, detailed);
+                    return new JsonGroup(group.groupId().toBase64(),
+                            group.title(),
+                            group.description(),
+                            group.isMember(),
+                            group.isBlocked(),
+                            group.messageExpirationTimer(),
+                            resolveJsonMembers(group.members()),
+                            resolveJsonMembers(group.pendingMembers()),
+                            resolveJsonMembers(group.requestingMembers()),
+                            resolveJsonMembers(group.adminMembers()),
+                            resolveJsonMembers(group.bannedMembers()),
+                            group.permissionAddMember().name(),
+                            group.permissionEditDetails().name(),
+                            group.permissionSendMessage().name(),
+                            groupInviteLink == null ? null : groupInviteLink.getUrl());
+                }).toList();
+                jsonWriter.write(jsonGroups);
+            }
+            case PlainTextWriter writer -> {
+                boolean detailed = Boolean.TRUE.equals(ns.getBoolean("detailed"));
+                for (var group : groups) {
+                    printGroupPlainText(writer, group, detailed);
+                }
             }
         }
     }
diff --git a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
index e281ff88..70b939d6 100644
--- a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
@@ -10,6 +10,7 @@ import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
 import org.asamk.signal.util.CommandUtil;
+import org.asamk.signal.util.DateUtils;
 import org.asamk.signal.util.Hex;
 import org.asamk.signal.util.Util;
 import org.slf4j.Logger;
@@ -21,7 +22,7 @@ import java.util.UUID;
 
 public class ListIdentitiesCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(ListIdentitiesCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(ListIdentitiesCommand.class);
 
     @Override
     public String getName() {
@@ -32,8 +33,8 @@ public class ListIdentitiesCommand implements JsonRpcLocalCommand {
         writer.println("{}: {} Added: {} Fingerprint: {} Safety Number: {}",
                 theirId.recipient().getLegacyIdentifier(),
                 theirId.trustLevel(),
-                theirId.dateAdded(),
-                Hex.toString(theirId.getFingerprint()),
+                DateUtils.formatTimestamp(theirId.dateAddedTimestamp()),
+                Hex.toString(theirId.fingerprint()),
                 Util.formatSafetyNumber(theirId.safetyNumber()));
     }
 
@@ -45,7 +46,9 @@ public class ListIdentitiesCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         var number = ns.getString("number");
 
@@ -56,28 +59,29 @@ public class ListIdentitiesCommand implements JsonRpcLocalCommand {
             identities = m.getIdentities(CommandUtil.getSingleRecipientIdentifier(number, m.getSelfNumber()));
         }
 
-        if (outputWriter instanceof PlainTextWriter writer) {
-            for (var id : identities) {
-                printIdentityFingerprint(writer, id);
+        switch (outputWriter) {
+            case PlainTextWriter writer -> {
+                for (var id : identities) {
+                    printIdentityFingerprint(writer, id);
+                }
+            }
+            case JsonWriter writer -> {
+                final var jsonIdentities = identities.stream().map(id -> {
+                    final var address = id.recipient();
+                    var safetyNumber = Util.formatSafetyNumber(id.safetyNumber());
+                    var scannableSafetyNumber = id.scannableSafetyNumber();
+                    return new JsonIdentity(address.number().orElse(null),
+                            address.uuid().map(UUID::toString).orElse(null),
+                            Hex.toString(id.fingerprint()),
+                            safetyNumber,
+                            scannableSafetyNumber == null
+                                    ? null
+                                    : Base64.getEncoder().encodeToString(scannableSafetyNumber),
+                            id.trustLevel().name(),
+                            id.dateAddedTimestamp());
+                }).toList();
+                writer.write(jsonIdentities);
             }
-        } else {
-            final var writer = (JsonWriter) outputWriter;
-            final var jsonIdentities = identities.stream().map(id -> {
-                final var address = id.recipient();
-                var safetyNumber = Util.formatSafetyNumber(id.safetyNumber());
-                var scannableSafetyNumber = id.scannableSafetyNumber();
-                return new JsonIdentity(address.number().orElse(null),
-                        address.uuid().map(UUID::toString).orElse(null),
-                        Hex.toString(id.getFingerprint()),
-                        safetyNumber,
-                        scannableSafetyNumber == null
-                                ? null
-                                : Base64.getEncoder().encodeToString(scannableSafetyNumber),
-                        id.trustLevel().name(),
-                        id.dateAdded().getTime());
-            }).toList();
-
-            writer.write(jsonIdentities);
         }
     }
 
diff --git a/src/main/java/org/asamk/signal/commands/ListStickerPacksCommand.java b/src/main/java/org/asamk/signal/commands/ListStickerPacksCommand.java
index 53f3f352..db081211 100644
--- a/src/main/java/org/asamk/signal/commands/ListStickerPacksCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListStickerPacksCommand.java
@@ -27,20 +27,25 @@ public class ListStickerPacksCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager c, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager c,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var stickerPacks = c.getStickerPacks();
-        if (outputWriter instanceof JsonWriter jsonWriter) {
-            final var jsonStickerPacks = stickerPacks.stream().map(JsonStickerPack::new).toList();
-            jsonWriter.write(jsonStickerPacks);
-        } else if (outputWriter instanceof PlainTextWriter plainTextWriter) {
-            for (final var sticker : stickerPacks) {
-                plainTextWriter.println("Pack {}: “{}” by “{}” has {} stickers. {}",
-                        Hex.toStringCondensed(sticker.packId().serialize()),
-                        sticker.title(),
-                        sticker.author(),
-                        sticker.stickers().size(),
-                        sticker.url().getUrl());
+        switch (outputWriter) {
+            case JsonWriter jsonWriter -> {
+                final var jsonStickerPacks = stickerPacks.stream().map(JsonStickerPack::new).toList();
+                jsonWriter.write(jsonStickerPacks);
+            }
+            case PlainTextWriter plainTextWriter -> {
+                for (final var sticker : stickerPacks) {
+                    plainTextWriter.println("Pack {}: “{}” by “{}” has {} stickers. {}",
+                            Hex.toStringCondensed(sticker.packId().serialize()),
+                            sticker.title(),
+                            sticker.author(),
+                            sticker.stickers().size(),
+                            sticker.url().getUrl());
+                }
             }
         }
     }
diff --git a/src/main/java/org/asamk/signal/commands/MessageRequestResponseType.java b/src/main/java/org/asamk/signal/commands/MessageRequestResponseType.java
new file mode 100644
index 00000000..280a1767
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/MessageRequestResponseType.java
@@ -0,0 +1,16 @@
+package org.asamk.signal.commands;
+
+enum MessageRequestResponseType {
+    ACCEPT {
+        @Override
+        public String toString() {
+            return "accept";
+        }
+    },
+    DELETE {
+        @Override
+        public String toString() {
+            return "delete";
+        }
+    }
+}
diff --git a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
index 201451ee..346398a5 100644
--- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
@@ -8,10 +8,10 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.LastGroupAdminException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.LastGroupAdminException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 import org.slf4j.Logger;
@@ -23,7 +23,7 @@ import static org.asamk.signal.util.SendMessageResultUtils.outputResult;
 
 public class QuitGroupCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(QuitGroupCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(QuitGroupCommand.class);
 
     @Override
     public String getName() {
@@ -44,7 +44,9 @@ public class QuitGroupCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var groupId = CommandUtil.getGroupId(ns.getString("group-id"));
 
diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index 68292557..37da35e1 100644
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -1,15 +1,20 @@
 package org.asamk.signal.commands;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.OutputType;
 import org.asamk.signal.ReceiveMessageHandler;
+import org.asamk.signal.Shutdown;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.json.JsonReceiveMessageHandler;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.AlreadyReceivingException;
 import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
@@ -19,11 +24,13 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.time.Duration;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
-public class ReceiveCommand implements LocalCommand {
+public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommand<ReceiveCommand.ReceiveParams> {
 
-    private final static Logger logger = LoggerFactory.getLogger(ReceiveCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(ReceiveCommand.class);
 
     @Override
     public String getName() {
@@ -37,9 +44,16 @@ public class ReceiveCommand implements LocalCommand {
                 .type(double.class)
                 .setDefault(3.0)
                 .help("Number of seconds to wait for new messages (negative values disable timeout)");
+        subparser.addArgument("--max-messages")
+                .type(int.class)
+                .setDefault(-1)
+                .help("Maximum number of messages to receive, before returning.");
         subparser.addArgument("--ignore-attachments")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
+        subparser.addArgument("--ignore-stories")
+                .help("Don’t receive story messages from the server.")
+                .action(Arguments.storeTrue());
         subparser.addArgument("--send-read-receipts")
                 .help("Send read receipts for all incoming data messages (in addition to the default delivery receipts)")
                 .action(Arguments.storeTrue());
@@ -52,22 +66,60 @@ public class ReceiveCommand implements LocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
-        double timeout = ns.getDouble("timeout");
-        boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
-        boolean sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
-        m.setReceiveConfig(new ReceiveConfig(ignoreAttachments, sendReadReceipts));
+        Shutdown.installHandler();
+        final var timeout = ns.getDouble("timeout");
+        final var maxMessagesRaw = ns.getInt("max-messages");
+        final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
+        final var ignoreStories = Boolean.TRUE.equals(ns.getBoolean("ignore-stories"));
+        final var sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
+        m.setReceiveConfig(new ReceiveConfig(ignoreAttachments, ignoreStories, sendReadReceipts));
         try {
-            final var handler = outputWriter instanceof JsonWriter ? new JsonReceiveMessageHandler(m,
-                    (JsonWriter) outputWriter) : new ReceiveMessageHandler(m, (PlainTextWriter) outputWriter);
-            if (timeout < 0) {
-                m.receiveMessages(handler);
-            } else {
-                m.receiveMessages(Duration.ofMillis((long) (timeout * 1000)), handler);
-            }
+            final var handler = switch (outputWriter) {
+                case JsonWriter writer -> new JsonReceiveMessageHandler(m, writer);
+                case PlainTextWriter writer -> new ReceiveMessageHandler(m, writer);
+            };
+            final var duration = timeout < 0 ? null : Duration.ofMillis((long) (timeout * 1000));
+            final var maxMessages = maxMessagesRaw < 0 ? null : maxMessagesRaw;
+            Shutdown.registerShutdownListener(m::stopReceiveMessages);
+            m.receiveMessages(Optional.ofNullable(duration), Optional.ofNullable(maxMessages), handler);
         } catch (IOException e) {
             throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e);
+        } catch (AlreadyReceivingException e) {
+            throw new UserErrorException("Receive command cannot be used if messages are already being received.", e);
         }
     }
+
+    @Override
+    public TypeReference<ReceiveParams> getRequestType() {
+        return new TypeReference<>() {};
+    }
+
+    @Override
+    public void handleCommand(
+            final ReceiveParams request,
+            final Manager m,
+            final JsonWriter jsonWriter
+    ) throws CommandException {
+        final var timeout = request.timeout() == null ? 3.0 : request.timeout();
+        final var maxMessagesRaw = request.maxMessages() == null ? -1 : request.maxMessages();
+
+        try {
+            final var messages = new ArrayList<>();
+            final var handler = new JsonReceiveMessageHandler(m, messages::add);
+            final var duration = timeout < 0 ? null : Duration.ofMillis((long) (timeout * 1000));
+            final var maxMessages = maxMessagesRaw < 0 ? null : maxMessagesRaw;
+            m.receiveMessages(Optional.ofNullable(duration), Optional.ofNullable(maxMessages), handler);
+            jsonWriter.write(messages);
+        } catch (IOException e) {
+            throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e);
+        } catch (AlreadyReceivingException e) {
+            throw new UserErrorException("Receive command cannot be used if messages are already being received.", e);
+        }
+    }
+
+    public record ReceiveParams(Double timeout, Integer maxMessages) {}
 }
diff --git a/src/main/java/org/asamk/signal/commands/RegisterCommand.java b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
index 4415bb18..e51129b6 100644
--- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
@@ -9,11 +9,15 @@ import net.sourceforge.argparse4j.inf.Subparser;
 import org.asamk.signal.OutputType;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.RateLimitErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.util.CommandUtil;
 
 import java.io.IOException;
 import java.util.List;
@@ -33,14 +37,18 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
                 .action(Arguments.storeTrue());
         subparser.addArgument("--captcha")
                 .help("The captcha token, required if registration failed with a captcha required error.");
+        subparser.addArgument("--reregister")
+                .action(Arguments.storeTrue())
+                .help("Register even if account is already registered");
     }
 
     @Override
     public void handleCommand(final Namespace ns, final RegistrationManager m) throws CommandException {
         final boolean voiceVerification = Boolean.TRUE.equals(ns.getBoolean("voice"));
         final var captcha = ns.getString("captcha");
+        final var reregister = Boolean.TRUE.equals(ns.getBoolean("reregister"));
 
-        register(m, voiceVerification, captcha);
+        register(m, voiceVerification, captcha, reregister);
     }
 
     @Override
@@ -55,34 +63,40 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
 
     @Override
     public void handleCommand(
-            final RegistrationParams request, final RegistrationManager m, final JsonWriter jsonWriter
+            final RegistrationParams request,
+            final RegistrationManager m,
+            final JsonWriter jsonWriter
     ) throws CommandException {
-        register(m, Boolean.TRUE.equals(request.voice()), request.captcha());
+        register(m, Boolean.TRUE.equals(request.voice()), request.captcha(), Boolean.TRUE.equals(request.reregister()));
     }
 
     private void register(
-            final RegistrationManager m, final boolean voiceVerification, final String captcha
-    ) throws UserErrorException, IOErrorException {
+            final RegistrationManager m,
+            final boolean voiceVerification,
+            final String captcha,
+            final boolean reregister
+    ) throws CommandException {
         try {
-            m.register(voiceVerification, captcha);
+            m.register(voiceVerification, captcha, reregister);
+        } catch (RateLimitException e) {
+            final var message = CommandUtil.getRateLimitMessage(e);
+            throw new RateLimitErrorException(message, e);
         } catch (CaptchaRequiredException e) {
-            String message;
-            if (captcha == null) {
-                message = """
-                          Captcha required for verification, use --captcha CAPTCHA
-                          To get the token, go to https://signalcaptchas.org/registration/generate.html
-                          Check the developer tools (F12) console for a failed redirect to signalcaptcha://
-                          Everything after signalcaptcha:// is the captcha token.""";
-            } else {
-                message = "Invalid captcha given.";
-            }
+            final var message = CommandUtil.getCaptchaRequiredMessage(e, captcha != null);
             throw new UserErrorException(message);
         } catch (NonNormalizedPhoneNumberException e) {
             throw new UserErrorException("Failed to register: " + e.getMessage(), e);
         } catch (IOException e) {
-            throw new IOErrorException("Request verify error: " + e.getMessage(), e);
+            throw new IOErrorException("Failed to register: %s (%s)".formatted(e.getMessage(),
+                    e.getClass().getSimpleName()), e);
+        } catch (VerificationMethodNotAvailableException e) {
+            throw new UserErrorException("Failed to register: " + e.getMessage() + (
+                    voiceVerification
+                            ? ": Before requesting voice verification you need to request SMS verification and wait a minute."
+                            : ""
+            ), e);
         }
     }
 
-    record RegistrationParams(Boolean voice, String captcha) {}
+    public record RegistrationParams(Boolean voice, String captcha, Boolean reregister) {}
 }
diff --git a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
index 85d2dcd4..aafeb422 100644
--- a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
@@ -8,9 +8,9 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 
@@ -34,21 +34,26 @@ public class RemoteDeleteCommand implements JsonRpcLocalCommand {
                 .help("Specify the timestamp of the message to delete.");
         subparser.addArgument("-g", "--group-id", "--group").help("Specify the recipient group ID.").nargs("*");
         subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*");
+        subparser.addArgument("-u", "--username").help("Specify the recipient username or username link.").nargs("*");
         subparser.addArgument("--note-to-self").action(Arguments.storeTrue());
     }
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self"));
         final var recipientStrings = ns.<String>getList("recipient");
+        final var usernameStrings = ns.<String>getList("username");
         final var groupIdStrings = ns.<String>getList("group-id");
 
         final var recipientIdentifiers = CommandUtil.getRecipientIdentifiers(m,
                 isNoteToSelf,
                 recipientStrings,
-                groupIdStrings);
+                groupIdStrings,
+                usernameStrings);
 
         final long targetTimestamp = ns.getLong("target-timestamp");
 
diff --git a/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java b/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java
index c4a3d7d8..253cb7ad 100644
--- a/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java
@@ -20,20 +20,29 @@ public class RemoveContactCommand implements JsonRpcLocalCommand {
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Remove the details of a given contact");
         subparser.addArgument("recipient").help("Contact number");
-        subparser.addArgument("--forget")
+        final var mut = subparser.addMutuallyExclusiveGroup();
+        mut.addArgument("--hide")
+                .action(Arguments.storeTrue())
+                .help("Hide the contact in the contact list, but keep the data.");
+        mut.addArgument("--forget")
                 .action(Arguments.storeTrue())
                 .help("Delete all data associated with this contact, including identity keys and sessions.");
     }
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         var recipientString = ns.getString("recipient");
         var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber());
 
+        var hide = Boolean.TRUE == ns.getBoolean("hide");
         var forget = Boolean.TRUE == ns.getBoolean("forget");
-        if (forget) {
+        if (hide) {
+            m.hideRecipient(recipient);
+        } else if (forget) {
             m.deleteRecipient(recipient);
         } else {
             m.deleteContact(recipient);
diff --git a/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java b/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
index 24b3f81e..eab0a6be 100644
--- a/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
@@ -5,7 +5,9 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.output.OutputWriter;
 
 import java.io.IOException;
@@ -28,11 +30,15 @@ public class RemoveDeviceCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         try {
             final var deviceId = ns.getInt("device-id");
             m.removeLinkedDevices(deviceId);
+        } catch (NotPrimaryDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");
         } catch (IOException e) {
             throw new IOErrorException("Error while removing device: " + e.getMessage(), e);
         }
diff --git a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
index 8085bc65..bc55f9d2 100644
--- a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
@@ -27,7 +27,9 @@ public class RemovePinCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         try {
             m.setRegistrationLockPin(Optional.empty());
diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index ae324c84..98051b23 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -9,13 +9,14 @@ import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.api.InvalidStickerException;
 import org.asamk.signal.manager.api.Message;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.RecipientIdentifier;
+import org.asamk.signal.manager.api.TextStyle;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 import org.asamk.signal.util.Hex;
@@ -34,7 +35,7 @@ import static org.asamk.signal.util.SendMessageResultUtils.outputResult;
 
 public class SendCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(SendCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(SendCommand.class);
 
     @Override
     public String getName() {
@@ -46,22 +47,39 @@ public class SendCommand implements JsonRpcLocalCommand {
         subparser.help("Send a message to another user or group.");
         subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*");
         subparser.addArgument("-g", "--group-id", "--group").help("Specify the recipient group ID.").nargs("*");
+        subparser.addArgument("-u", "--username").help("Specify the recipient username or username link.").nargs("*");
         subparser.addArgument("--note-to-self")
                 .help("Send the message to self without notification.")
                 .action(Arguments.storeTrue());
+        subparser.addArgument("--notify-self")
+                .help("If self is part of recipients/groups send a normal message, not a sync message.")
+                .action(Arguments.storeTrue());
 
         var mut = subparser.addMutuallyExclusiveGroup();
         mut.addArgument("-m", "--message").help("Specify the message to be sent.");
         mut.addArgument("--message-from-stdin")
                 .action(Arguments.storeTrue())
                 .help("Read the message from standard input.");
-        subparser.addArgument("-a", "--attachment").nargs("*").help("Add file as attachment");
+
+        subparser.addArgument("-a", "--attachment")
+                .nargs("*")
+                .help("Add an attachment. "
+                        + "Can be either a file path or a data URI. Data URI encoded attachments must follow the RFC 2397. Additionally a file name can be added, e.g. "
+                        + "data:<MIME-TYPE>;filename=<FILENAME>;base64,<BASE64 ENCODED DATA>.");
+        subparser.addArgument("--view-once")
+                .action(Arguments.storeTrue())
+                .help("Send the message as a view once message");
         subparser.addArgument("-e", "--end-session", "--endsession")
                 .help("Clear session state and send end session message.")
                 .action(Arguments.storeTrue());
         subparser.addArgument("--mention")
                 .nargs("*")
-                .help("Mention another group member (syntax: start:length:recipientNumber)");
+                .help("Mention another group member (syntax: start:length:recipientNumber). "
+                        + "Unit of start and length is UTF-16 code units, NOT Unicode code points.");
+        subparser.addArgument("--text-style")
+                .nargs("*")
+                .help("Style parts of the message text (syntax: start:length:STYLE). "
+                        + "Unit of start and length is UTF-16 code units, NOT Unicode code points.");
         subparser.addArgument("--quote-timestamp")
                 .type(long.class)
                 .help("Specify the timestamp of a previous message with the recipient or group to add a quote to the new message.");
@@ -70,26 +88,44 @@ public class SendCommand implements JsonRpcLocalCommand {
         subparser.addArgument("--quote-mention")
                 .nargs("*")
                 .help("Quote with mention of another group member (syntax: start:length:recipientNumber)");
+        subparser.addArgument("--quote-attachment")
+                .nargs("*")
+                .help("Specify the attachments of the original message (syntax: contentType[:filename[:previewFile]]), e.g. 'audio/aac' or 'image/png:test.png:/tmp/preview.jpg'.");
+        subparser.addArgument("--quote-text-style")
+                .nargs("*")
+                .help("Quote with style parts of the message text (syntax: start:length:STYLE)");
         subparser.addArgument("--sticker").help("Send a sticker (syntax: stickerPackId:stickerId)");
         subparser.addArgument("--preview-url")
                 .help("Specify the url for the link preview (the same url must also appear in the message body).");
         subparser.addArgument("--preview-title").help("Specify the title for the link preview (mandatory).");
         subparser.addArgument("--preview-description").help("Specify the description for the link preview (optional).");
         subparser.addArgument("--preview-image").help("Specify the image file for the link preview (optional).");
+        subparser.addArgument("--story-timestamp")
+                .type(long.class)
+                .help("Specify the timestamp of a story to reply to.");
+        subparser.addArgument("--story-author").help("Specify the number of the author of the story.");
+        subparser.addArgument("--edit-timestamp")
+                .type(long.class)
+                .help("Specify the timestamp of a previous message with the recipient or group to send an edited message.");
     }
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
+        final var notifySelf = Boolean.TRUE.equals(ns.getBoolean("notify-self"));
         final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self"));
         final var recipientStrings = ns.<String>getList("recipient");
         final var groupIdStrings = ns.<String>getList("group-id");
+        final var usernameStrings = ns.<String>getList("username");
 
         final var recipientIdentifiers = CommandUtil.getRecipientIdentifiers(m,
                 isNoteToSelf,
                 recipientStrings,
-                groupIdStrings);
+                groupIdStrings,
+                usernameStrings);
 
         final var isEndSession = Boolean.TRUE.equals(ns.getBoolean("end-session"));
         if (isEndSession) {
@@ -116,46 +152,69 @@ public class SendCommand implements JsonRpcLocalCommand {
 
         var messageText = ns.getString("message");
         final var readMessageFromStdin = ns.getBoolean("message-from-stdin") == Boolean.TRUE;
-        if (readMessageFromStdin || (messageText == null && sticker == null)) {
+        if (readMessageFromStdin) {
             logger.debug("Reading message from stdin...");
             try {
                 messageText = IOUtils.readAll(System.in, IOUtils.getConsoleCharset());
             } catch (IOException e) {
                 throw new UserErrorException("Failed to read message from stdin: " + e.getMessage());
             }
+        } else if (messageText == null) {
+            messageText = "";
         }
 
-        List<String> attachments = ns.getList("attachment");
+        var attachments = ns.<String>getList("attachment");
         if (attachments == null) {
             attachments = List.of();
         }
+        final var viewOnce = Boolean.TRUE.equals(ns.getBoolean("view-once"));
 
-        List<String> mentionStrings = ns.getList("mention");
-        final var mentions = mentionStrings == null ? List.<Message.Mention>of() : parseMentions(m, mentionStrings);
+        final var selfNumber = m.getSelfNumber();
+
+        final var mentionStrings = ns.<String>getList("mention");
+        final var mentions = mentionStrings == null
+                ? List.<Message.Mention>of()
+                : parseMentions(selfNumber, mentionStrings);
+
+        final var textStyleStrings = ns.<String>getList("text-style");
+        final var textStyles = textStyleStrings == null ? List.<TextStyle>of() : parseTextStyles(textStyleStrings);
 
         final Message.Quote quote;
         final var quoteTimestamp = ns.getLong("quote-timestamp");
         if (quoteTimestamp != null) {
             final var quoteAuthor = ns.getString("quote-author");
+            if (quoteAuthor == null) {
+                throw new UserErrorException("Quote author parameter is missing");
+            }
             final var quoteMessage = ns.getString("quote-message");
-            List<String> quoteMentionStrings = ns.getList("quote-mention");
+            final var quoteMentionStrings = ns.<String>getList("quote-mention");
             final var quoteMentions = quoteMentionStrings == null
                     ? List.<Message.Mention>of()
-                    : parseMentions(m, quoteMentionStrings);
+                    : parseMentions(selfNumber, quoteMentionStrings);
+            final var quoteTextStyleStrings = ns.<String>getList("quote-text-style");
+            final var quoteAttachmentStrings = ns.<String>getList("quote-attachment");
+            final var quoteTextStyles = quoteTextStyleStrings == null
+                    ? List.<TextStyle>of()
+                    : parseTextStyles(quoteTextStyleStrings);
+            final var quoteAttachments = quoteAttachmentStrings == null
+                    ? List.<Message.Quote.Attachment>of()
+                    : parseQuoteAttachments(quoteAttachmentStrings);
             quote = new Message.Quote(quoteTimestamp,
-                    CommandUtil.getSingleRecipientIdentifier(quoteAuthor, m.getSelfNumber()),
+                    CommandUtil.getSingleRecipientIdentifier(quoteAuthor, selfNumber),
                     quoteMessage == null ? "" : quoteMessage,
-                    quoteMentions);
+                    quoteMentions,
+                    quoteTextStyles,
+                    quoteAttachments);
         } else {
             quote = null;
         }
 
         final List<Message.Preview> previews;
-        String previewUrl = ns.getString("preview-url");
+        final var previewUrl = ns.getString("preview-url");
         if (previewUrl != null) {
-            String previewTitle = ns.getString("preview-title");
-            String previewDescription = ns.getString("preview-description");
-            String previewImage = ns.getString("preview-image");
+            final var previewTitle = ns.getString("preview-title");
+            final var previewDescription = ns.getString("preview-description");
+            final var previewImage = ns.getString("preview-image");
             previews = List.of(new Message.Preview(previewUrl,
                     Optional.ofNullable(previewTitle).orElse(""),
                     Optional.ofNullable(previewDescription).orElse(""),
@@ -164,17 +223,46 @@ public class SendCommand implements JsonRpcLocalCommand {
             previews = List.of();
         }
 
+        final Message.StoryReply storyReply;
+        final var storyReplyTimestamp = ns.getLong("story-timestamp");
+        if (storyReplyTimestamp != null) {
+            final var storyAuthor = ns.getString("story-author");
+            storyReply = new Message.StoryReply(storyReplyTimestamp,
+                    CommandUtil.getSingleRecipientIdentifier(storyAuthor, selfNumber));
+        } else {
+            storyReply = null;
+        }
+
+        if (messageText.isEmpty() && attachments.isEmpty() && sticker == null && quote == null) {
+            throw new UserErrorException(
+                    "Sending empty message is not allowed, either a message, attachment or sticker must be given.");
+        }
+
+        final var editTimestamp = ns.getLong("edit-timestamp");
+
         try {
-            var results = m.sendMessage(new Message(messageText == null ? "" : messageText,
+            final var message = new Message(messageText,
                     attachments,
+                    viewOnce,
                     mentions,
                     Optional.ofNullable(quote),
                     Optional.ofNullable(sticker),
-                    previews), recipientIdentifiers);
+                    previews,
+                    Optional.ofNullable((storyReply)),
+                    textStyles);
+            var results = editTimestamp != null
+                    ? m.sendEditMessage(message, recipientIdentifiers, editTimestamp)
+                    : m.sendMessage(message, recipientIdentifiers, notifySelf);
             outputResult(outputWriter, results);
         } catch (AttachmentInvalidException | IOException e) {
-            throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
-                    .getSimpleName() + ")", e);
+            if (e instanceof IOException io && io.getMessage().contains("No prekeys available")) {
+                throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
+                        .getSimpleName() + "), maybe one of the devices of the recipient wasn't online for a while.",
+                        e);
+            } else {
+                throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
+                        .getSimpleName() + ")", e);
+            }
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
             throw new UserErrorException(e.getMessage());
         } catch (UnregisteredRecipientException e) {
@@ -185,26 +273,50 @@ public class SendCommand implements JsonRpcLocalCommand {
     }
 
     private List<Message.Mention> parseMentions(
-            final Manager m, final List<String> mentionStrings
+            final String selfNumber,
+            final List<String> mentionStrings
     ) throws UserErrorException {
-        List<Message.Mention> mentions;
-        final Pattern mentionPattern = Pattern.compile("(\\d+):(\\d+):(.+)");
-        mentions = new ArrayList<>();
+        final var mentionPattern = Pattern.compile("(\\d+):(\\d+):(.+)");
+        final var mentions = new ArrayList<Message.Mention>();
         for (final var mention : mentionStrings) {
             final var matcher = mentionPattern.matcher(mention);
             if (!matcher.matches()) {
                 throw new UserErrorException("Invalid mention syntax ("
                         + mention
-                        + ") expected 'start:end:recipientNumber'");
+                        + ") expected 'start:length:recipientNumber'");
             }
-            mentions.add(new Message.Mention(CommandUtil.getSingleRecipientIdentifier(matcher.group(3),
-                    m.getSelfNumber()), Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2))));
+            mentions.add(new Message.Mention(CommandUtil.getSingleRecipientIdentifier(matcher.group(3), selfNumber),
+                    Integer.parseInt(matcher.group(1)),
+                    Integer.parseInt(matcher.group(2))));
         }
         return mentions;
     }
 
+    private List<TextStyle> parseTextStyles(
+            final List<String> textStylesStrings
+    ) throws UserErrorException {
+        final var textStylePattern = Pattern.compile("(\\d+):(\\d+):(.+)");
+        final var textStyles = new ArrayList<TextStyle>();
+        for (final var textStyle : textStylesStrings) {
+            final var matcher = textStylePattern.matcher(textStyle);
+            if (!matcher.matches()) {
+                throw new UserErrorException("Invalid textStyle syntax ("
+                        + textStyle
+                        + ") expected 'start:length:STYLE'");
+            }
+            final var style = TextStyle.Style.from(matcher.group(3));
+            if (style == null) {
+                throw new UserErrorException("Invalid style: " + matcher.group(3));
+            }
+            textStyles.add(new TextStyle(style,
+                    Integer.parseInt(matcher.group(1)),
+                    Integer.parseInt(matcher.group(2))));
+        }
+        return textStyles;
+    }
+
     private Message.Sticker parseSticker(final String stickerString) throws UserErrorException {
-        final Pattern stickerPattern = Pattern.compile("([\\da-f]+):(\\d+)");
+        final var stickerPattern = Pattern.compile("([\\da-f]+):(\\d+)");
         final var matcher = stickerPattern.matcher(stickerString);
         if (!matcher.matches() || matcher.group(1).length() % 2 != 0) {
             throw new UserErrorException("Invalid sticker syntax ("
@@ -213,4 +325,21 @@ public class SendCommand implements JsonRpcLocalCommand {
         }
         return new Message.Sticker(Hex.toByteArray(matcher.group(1)), Integer.parseInt(matcher.group(2)));
     }
+
+    private List<Message.Quote.Attachment> parseQuoteAttachments(
+            final List<String> attachmentStrings
+    ) throws UserErrorException {
+        final var attachmentPattern = Pattern.compile("([^:]+)(:([^:]+)(:(.+))?)?");
+        final var attachments = new ArrayList<Message.Quote.Attachment>();
+        for (final var attachment : attachmentStrings) {
+            final var matcher = attachmentPattern.matcher(attachment);
+            if (!matcher.matches()) {
+                throw new UserErrorException("Invalid attachment syntax ("
+                        + attachment
+                        + ") expected 'contentType[:filename[:previewFile]]'");
+            }
+            attachments.add(new Message.Quote.Attachment(matcher.group(1), matcher.group(3), matcher.group(5)));
+        }
+        return attachments;
+    }
 }
diff --git a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
index a5128937..a67950c1 100644
--- a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
@@ -24,7 +24,9 @@ public class SendContactsCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         try {
             m.sendContacts();
diff --git a/src/main/java/org/asamk/signal/commands/SendMessageRequestResponseCommand.java b/src/main/java/org/asamk/signal/commands/SendMessageRequestResponseCommand.java
new file mode 100644
index 00000000..732fd749
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/SendMessageRequestResponseCommand.java
@@ -0,0 +1,54 @@
+package org.asamk.signal.commands;
+
+import net.sourceforge.argparse4j.impl.Arguments;
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.MessageEnvelope.Sync.MessageRequestResponse.Type;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.util.CommandUtil;
+
+public class SendMessageRequestResponseCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "sendMessageRequestResponse";
+    }
+
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
+        subparser.help("Send response to a message request to linked devices.");
+        subparser.addArgument("-g", "--group-id", "--group").help("Specify the recipient group ID.").nargs("*");
+        subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*");
+        subparser.addArgument("-u", "--username").help("Specify the recipient username or username link.").nargs("*");
+        subparser.addArgument("--type")
+                .help("Type of message request response")
+                .type(Arguments.enumStringType(MessageRequestResponseType.class))
+                .required(true);
+    }
+
+    @Override
+    public void handleCommand(
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
+    ) throws CommandException {
+        final var recipientStrings = ns.<String>getList("recipient");
+        final var groupIdStrings = ns.<String>getList("group-id");
+        final var usernameStrings = ns.<String>getList("username");
+        final var typeObj = ns.get("type");
+        final var type = typeObj instanceof MessageRequestResponseType t
+                ? t
+                : MessageRequestResponseType.valueOf(((String) typeObj).toUpperCase());
+
+        final var recipientIdentifiers = CommandUtil.getRecipientIdentifiers(m,
+                false,
+                recipientStrings,
+                groupIdStrings,
+                usernameStrings);
+        m.sendMessageRequestResponse(type == MessageRequestResponseType.ACCEPT ? Type.ACCEPT : Type.DELETE,
+                recipientIdentifiers);
+    }
+}
diff --git a/src/main/java/org/asamk/signal/commands/SendPaymentNotificationCommand.java b/src/main/java/org/asamk/signal/commands/SendPaymentNotificationCommand.java
index 77181e3e..0814658e 100644
--- a/src/main/java/org/asamk/signal/commands/SendPaymentNotificationCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendPaymentNotificationCommand.java
@@ -31,7 +31,9 @@ public class SendPaymentNotificationCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var recipientString = ns.getString("recipient");
         final var recipientIdentifier = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber());
diff --git a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
index f5b6a89d..a95a0b5a 100644
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -8,10 +8,11 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
+import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 
@@ -31,6 +32,7 @@ public class SendReactionCommand implements JsonRpcLocalCommand {
         subparser.help("Send reaction to a previously received or sent message.");
         subparser.addArgument("-g", "--group-id", "--group").help("Specify the recipient group ID.").nargs("*");
         subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*");
+        subparser.addArgument("-u", "--username").help("Specify the recipient username or username link.").nargs("*");
         subparser.addArgument("--note-to-self")
                 .help("Send the reaction to self without notification.")
                 .action(Arguments.storeTrue());
@@ -45,32 +47,49 @@ public class SendReactionCommand implements JsonRpcLocalCommand {
                 .type(long.class)
                 .help("Specify the timestamp of the message to which to react.");
         subparser.addArgument("-r", "--remove").help("Remove a reaction.").action(Arguments.storeTrue());
+        subparser.addArgument("--story")
+                .help("React to a story instead of a normal message")
+                .action(Arguments.storeTrue());
     }
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self"));
         final var recipientStrings = ns.<String>getList("recipient");
         final var groupIdStrings = ns.<String>getList("group-id");
+        final var usernameStrings = ns.<String>getList("username");
 
         final var recipientIdentifiers = CommandUtil.getRecipientIdentifiers(m,
                 isNoteToSelf,
                 recipientStrings,
-                groupIdStrings);
+                groupIdStrings,
+                usernameStrings);
 
         final var emoji = ns.getString("emoji");
         final var isRemove = Boolean.TRUE.equals(ns.getBoolean("remove"));
         final var targetAuthor = ns.getString("target-author");
         final var targetTimestamp = ns.getLong("target-timestamp");
+        final var isStory = Boolean.TRUE.equals(ns.getBoolean("story"));
 
+        final RecipientIdentifier.Single targetAuthorIdentifier;
+        if (targetAuthor == null && recipientIdentifiers.size() == 1 && recipientIdentifiers.stream()
+                .findFirst()
+                .get() instanceof RecipientIdentifier.Single single) {
+            targetAuthorIdentifier = single;
+        } else {
+            targetAuthorIdentifier = CommandUtil.getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber());
+        }
         try {
             final var results = m.sendMessageReaction(emoji,
                     isRemove,
-                    CommandUtil.getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber()),
+                    targetAuthorIdentifier,
                     targetTimestamp,
-                    recipientIdentifiers);
+                    recipientIdentifiers,
+                    isStory);
             outputResult(outputWriter, results);
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
             throw new UserErrorException(e.getMessage());
diff --git a/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java b/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java
index 1eec6c99..93c8a564 100644
--- a/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java
@@ -10,8 +10,6 @@ import org.asamk.signal.manager.api.SendMessageResults;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 
-import java.io.IOException;
-
 import static org.asamk.signal.util.SendMessageResultUtils.outputResult;
 
 public class SendReceiptCommand implements JsonRpcLocalCommand {
@@ -37,7 +35,9 @@ public class SendReceiptCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var recipientString = ns.getString("recipient");
         final var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber());
@@ -45,19 +45,14 @@ public class SendReceiptCommand implements JsonRpcLocalCommand {
         final var targetTimestamps = ns.<Long>getList("target-timestamp");
         final var type = ns.getString("type");
 
-        try {
-            final SendMessageResults results;
-            if (type == null || "read".equals(type)) {
-                results = m.sendReadReceipt(recipient, targetTimestamps);
-            } else if ("viewed".equals(type)) {
-                results = m.sendViewedReceipt(recipient, targetTimestamps);
-            } else {
-                throw new UserErrorException("Unknown receipt type: " + type);
-            }
-            outputResult(outputWriter, results);
-        } catch (IOException e) {
-            throw new UserErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
-                    .getSimpleName() + ")");
+        final SendMessageResults results;
+        if (type == null || "read".equals(type)) {
+            results = m.sendReadReceipt(recipient, targetTimestamps);
+        } else if ("viewed".equals(type)) {
+            results = m.sendViewedReceipt(recipient, targetTimestamps);
+        } else {
+            throw new UserErrorException("Unknown receipt type: " + type);
         }
+        outputResult(outputWriter, results);
     }
 }
diff --git a/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java b/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java
index 1f35ba2b..eda364c0 100644
--- a/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java
@@ -24,7 +24,9 @@ public class SendSyncRequestCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         try {
             m.requestAllSyncData();
diff --git a/src/main/java/org/asamk/signal/commands/SendTypingCommand.java b/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
index 4a2a038c..a9e699cc 100644
--- a/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
@@ -7,11 +7,11 @@ import net.sourceforge.argparse4j.inf.Subparser;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.TypingAction;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 
@@ -38,7 +38,9 @@ public class SendTypingCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var recipientStrings = ns.<String>getList("recipient");
         final var groupIdStrings = ns.<String>getList("group-id");
diff --git a/src/main/java/org/asamk/signal/commands/SetPinCommand.java b/src/main/java/org/asamk/signal/commands/SetPinCommand.java
index f6b5f7ad..4d4a458f 100644
--- a/src/main/java/org/asamk/signal/commands/SetPinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SetPinCommand.java
@@ -29,7 +29,9 @@ public class SetPinCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         try {
             var registrationLockPin = ns.getString("pin");
diff --git a/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java b/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java
new file mode 100644
index 00000000..c75b3077
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java
@@ -0,0 +1,73 @@
+package org.asamk.signal.commands;
+
+import net.sourceforge.argparse4j.impl.Arguments;
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.RateLimitErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.CaptchaRequiredException;
+import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.NotPrimaryDeviceException;
+import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.util.CommandUtil;
+
+import java.io.IOException;
+
+public class StartChangeNumberCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "startChangeNumber";
+    }
+
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
+        subparser.help("Change account to a new phone number with SMS or voice verification.");
+        subparser.addArgument("number").help("The new phone number in E164 format.").required(true);
+        subparser.addArgument("-v", "--voice")
+                .help("The verification should be done over voice, not SMS.")
+                .action(Arguments.storeTrue());
+        subparser.addArgument("--captcha")
+                .help("The captcha token, required if change number failed with a captcha required error.");
+    }
+
+    @Override
+    public void handleCommand(
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
+    ) throws CommandException {
+        final var newNumber = ns.getString("number");
+        final var voiceVerification = Boolean.TRUE.equals(ns.getBoolean("voice"));
+        final var captcha = ns.getString("captcha");
+
+        try {
+            m.startChangeNumber(newNumber, voiceVerification, captcha);
+        } catch (RateLimitException e) {
+            final var message = CommandUtil.getRateLimitMessage(e);
+            throw new RateLimitErrorException(message, e);
+        } catch (CaptchaRequiredException e) {
+            final var message = CommandUtil.getCaptchaRequiredMessage(e, captcha != null);
+            throw new UserErrorException(message);
+        } catch (NonNormalizedPhoneNumberException e) {
+            throw new UserErrorException("Failed to change number: " + e.getMessage(), e);
+        } catch (NotPrimaryDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");
+        } catch (IOException e) {
+            throw new IOErrorException("Failed to change number: %s (%s)".formatted(e.getMessage(),
+                    e.getClass().getSimpleName()), e);
+        } catch (VerificationMethodNotAvailableException e) {
+            throw new UserErrorException("Failed to register: " + e.getMessage() + (
+                    voiceVerification
+                            ? ": Before requesting voice verification you need to request SMS verification and wait a minute."
+                            : ""
+            ), e);
+        }
+    }
+}
diff --git a/src/main/java/org/asamk/signal/commands/StartLinkCommand.java b/src/main/java/org/asamk/signal/commands/StartLinkCommand.java
index 70e36f40..895b5dae 100644
--- a/src/main/java/org/asamk/signal/commands/StartLinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/StartLinkCommand.java
@@ -14,7 +14,7 @@ import java.util.concurrent.TimeoutException;
 
 public class StartLinkCommand implements JsonRpcMultiCommand<Void> {
 
-    private final static Logger logger = LoggerFactory.getLogger(StartLinkCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(StartLinkCommand.class);
 
     @Override
     public String getName() {
@@ -23,7 +23,9 @@ public class StartLinkCommand implements JsonRpcMultiCommand<Void> {
 
     @Override
     public void handleCommand(
-            final Void request, final MultiAccountManager m, final JsonWriter jsonWriter
+            final Void request,
+            final MultiAccountManager m,
+            final JsonWriter jsonWriter
     ) throws CommandException {
         final URI deviceLinkUri;
         try {
diff --git a/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java b/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java
index a5e07627..91c6fc67 100644
--- a/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java
@@ -5,7 +5,9 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.CaptchaRejectedException;
 import org.asamk.signal.output.OutputWriter;
 
 import java.io.IOException;
@@ -38,6 +40,9 @@ public class SubmitRateLimitChallengeCommand implements JsonRpcLocalCommand {
             m.submitRateLimitRecaptchaChallenge(challenge, captcha);
         } catch (IOException e) {
             throw new IOErrorException("Submit challenge error: " + e.getMessage(), e);
+        } catch (CaptchaRejectedException e) {
+            throw new UserErrorException(
+                    "Captcha rejected, it may be outdated, already used or solved from a different IP address.");
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/commands/TrustCommand.java b/src/main/java/org/asamk/signal/commands/TrustCommand.java
index 618655be..7f18507a 100644
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -7,13 +7,10 @@ import net.sourceforge.argparse4j.inf.Subparser;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.IdentityVerificationCode;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
-import org.asamk.signal.util.Hex;
-
-import java.util.Base64;
-import java.util.Locale;
 
 public class TrustCommand implements JsonRpcLocalCommand {
 
@@ -36,20 +33,22 @@ public class TrustCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
-        var recipentString = ns.getString("recipient");
-        var recipient = CommandUtil.getSingleRecipientIdentifier(recipentString, m.getSelfNumber());
+        var recipientString = ns.getString("recipient");
+        var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber());
         if (Boolean.TRUE.equals(ns.getBoolean("trust-all-known-keys"))) {
-            boolean res;
             try {
-                res = m.trustIdentityAllKeys(recipient);
+                final var res = m.trustIdentityAllKeys(recipient);
+                if (!res) {
+                    throw new UserErrorException(
+                            "Failed to set the trust for this number, make sure the number is correct.");
+                }
             } catch (UnregisteredRecipientException e) {
                 throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
             }
-            if (!res) {
-                throw new UserErrorException("Failed to set the trust for this number, make sure the number is correct.");
-            }
         } else {
             var safetyNumber = ns.getString("verified-safety-number");
             if (safetyNumber == null) {
@@ -57,54 +56,22 @@ public class TrustCommand implements JsonRpcLocalCommand {
                         "You need to specify the fingerprint/safety number you have verified with -v SAFETY_NUMBER");
             }
 
-            safetyNumber = safetyNumber.replaceAll(" ", "");
-            if (safetyNumber.length() == 66) {
-                byte[] fingerprintBytes;
-                try {
-                    fingerprintBytes = Hex.toByteArray(safetyNumber.toLowerCase(Locale.ROOT));
-                } catch (Exception e) {
-                    throw new UserErrorException(
-                            "Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");
-                }
-                boolean res;
-                try {
-                    res = m.trustIdentityVerified(recipient, fingerprintBytes);
-                } catch (UnregisteredRecipientException e) {
-                    throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
-                }
+            final IdentityVerificationCode verificationCode;
+            try {
+                verificationCode = IdentityVerificationCode.parse(safetyNumber);
+            } catch (Exception e) {
+                throw new UserErrorException(
+                        "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
+            }
+
+            try {
+                final var res = m.trustIdentityVerified(recipient, verificationCode);
                 if (!res) {
                     throw new UserErrorException(
-                            "Failed to set the trust for the fingerprint of this number, make sure the number and the fingerprint are correct.");
-                }
-            } else if (safetyNumber.length() == 60) {
-                boolean res;
-                try {
-                    res = m.trustIdentityVerifiedSafetyNumber(recipient, safetyNumber);
-                } catch (UnregisteredRecipientException e) {
-                    throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
-                }
-                if (!res) {
-                    throw new UserErrorException(
-                            "Failed to set the trust for the safety number of this phone number, make sure the phone number and the safety number are correct.");
-                }
-            } else {
-                final byte[] scannableSafetyNumber;
-                try {
-                    scannableSafetyNumber = Base64.getDecoder().decode(safetyNumber);
-                } catch (IllegalArgumentException e) {
-                    throw new UserErrorException(
-                            "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
-                }
-                boolean res;
-                try {
-                    res = m.trustIdentityVerifiedSafetyNumber(recipient, scannableSafetyNumber);
-                } catch (UnregisteredRecipientException e) {
-                    throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
-                }
-                if (!res) {
-                    throw new UserErrorException(
-                            "Failed to set the trust for the safety number of this phone number, make sure the phone number and the safety number are correct.");
+                            "Failed to set the trust for this number, make sure the number and the fingerprint/safety number are correct.");
                 }
+            } catch (UnregisteredRecipientException e) {
+                throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
             }
         }
     }
diff --git a/src/main/java/org/asamk/signal/commands/UnblockCommand.java b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
index 9ff018bb..a6b5e6b3 100644
--- a/src/main/java/org/asamk/signal/commands/UnblockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
@@ -7,9 +7,9 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.GroupNotFoundException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 import org.slf4j.Logger;
@@ -19,7 +19,7 @@ import java.io.IOException;
 
 public class UnblockCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(UnblockCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(UnblockCommand.class);
 
     @Override
     public String getName() {
@@ -35,7 +35,9 @@ public class UnblockCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var contacts = ns.<String>getList("recipient");
         final var recipients = CommandUtil.getSingleRecipientIdentifiers(contacts, m.getSelfNumber());
diff --git a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
index 83694953..e044f691 100644
--- a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
@@ -28,7 +28,9 @@ public class UnregisterCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         try {
             if (Boolean.TRUE.equals(ns.getBoolean("delete-account"))) {
diff --git a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
index 7fe70213..9c8c18b8 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
@@ -1,12 +1,19 @@
 package org.asamk.signal.commands;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.InvalidUsernameException;
+import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
 
 import java.io.IOException;
 
@@ -21,17 +28,71 @@ public class UpdateAccountCommand implements JsonRpcLocalCommand {
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Update the account attributes on the signal server.");
         subparser.addArgument("-n", "--device-name").help("Specify a name to describe this device.");
+        subparser.addArgument("--unrestricted-unidentified-sender")
+                .type(Boolean.class)
+                .help("Enable if anyone should be able to send you unidentified sender messages.");
+        subparser.addArgument("--discoverable-by-number")
+                .type(Boolean.class)
+                .help("Enable/disable if the account should be discoverable by phone number");
+        subparser.addArgument("--number-sharing")
+                .type(Boolean.class)
+                .help("Indicates if Signal should share its phone number when sending a message.");
+
+        var mut = subparser.addMutuallyExclusiveGroup();
+        mut.addArgument("-u", "--username").help("Specify a username that can then be used to contact this account.");
+        mut.addArgument("--delete-username")
+                .action(Arguments.storeTrue())
+                .help("Delete the username associated with this account.");
     }
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
-        var deviceName = ns.getString("device-name");
+        final var deviceName = ns.getString("device-name");
+        final var unrestrictedUnidentifiedSender = ns.getBoolean("unrestricted-unidentified-sender");
+        final var discoverableByNumber = ns.getBoolean("discoverable-by-number");
+        final var numberSharing = ns.getBoolean("number-sharing");
         try {
-            m.updateAccountAttributes(deviceName);
+            m.updateAccountAttributes(deviceName, unrestrictedUnidentifiedSender, discoverableByNumber, numberSharing);
         } catch (IOException e) {
             throw new IOErrorException("UpdateAccount error: " + e.getMessage(), e);
         }
+
+        final var username = ns.getString("username");
+        if (username != null) {
+            try {
+                m.setUsername(username);
+                final var newUsername = m.getUsername();
+                final var newUsernameLink = m.getUsernameLink();
+                switch (outputWriter) {
+                    case PlainTextWriter w -> w.println("Your new username: {} ({})",
+                            newUsername,
+                            newUsernameLink == null ? "-" : newUsernameLink.getUrl());
+                    case JsonWriter w -> w.write(new JsonAccountResponse(newUsername,
+                            newUsernameLink == null ? null : newUsernameLink.getUrl()));
+                }
+            } catch (IOException e) {
+                throw new IOErrorException("Failed to set username: " + e.getMessage(), e);
+            } catch (InvalidUsernameException e) {
+                throw new UserErrorException("Invalid username: " + e.getMessage(), e);
+            }
+        }
+
+        final var deleteUsername = Boolean.TRUE.equals(ns.getBoolean("delete-username"));
+        if (deleteUsername) {
+            try {
+                m.deleteUsername();
+            } catch (IOException e) {
+                throw new IOErrorException("Failed to delete username: " + e.getMessage(), e);
+            }
+        }
     }
+
+    private record JsonAccountResponse(
+            @JsonInclude(JsonInclude.Include.NON_NULL) String username,
+            @JsonInclude(JsonInclude.Include.NON_NULL) String usernameLink
+    ) {}
 }
diff --git a/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java b/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java
index 73bac056..03882e25 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java
@@ -4,14 +4,12 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.commands.exceptions.CommandException;
-import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.output.OutputWriter;
 
-import java.io.IOException;
 import java.util.Optional;
 
 public class UpdateConfigurationCommand implements JsonRpcLocalCommand {
@@ -40,7 +38,9 @@ public class UpdateConfigurationCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var readReceipts = ns.getBoolean("read-receipts");
         final var unidentifiedDeliveryIndicators = ns.getBoolean("unidentified-delivery-indicators");
@@ -51,8 +51,6 @@ public class UpdateConfigurationCommand implements JsonRpcLocalCommand {
                     Optional.ofNullable(unidentifiedDeliveryIndicators),
                     Optional.ofNullable(typingIndicators),
                     Optional.ofNullable(linkPreviews)));
-        } catch (IOException e) {
-            throw new IOErrorException("UpdateAccount error: " + e.getMessage(), e);
         } catch (NotPrimaryDeviceException e) {
             throw new UserErrorException("This command doesn't work on linked devices.");
         }
diff --git a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
index 7ff91e9b..312ac8e8 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
@@ -26,14 +26,19 @@ public class UpdateContactCommand implements JsonRpcLocalCommand {
         subparser.help("Update the details of a given contact");
         subparser.addArgument("recipient").help("Contact number");
         subparser.addArgument("-n", "--name").help("New contact name");
-        subparser.addArgument("--given-name").help("New contact given name");
-        subparser.addArgument("--family-name").help("New contact family name");
+        subparser.addArgument("--given-name").help("New system given name");
+        subparser.addArgument("--family-name").help("New system family name");
+        subparser.addArgument("--nick-given-name").help("New nick given name");
+        subparser.addArgument("--nick-family-name").help("New nick family name");
+        subparser.addArgument("--note").help("New note");
         subparser.addArgument("-e", "--expiration").type(int.class).help("Set expiration time of messages (seconds)");
     }
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         var recipientString = ns.getString("recipient");
         var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber());
@@ -52,8 +57,15 @@ public class UpdateContactCommand implements JsonRpcLocalCommand {
                     familyName = "";
                 }
             }
-            if (givenName != null || familyName != null) {
-                m.setContactName(recipient, givenName, familyName);
+            var nickGivenName = ns.getString("nick-given-name");
+            var nickFamilyName = ns.getString("nick-family-name");
+            var note = ns.getString("note");
+            if (givenName != null
+                    || familyName != null
+                    || nickGivenName != null
+                    || nickFamilyName != null
+                    || note != null) {
+                m.setContactName(recipient, givenName, familyName, nickGivenName, nickFamilyName, note);
             }
         } catch (IOException e) {
             throw new IOErrorException("Update contact error: " + e.getMessage(), e);
diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index 411ae747..1231d3d4 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -9,15 +9,15 @@ import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupLinkState;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupPermission;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.SendGroupMessageResults;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupLinkState;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupPermission;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
@@ -26,14 +26,13 @@ import org.asamk.signal.util.SendMessageResultUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.stream.Stream;
 
 public class UpdateGroupCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);
 
     @Override
     public String getName() {
@@ -103,7 +102,9 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var groupIdString = ns.getString("group-id");
         var groupId = CommandUtil.getGroupId(groupIdString);
@@ -131,9 +132,7 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand {
             SendGroupMessageResults groupMessageResults = null;
             if (groupId == null) {
                 isNewGroup = true;
-                var results = m.createGroup(groupName,
-                        groupMembers,
-                        groupAvatar == null ? null : new File(groupAvatar));
+                var results = m.createGroup(groupName, groupMembers, groupAvatar);
                 groupMessageResults = results.second();
                 groupId = results.first();
                 groupName = null;
@@ -155,7 +154,7 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand {
                             .withGroupLinkState(groupLinkState)
                             .withAddMemberPermission(groupAddMemberPermission)
                             .withEditDetailsPermission(groupEditDetailsPermission)
-                            .withAvatarFile(groupAvatar == null ? null : new File(groupAvatar))
+                            .withAvatarFile(groupAvatar)
                             .withExpirationTimer(groupExpiration)
                             .withIsAnnouncementGroup(groupSendMessagesPermission == null
                                     ? null
@@ -183,29 +182,33 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand {
     }
 
     private void outputResult(
-            final OutputWriter outputWriter, final SendGroupMessageResults results, final GroupId groupId
+            final OutputWriter outputWriter,
+            final SendGroupMessageResults results,
+            final GroupId groupId
     ) {
-        if (outputWriter instanceof PlainTextWriter writer) {
-            if (groupId != null) {
-                writer.println("Created new group: \"{}\"", groupId.toBase64());
+        switch (outputWriter) {
+            case PlainTextWriter writer -> {
+                if (groupId != null) {
+                    writer.println("Created new group: \"{}\"", groupId.toBase64());
+                }
+                if (results != null) {
+                    var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.results());
+                    SendMessageResultUtils.printSendMessageResultErrors(writer, errors);
+                    writer.println("{}", results.timestamp());
+                }
             }
-            if (results != null) {
-                var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.results());
-                SendMessageResultUtils.printSendMessageResultErrors(writer, errors);
-                writer.println("{}", results.timestamp());
+            case JsonWriter writer -> {
+                final var response = new HashMap<>();
+                if (results != null) {
+                    response.put("timestamp", results.timestamp());
+                    var jsonResults = SendMessageResultUtils.getJsonSendMessageResults(results.results());
+                    response.put("results", jsonResults);
+                }
+                if (groupId != null) {
+                    response.put("groupId", groupId.toBase64());
+                }
+                writer.write(response);
             }
-        } else {
-            final var writer = (JsonWriter) outputWriter;
-            final var response = new HashMap<>();
-            if (results != null) {
-                response.put("timestamp", results.timestamp());
-                var jsonResults = SendMessageResultUtils.getJsonSendMessageResults(results.results());
-                response.put("results", jsonResults);
-            }
-            if (groupId != null) {
-                response.put("groupId", groupId.toBase64());
-            }
-            writer.write(response);
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
index d8e87430..7a3281fe 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
@@ -10,7 +10,6 @@ import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.output.OutputWriter;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.Base64;
 
@@ -28,7 +27,8 @@ public class UpdateProfileCommand implements JsonRpcLocalCommand {
         subparser.addArgument("--family-name").help("New profile family name (optional)");
         subparser.addArgument("--about").help("New profile about text");
         subparser.addArgument("--about-emoji").help("New profile about emoji");
-        subparser.addArgument("--mobile-coin-address").help("New MobileCoin address (Base64 encoded public address)");
+        subparser.addArgument("--mobile-coin-address", "--mobilecoin-address")
+                .help("New MobileCoin address (Base64 encoded public address)");
 
         final var avatarOptions = subparser.addMutuallyExclusiveGroup();
         avatarOptions.addArgument("--avatar").help("Path to new profile avatar");
@@ -37,7 +37,9 @@ public class UpdateProfileCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         var givenName = ns.getString("given-name");
         var familyName = ns.getString("family-name");
@@ -50,7 +52,7 @@ public class UpdateProfileCommand implements JsonRpcLocalCommand {
 
         var avatarPath = ns.getString("avatar");
         boolean removeAvatar = Boolean.TRUE.equals(ns.getBoolean("remove-avatar"));
-        File avatarFile = removeAvatar || avatarPath == null ? null : new File(avatarPath);
+        String avatarFile = removeAvatar || avatarPath == null ? null : avatarPath;
 
         try {
             m.updateProfile(UpdateProfile.newBuilder()
diff --git a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
index aad9a1e5..710f4d35 100644
--- a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
@@ -20,7 +20,7 @@ import java.util.Map;
 
 public class UploadStickerPackCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(UploadStickerPackCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(UploadStickerPackCommand.class);
 
     @Override
     public String getName() {
@@ -36,17 +36,19 @@ public class UploadStickerPackCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         var path = new File(ns.getString("path"));
 
         try {
             var url = m.uploadStickerPack(path);
-            if (outputWriter instanceof PlainTextWriter writer) {
-                writer.println("{}", url.getUrl());
-            } else {
-                final var writer = (JsonWriter) outputWriter;
-                writer.write(Map.of("url", url.getUrl()));
+            switch (outputWriter) {
+                case PlainTextWriter writer -> writer.println("{}", url.getUrl());
+                case JsonWriter writer -> {
+                    writer.write(Map.of("url", url.getUrl()));
+                }
             }
         } catch (IOException e) {
             throw new IOErrorException("Upload error (maybe image size too large):" + e.getMessage(), e);
diff --git a/src/main/java/org/asamk/signal/commands/VerifyCommand.java b/src/main/java/org/asamk/signal/commands/VerifyCommand.java
index 542c0716..6a5046bc 100644
--- a/src/main/java/org/asamk/signal/commands/VerifyCommand.java
+++ b/src/main/java/org/asamk/signal/commands/VerifyCommand.java
@@ -11,6 +11,7 @@ import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.api.IncorrectPinException;
+import org.asamk.signal.manager.api.PinLockMissingException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.output.JsonWriter;
 import org.slf4j.Logger;
@@ -21,7 +22,7 @@ import java.util.List;
 
 public class VerifyCommand implements RegistrationCommand, JsonRpcRegistrationCommand<VerifyCommand.VerifyParams> {
 
-    private final static Logger logger = LoggerFactory.getLogger(VerifyCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(VerifyCommand.class);
 
     @Override
     public String getName() {
@@ -55,13 +56,17 @@ public class VerifyCommand implements RegistrationCommand, JsonRpcRegistrationCo
 
     @Override
     public void handleCommand(
-            final VerifyParams request, final RegistrationManager m, final JsonWriter jsonWriter
+            final VerifyParams request,
+            final RegistrationManager m,
+            final JsonWriter jsonWriter
     ) throws CommandException {
         verify(m, request.verificationCode(), request.pin());
     }
 
     private void verify(
-            final RegistrationManager m, final String verificationCode, final String pin
+            final RegistrationManager m,
+            final String verificationCode,
+            final String pin
     ) throws UserErrorException, IOErrorException {
         try {
             m.verifyAccount(verificationCode, pin);
@@ -72,10 +77,12 @@ public class VerifyCommand implements RegistrationCommand, JsonRpcRegistrationCo
                             + "\nUse '--pin PIN_CODE' to specify the registration lock PIN");
         } catch (IncorrectPinException e) {
             throw new UserErrorException("Verification failed! Invalid pin, tries remaining: " + e.getTriesRemaining());
+        } catch (PinLockMissingException e) {
+            throw new UserErrorException("Account is pin locked, but pin data has been deleted on the server.");
         } catch (IOException e) {
             throw new IOErrorException("Verify error: " + e.getMessage(), e);
         }
     }
 
-    record VerifyParams(String verificationCode, String pin) {}
+    public record VerifyParams(String verificationCode, String pin) {}
 }
diff --git a/src/main/java/org/asamk/signal/commands/VersionCommand.java b/src/main/java/org/asamk/signal/commands/VersionCommand.java
index 95b41598..498e5e71 100644
--- a/src/main/java/org/asamk/signal/commands/VersionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/VersionCommand.java
@@ -1,14 +1,23 @@
 package org.asamk.signal.commands;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+
 import org.asamk.signal.BaseConfig;
+import org.asamk.signal.OutputType;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.MultiAccountManager;
 import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
 
+import java.util.List;
 import java.util.Map;
 
-public class VersionCommand implements JsonRpcSingleCommand<Void>, JsonRpcMultiCommand<Void> {
+public class VersionCommand implements JsonRpcLocalCommand, JsonRpcMultiLocalCommand {
 
     @Override
     public String getName() {
@@ -16,21 +25,44 @@ public class VersionCommand implements JsonRpcSingleCommand<Void>, JsonRpcMultiC
     }
 
     @Override
-    public void handleCommand(
-            final Void request, final Manager m, final JsonWriter jsonWriter
-    ) throws CommandException {
-        outputVersion(jsonWriter);
+    public List<OutputType> getSupportedOutputTypes() {
+        return List.of(OutputType.PLAIN_TEXT, OutputType.JSON);
+    }
+
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
     }
 
     @Override
     public void handleCommand(
-            final Void request, final MultiAccountManager c, final JsonWriter jsonWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
-        outputVersion(jsonWriter);
+        outputVersion(outputWriter);
     }
 
-    private void outputVersion(final JsonWriter jsonWriter) {
-        jsonWriter.write(Map.of("version",
-                BaseConfig.PROJECT_VERSION == null ? "unknown" : BaseConfig.PROJECT_VERSION));
+    @Override
+    public void handleCommand(
+            final Namespace ns,
+            final MultiAccountManager c,
+            final OutputWriter outputWriter
+    ) throws CommandException {
+        outputVersion(outputWriter);
+    }
+
+    @Override
+    public TypeReference<Map<String, Object>> getRequestType() {
+        return new TypeReference<>() {};
+    }
+
+    private void outputVersion(final OutputWriter outputWriter) {
+        final var projectName = BaseConfig.PROJECT_NAME == null ? "signal-cli" : BaseConfig.PROJECT_NAME;
+        final var version = BaseConfig.PROJECT_VERSION == null ? "unknown" : BaseConfig.PROJECT_VERSION;
+
+        switch (outputWriter) {
+            case JsonWriter jsonWriter -> jsonWriter.write(Map.of("version", version));
+            case PlainTextWriter plainTextWriter -> plainTextWriter.println("{} {}", projectName, version);
+        }
     }
 }
diff --git a/src/main/java/org/asamk/signal/commands/exceptions/CommandException.java b/src/main/java/org/asamk/signal/commands/exceptions/CommandException.java
index bae7af43..739aee91 100644
--- a/src/main/java/org/asamk/signal/commands/exceptions/CommandException.java
+++ b/src/main/java/org/asamk/signal/commands/exceptions/CommandException.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.commands.exceptions;
 
-public class CommandException extends Exception {
+public sealed abstract class CommandException extends Exception permits IOErrorException, RateLimitErrorException, UnexpectedErrorException, UntrustedKeyErrorException, UserErrorException {
 
     public CommandException(final String message) {
         super(message);
diff --git a/src/main/java/org/asamk/signal/commands/exceptions/RateLimitErrorException.java b/src/main/java/org/asamk/signal/commands/exceptions/RateLimitErrorException.java
new file mode 100644
index 00000000..a2eb567e
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/exceptions/RateLimitErrorException.java
@@ -0,0 +1,10 @@
+package org.asamk.signal.commands.exceptions;
+
+import org.asamk.signal.manager.api.RateLimitException;
+
+public final class RateLimitErrorException extends CommandException {
+
+    public RateLimitErrorException(final String message, final RateLimitException cause) {
+        super(message, cause);
+    }
+}
diff --git a/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java b/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java
new file mode 100644
index 00000000..546a433f
--- /dev/null
+++ b/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java
@@ -0,0 +1,160 @@
+package org.asamk.signal.dbus;
+
+import org.asamk.Signal;
+import org.asamk.SignalControl;
+import org.asamk.signal.DbusConfig;
+import org.asamk.signal.commands.Command;
+import org.asamk.signal.commands.CommandHandler;
+import org.asamk.signal.commands.LocalCommand;
+import org.asamk.signal.commands.MultiLocalCommand;
+import org.asamk.signal.commands.ProvisioningCommand;
+import org.asamk.signal.commands.RegistrationCommand;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.freedesktop.dbus.connections.impl.DBusConnection;
+import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder;
+import org.freedesktop.dbus.errors.ServiceUnknown;
+import org.freedesktop.dbus.errors.UnknownMethod;
+import org.freedesktop.dbus.exceptions.DBusException;
+import org.freedesktop.dbus.exceptions.DBusExecutionException;
+
+import java.io.IOException;
+
+public class DbusCommandHandler {
+
+    public static void initDbusClient(
+            final Command command,
+            final String account,
+            final boolean systemBus,
+            final String busname,
+            final CommandHandler commandHandler
+    ) throws CommandException {
+        try {
+            final var busType = systemBus ? DBusConnection.DBusBusType.SYSTEM : DBusConnection.DBusBusType.SESSION;
+            try (var dBusConn = DBusConnectionBuilder.forType(busType).build()) {
+                handleCommand(command, account, dBusConn, busname, commandHandler);
+            }
+        } catch (ServiceUnknown e) {
+            throw new UserErrorException("signal-cli DBus daemon not running on "
+                    + (systemBus ? "system" : "session")
+                    + " bus: "
+                    + e.getMessage(), e);
+        } catch (DBusExecutionException | DBusException | IOException e) {
+            throw new UnexpectedErrorException("Dbus client failed: " + e.getMessage(), e);
+        }
+    }
+
+    public static void handleCommand(
+            final Command command,
+            final String account,
+            final DBusConnection dBusConn,
+            final String busname,
+            final CommandHandler commandHandler
+    ) throws CommandException, DBusException {
+        try {
+            if (command instanceof ProvisioningCommand c) {
+                if (account != null) {
+                    throw new UserErrorException("You cannot specify a account (phone number) when linking");
+                }
+
+                handleProvisioningCommand(c, dBusConn, busname, commandHandler);
+                return;
+            }
+
+            if (account == null && command instanceof MultiLocalCommand c) {
+                handleMultiLocalCommand(c, dBusConn, busname, commandHandler);
+                return;
+            }
+            if (account != null && command instanceof RegistrationCommand c) {
+                handleRegistrationCommand(c, account, dBusConn, busname, commandHandler);
+                return;
+            }
+            if (!(command instanceof LocalCommand localCommand)) {
+                throw new UserErrorException("Command only works in multi-account mode");
+            }
+
+            var accountObjectPath = account == null ? tryGetSingleAccountObjectPath(dBusConn, busname) : null;
+            if (accountObjectPath == null) {
+                accountObjectPath = DbusConfig.getObjectPath(account);
+            }
+            handleLocalCommand(localCommand, accountObjectPath, dBusConn, busname, commandHandler);
+        } catch (UnsupportedOperationException e) {
+            throw new UserErrorException("Command is not yet implemented via dbus", e);
+        } catch (DBusExecutionException e) {
+            throw new UnexpectedErrorException(e.getMessage(), e);
+        }
+    }
+
+    private static String tryGetSingleAccountObjectPath(
+            final DBusConnection dBusConn,
+            final String busname
+    ) throws DBusException, CommandException {
+        var control = dBusConn.getRemoteObject(busname, DbusConfig.getObjectPath(), SignalControl.class);
+        try {
+            final var accounts = control.listAccounts();
+            if (accounts.isEmpty()) {
+                throw new UserErrorException("No local users found, you first need to register or link an account");
+            } else if (accounts.size() > 1) {
+                throw new UserErrorException(
+                        "Multiple users found, you need to specify an account (phone number) with -a");
+            }
+
+            return accounts.getFirst().getPath();
+        } catch (UnknownMethod e) {
+            // dbus daemon not running in multi-account mode
+            return null;
+        }
+    }
+
+    private static void handleMultiLocalCommand(
+            final MultiLocalCommand c,
+            final DBusConnection dBusConn,
+            final String busname,
+            final CommandHandler commandHandler
+    ) throws CommandException, DBusException {
+        final var signalControl = dBusConn.getRemoteObject(busname, DbusConfig.getObjectPath(), SignalControl.class);
+        try (final var multiAccountManager = new DbusMultiAccountManagerImpl(signalControl, dBusConn, busname)) {
+            commandHandler.handleMultiLocalCommand(c, multiAccountManager);
+        }
+    }
+
+    private static void handleLocalCommand(
+            final LocalCommand c,
+            String accountObjectPath,
+            final DBusConnection dBusConn,
+            final String busname,
+            final CommandHandler commandHandler
+    ) throws CommandException, DBusException {
+        var signal = dBusConn.getRemoteObject(busname, accountObjectPath, Signal.class);
+        try (final var manager = new DbusManagerImpl(signal, dBusConn, busname)) {
+            commandHandler.handleLocalCommand(c, manager);
+        }
+    }
+
+    private static void handleRegistrationCommand(
+            final RegistrationCommand c,
+            String account,
+            final DBusConnection dBusConn,
+            final String busname,
+            final CommandHandler commandHandler
+
+    ) throws CommandException, DBusException {
+        final var signalControl = dBusConn.getRemoteObject(busname, DbusConfig.getObjectPath(), SignalControl.class);
+        try (final var registrationManager = new DbusRegistrationManagerImpl(account, signalControl, dBusConn)) {
+            commandHandler.handleRegistrationCommand(c, registrationManager);
+        }
+    }
+
+    private static void handleProvisioningCommand(
+            final ProvisioningCommand c,
+            final DBusConnection dBusConn,
+            final String busname,
+            final CommandHandler commandHandler
+
+    ) throws CommandException, DBusException {
+        final var signalControl = dBusConn.getRemoteObject(busname, DbusConfig.getObjectPath(), SignalControl.class);
+        final var provisioningManager = new DbusProvisioningManagerImpl(signalControl, dBusConn);
+        commandHandler.handleProvisioningCommand(c, provisioningManager);
+    }
+}
diff --git a/src/main/java/org/asamk/signal/dbus/DbusHandler.java b/src/main/java/org/asamk/signal/dbus/DbusHandler.java
new file mode 100644
index 00000000..2ed6d11f
--- /dev/null
+++ b/src/main/java/org/asamk/signal/dbus/DbusHandler.java
@@ -0,0 +1,159 @@
+package org.asamk.signal.dbus;
+
+import org.asamk.signal.DbusConfig;
+import org.asamk.signal.Shutdown;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.MultiAccountManager;
+import org.freedesktop.dbus.connections.IDisconnectCallback;
+import org.freedesktop.dbus.connections.impl.DBusConnection;
+import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder;
+import org.freedesktop.dbus.exceptions.DBusException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class DbusHandler implements AutoCloseable {
+
+    private static final Logger logger = LoggerFactory.getLogger(DbusHandler.class);
+
+    private final boolean isDbusSystem;
+    private DBusConnection dBusConnection;
+    private final String busname;
+
+    private final List<AutoCloseable> closeables = new ArrayList<>();
+    private final DbusRunner dbusRunner;
+    private final boolean noReceiveOnStart;
+
+    public DbusHandler(
+            final boolean isDbusSystem,
+            final String busname,
+            final Manager m,
+            final boolean noReceiveOnStart
+    ) {
+        this.isDbusSystem = isDbusSystem;
+        this.dbusRunner = (connection) -> {
+            try {
+                exportDbusObject(connection, DbusConfig.getObjectPath(), m).join();
+            } catch (InterruptedException ignored) {
+            }
+        };
+        this.noReceiveOnStart = noReceiveOnStart;
+        this.busname = busname;
+    }
+
+    public DbusHandler(
+            final boolean isDbusSystem,
+            final String busname,
+            final MultiAccountManager c,
+            final boolean noReceiveOnStart
+    ) {
+        this.isDbusSystem = isDbusSystem;
+        this.dbusRunner = (connection) -> {
+            final var signalControl = new DbusSignalControlImpl(c, DbusConfig.getObjectPath());
+            connection.exportObject(signalControl);
+
+            c.addOnManagerAddedHandler(m -> {
+                final var thread = exportManager(connection, m);
+                try {
+                    thread.join();
+                } catch (InterruptedException ignored) {
+                }
+            });
+            c.addOnManagerRemovedHandler(m -> {
+                final var path = DbusConfig.getObjectPath(m.getSelfNumber());
+                try {
+                    final var object = connection.getExportedObject(null, path);
+                    if (object instanceof DbusSignalImpl dbusSignal) {
+                        dbusSignal.close();
+                        closeables.remove(dbusSignal);
+                    }
+                } catch (DBusException ignored) {
+                }
+            });
+
+            final var initThreads = c.getManagers().stream().map(m -> exportManager(connection, m)).toList();
+
+            for (var t : initThreads) {
+                try {
+                    t.join();
+                } catch (InterruptedException ignored) {
+                }
+            }
+        };
+        this.noReceiveOnStart = noReceiveOnStart;
+        this.busname = busname;
+    }
+
+    public void init() throws CommandException {
+        if (dBusConnection != null) {
+            throw new AssertionError("DbusHandler already initialized");
+        }
+        final var busType = isDbusSystem ? DBusConnection.DBusBusType.SYSTEM : DBusConnection.DBusBusType.SESSION;
+        logger.debug("Starting DBus server on {} bus: {}", busType, busname);
+        try {
+            dBusConnection = DBusConnectionBuilder.forType(busType)
+                    .withDisconnectCallback(new DisconnectCallback())
+                    .build();
+            dbusRunner.run(dBusConnection);
+        } catch (DBusException e) {
+            throw new UnexpectedErrorException("Dbus command failed: " + e.getMessage(), e);
+        } catch (UnsupportedOperationException e) {
+            throw new UserErrorException("Failed to connect to Dbus: " + e.getMessage(), e);
+        }
+
+        try {
+            dBusConnection.requestBusName(busname);
+        } catch (DBusException e) {
+            throw new UnexpectedErrorException("Dbus command failed, maybe signal-cli dbus daemon is already running: "
+                    + e.getMessage(), e);
+        }
+
+        logger.info("Started DBus server on {} bus: {}", busType, busname);
+    }
+
+    @Override
+    public void close() throws Exception {
+        if (dBusConnection == null) {
+            return;
+        }
+        dBusConnection.close();
+        for (final var c : new ArrayList<>(closeables)) {
+            c.close();
+        }
+        closeables.clear();
+        dBusConnection = null;
+    }
+
+    private Thread exportDbusObject(final DBusConnection conn, final String objectPath, final Manager m) {
+        final var signal = new DbusSignalImpl(m, conn, objectPath, noReceiveOnStart);
+        closeables.add(signal);
+
+        return Thread.ofPlatform().name("dbus-init-" + m.getSelfNumber()).start(signal::initObjects);
+    }
+
+    private Thread exportManager(final DBusConnection conn, final Manager m) {
+        final var objectPath = DbusConfig.getObjectPath(m.getSelfNumber());
+        return exportDbusObject(conn, objectPath, m);
+    }
+
+    private interface DbusRunner {
+
+        void run(DBusConnection connection) throws DBusException;
+    }
+
+    private static final class DisconnectCallback implements IDisconnectCallback {
+
+        @Override
+        public void disconnectOnError(IOException ex) {
+            logger.debug("DBus daemon disconnected unexpectedly, shutting down");
+            Shutdown.triggerShutdown(new IOErrorException("Unexpected dbus daemon disconnect", ex));
+        }
+    }
+}
diff --git a/src/main/java/org/asamk/signal/dbus/DbusInterfacePropertiesHandler.java b/src/main/java/org/asamk/signal/dbus/DbusInterfacePropertiesHandler.java
index d3c2ca83..73cfab67 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusInterfacePropertiesHandler.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusInterfacePropertiesHandler.java
@@ -12,9 +12,7 @@ public class DbusInterfacePropertiesHandler {
     private final String interfaceName;
     private final List<DbusProperty<?>> properties;
 
-    public DbusInterfacePropertiesHandler(
-            final String interfaceName, final List<DbusProperty<?>> properties
-    ) {
+    public DbusInterfacePropertiesHandler(final String interfaceName, final List<DbusProperty<?>> properties) {
         this.interfaceName = interfaceName;
         this.properties = properties;
     }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 9ffb0795..5658d0d3 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -1,51 +1,65 @@
 package org.asamk.signal.dbus;
 
 import org.asamk.Signal;
-import org.asamk.signal.DbusConfig;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.AlreadyReceivingException;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.Configuration;
+import org.asamk.signal.manager.api.Contact;
 import org.asamk.signal.manager.api.Device;
+import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.Group;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupPermission;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.api.Identity;
+import org.asamk.signal.manager.api.IdentityVerificationCode;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
+import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
+import org.asamk.signal.manager.api.InvalidStickerException;
+import org.asamk.signal.manager.api.InvalidUsernameException;
+import org.asamk.signal.manager.api.LastGroupAdminException;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.PinLockedException;
+import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.ReceiveConfig;
+import org.asamk.signal.manager.api.Recipient;
+import org.asamk.signal.manager.api.RecipientAddress;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendGroupMessageResults;
 import org.asamk.signal.manager.api.SendMessageResults;
 import org.asamk.signal.manager.api.StickerPack;
+import org.asamk.signal.manager.api.StickerPackId;
 import org.asamk.signal.manager.api.StickerPackInvalidException;
 import org.asamk.signal.manager.api.StickerPackUrl;
+import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.api.TypingAction;
+import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupPermission;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.LastGroupAdminException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
-import org.asamk.signal.manager.storage.recipients.Contact;
-import org.asamk.signal.manager.storage.recipients.Profile;
-import org.asamk.signal.manager.storage.recipients.Recipient;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
-import org.freedesktop.dbus.DBusMap;
+import org.asamk.signal.manager.api.UsernameLinkUrl;
+import org.asamk.signal.manager.api.UsernameStatus;
 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
+import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.freedesktop.dbus.interfaces.DBusInterface;
 import org.freedesktop.dbus.interfaces.DBusSigHandler;
 import org.freedesktop.dbus.types.Variant;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.time.Duration;
@@ -58,6 +72,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -76,13 +91,16 @@ public class DbusManagerImpl implements Manager {
     private final Set<ReceiveMessageHandler> weakHandlers = new HashSet<>();
     private final Set<ReceiveMessageHandler> messageHandlers = new HashSet<>();
     private final List<Runnable> closedListeners = new ArrayList<>();
+    private final String busname;
     private DBusSigHandler<Signal.MessageReceivedV2> dbusMsgHandler;
+    private DBusSigHandler<Signal.EditMessageReceived> dbusEditMsgHandler;
     private DBusSigHandler<Signal.ReceiptReceivedV2> dbusRcptHandler;
     private DBusSigHandler<Signal.SyncMessageReceivedV2> dbusSyncHandler;
 
-    public DbusManagerImpl(final Signal signal, DBusConnection connection) {
+    public DbusManagerImpl(final Signal signal, DBusConnection connection, final String busname) {
         this.signal = signal;
         this.connection = connection;
+        this.busname = busname;
     }
 
     @Override
@@ -106,10 +124,22 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
-    public void updateAccountAttributes(final String deviceName) throws IOException {
+    public Map<String, UsernameStatus> getUsernameStatus(final Set<String> usernames) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void updateAccountAttributes(
+            final String deviceName,
+            final Boolean unrestrictedUnidentifiedSender,
+            final Boolean discoverableByNumber,
+            final Boolean numberSharing
+    ) throws IOException {
         if (deviceName != null) {
             final var devicePath = signal.getThisDevice();
             getRemoteObject(devicePath, Signal.Device.class).Set("org.asamk.Signal.Device", "Name", deviceName);
+        } else {
+            throw new UnsupportedOperationException();
         }
     }
 
@@ -124,7 +154,7 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
-    public void updateConfiguration(Configuration newConfiguration) throws IOException {
+    public void updateConfiguration(Configuration newConfiguration) {
         final var configuration = getRemoteObject(new DBusPath(signal.getObjectPath() + "/Configuration"),
                 Signal.Configuration.class);
         newConfiguration.readReceipts()
@@ -145,10 +175,48 @@ public class DbusManagerImpl implements Manager {
                 emptyIfNull(updateProfile.getFamilyName()),
                 emptyIfNull(updateProfile.getAbout()),
                 emptyIfNull(updateProfile.getAboutEmoji()),
-                updateProfile.getAvatar() == null ? "" : updateProfile.getAvatar().getPath(),
+                updateProfile.getAvatar() == null ? "" : updateProfile.getAvatar(),
                 updateProfile.isDeleteAvatar());
     }
 
+    @Override
+    public String getUsername() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public UsernameLinkUrl getUsernameLink() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void setUsername(final String username) throws IOException, InvalidUsernameException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void deleteUsername() throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void startChangeNumber(
+            final String newNumber,
+            final boolean voiceVerification,
+            final String captcha
+    ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void finishChangeNumber(
+            final String newNumber,
+            final String verificationCode,
+            final String pin
+    ) throws IncorrectPinException, PinLockedException, IOException {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public void unregister() throws IOException {
         signal.unregister();
@@ -185,8 +253,8 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
-    public void addDeviceLink(final URI linkUri) throws IOException, InvalidDeviceLinkException {
-        signal.addDevice(linkUri.toString());
+    public void addDeviceLink(final DeviceLinkUrl linkUri) throws IOException, InvalidDeviceLinkException {
+        signal.addDevice(linkUri.createDeviceLinkUri().toString());
     }
 
     @Override
@@ -198,11 +266,6 @@ public class DbusManagerImpl implements Manager {
         }
     }
 
-    @Override
-    public Profile getRecipientProfile(final RecipientIdentifier.Single recipient) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public List<Group> getGroups() {
         final var groups = signal.listGroups();
@@ -211,13 +274,22 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public SendGroupMessageResults quitGroup(
-            final GroupId groupId, final Set<RecipientIdentifier.Single> groupAdmins
+            final GroupId groupId,
+            final Set<RecipientIdentifier.Single> groupAdmins
     ) throws GroupNotFoundException, IOException, NotAGroupMemberException, LastGroupAdminException {
-        if (groupAdmins.size() > 0) {
+        if (!groupAdmins.isEmpty()) {
             throw new UnsupportedOperationException();
         }
         final var group = getRemoteObject(signal.getGroup(groupId.serialize()), Signal.Group.class);
-        group.quitGroup();
+        try {
+            group.quitGroup();
+        } catch (Signal.Error.GroupNotFound e) {
+            throw new GroupNotFoundException(groupId);
+        } catch (Signal.Error.NotAGroupMember e) {
+            throw new NotAGroupMemberException(groupId, group.Get("org.asamk.Signal.Group", "Name"));
+        } catch (Signal.Error.LastGroupAdmin e) {
+            throw new LastGroupAdminException(groupId, group.Get("org.asamk.Signal.Group", "Name"));
+        }
         return new SendGroupMessageResults(0, List.of());
     }
 
@@ -229,17 +301,20 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public Pair<GroupId, SendGroupMessageResults> createGroup(
-            final String name, final Set<RecipientIdentifier.Single> members, final File avatarFile
+            final String name,
+            final Set<RecipientIdentifier.Single> members,
+            final String avatarFile
     ) throws IOException, AttachmentInvalidException {
         final var newGroupId = signal.createGroup(emptyIfNull(name),
                 members.stream().map(RecipientIdentifier.Single::getIdentifier).toList(),
-                avatarFile == null ? "" : avatarFile.getPath());
+                avatarFile == null ? "" : avatarFile);
         return new Pair<>(GroupId.unknownVersion(newGroupId), new SendGroupMessageResults(0, List.of()));
     }
 
     @Override
     public SendGroupMessageResults updateGroup(
-            final GroupId groupId, final UpdateGroup updateGroup
+            final GroupId groupId,
+            final UpdateGroup updateGroup
     ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException, GroupSendingNotAllowedException {
         final var group = getRemoteObject(signal.getGroup(groupId.serialize()), Signal.Group.class);
         if (updateGroup.getName() != null) {
@@ -251,7 +326,7 @@ public class DbusManagerImpl implements Manager {
         if (updateGroup.getAvatarFile() != null) {
             group.Set("org.asamk.Signal.Group",
                     "Avatar",
-                    updateGroup.getAvatarFile() == null ? "" : updateGroup.getAvatarFile().getPath());
+                    updateGroup.getAvatarFile() == null ? "" : updateGroup.getAvatarFile());
         }
         if (updateGroup.getExpirationTimer() != null) {
             group.Set("org.asamk.Signal.Group", "MessageExpirationTimer", updateGroup.getExpirationTimer());
@@ -302,13 +377,19 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public Pair<GroupId, SendGroupMessageResults> joinGroup(final GroupInviteLinkUrl inviteLinkUrl) throws IOException, InactiveGroupLinkException {
-        final var newGroupId = signal.joinGroup(inviteLinkUrl.getUrl());
-        return new Pair<>(GroupId.unknownVersion(newGroupId), new SendGroupMessageResults(0, List.of()));
+        try {
+            final var newGroupId = signal.joinGroup(inviteLinkUrl.getUrl());
+            return new Pair<>(GroupId.unknownVersion(newGroupId), new SendGroupMessageResults(0, List.of()));
+        } catch (DBusExecutionException e) {
+            throw new IOException("Failed to join group: " + e.getMessage() + " (" + e.getClass().getSimpleName() + ")",
+                    e);
+        }
     }
 
     @Override
     public SendMessageResults sendTypingMessage(
-            final TypingAction action, final Set<RecipientIdentifier> recipients
+            final TypingAction action,
+            final Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return handleMessage(recipients, numbers -> {
             numbers.forEach(n -> signal.sendTyping(n, action == TypingAction.STOP));
@@ -323,24 +404,22 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
-    public SendMessageResults sendReadReceipt(
-            final RecipientIdentifier.Single sender, final List<Long> messageIds
-    ) {
+    public SendMessageResults sendReadReceipt(final RecipientIdentifier.Single sender, final List<Long> messageIds) {
         signal.sendReadReceipt(sender.getIdentifier(), messageIds);
         return new SendMessageResults(0, Map.of());
     }
 
     @Override
-    public SendMessageResults sendViewedReceipt(
-            final RecipientIdentifier.Single sender, final List<Long> messageIds
-    ) {
+    public SendMessageResults sendViewedReceipt(final RecipientIdentifier.Single sender, final List<Long> messageIds) {
         signal.sendViewedReceipt(sender.getIdentifier(), messageIds);
         return new SendMessageResults(0, Map.of());
     }
 
     @Override
     public SendMessageResults sendMessage(
-            final Message message, final Set<RecipientIdentifier> recipients
+            final Message message,
+            final Set<RecipientIdentifier> recipients,
+            final boolean notifySelf
     ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return handleMessage(recipients,
                 numbers -> signal.sendMessage(message.messageText(), message.attachments(), numbers),
@@ -348,9 +427,19 @@ public class DbusManagerImpl implements Manager {
                 groupId -> signal.sendGroupMessage(message.messageText(), message.attachments(), groupId));
     }
 
+    @Override
+    public SendMessageResults sendEditMessage(
+            final Message message,
+            final Set<RecipientIdentifier> recipients,
+            final long editTargetTimestamp
+    ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public SendMessageResults sendRemoteDeleteMessage(
-            final long targetSentTimestamp, final Set<RecipientIdentifier> recipients
+            final long targetSentTimestamp,
+            final Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return handleMessage(recipients,
                 numbers -> signal.sendRemoteDeleteMessage(targetSentTimestamp, numbers),
@@ -364,7 +453,8 @@ public class DbusManagerImpl implements Manager {
             final boolean remove,
             final RecipientIdentifier.Single targetAuthor,
             final long targetSentTimestamp,
-            final Set<RecipientIdentifier> recipients
+            final Set<RecipientIdentifier> recipients,
+            final boolean isStory
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return handleMessage(recipients,
                 numbers -> signal.sendMessageReaction(emoji,
@@ -386,9 +476,12 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendPaymentNotificationMessage(
-            final byte[] receipt, final String note, final RecipientIdentifier.Single recipient
+            final byte[] receipt,
+            final String note,
+            final RecipientIdentifier.Single recipient
     ) throws IOException {
-        throw new UnsupportedOperationException();
+        final var timestamp = signal.sendPaymentNotification(receipt, note, recipient.getIdentifier());
+        return new SendMessageResults(timestamp, Map.of());
     }
 
     @Override
@@ -397,6 +490,18 @@ public class DbusManagerImpl implements Manager {
         return new SendMessageResults(0, Map.of());
     }
 
+    @Override
+    public SendMessageResults sendMessageRequestResponse(
+            final MessageEnvelope.Sync.MessageRequestResponse.Type type,
+            final Set<RecipientIdentifier> recipientIdentifiers
+    ) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void hideRecipient(final RecipientIdentifier.Single recipient) {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public void deleteRecipient(final RecipientIdentifier.Single recipient) {
         signal.deleteRecipient(recipient.getIdentifier());
@@ -409,14 +514,20 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public void setContactName(
-            final RecipientIdentifier.Single recipient, final String givenName, final String familyName
+            final RecipientIdentifier.Single recipient,
+            final String givenName,
+            final String familyName,
+            final String nickGivenName,
+            final String nickFamilyName,
+            final String note
     ) throws NotPrimaryDeviceException {
         signal.setContactName(recipient.getIdentifier(), givenName);
     }
 
     @Override
     public void setContactsBlocked(
-            final Collection<RecipientIdentifier.Single> recipients, final boolean blocked
+            final Collection<RecipientIdentifier.Single> recipients,
+            final boolean blocked
     ) throws NotPrimaryDeviceException, IOException {
         for (final var recipient : recipients) {
             signal.setContactBlocked(recipient.getIdentifier(), blocked);
@@ -425,7 +536,8 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public void setGroupsBlocked(
-            final Collection<GroupId> groupIds, final boolean blocked
+            final Collection<GroupId> groupIds,
+            final boolean blocked
     ) throws GroupNotFoundException, IOException {
         for (final var groupId : groupIds) {
             setGroupProperty(groupId, "IsBlocked", blocked);
@@ -439,7 +551,8 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public void setExpirationTimer(
-            final RecipientIdentifier.Single recipient, final int messageExpirationTimer
+            final RecipientIdentifier.Single recipient,
+            final int messageExpirationTimer
     ) throws IOException {
         signal.setExpirationTimer(recipient.getIdentifier(), messageExpirationTimer);
     }
@@ -453,6 +566,11 @@ public class DbusManagerImpl implements Manager {
         }
     }
 
+    @Override
+    public void installStickerPack(final StickerPackUrl url) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public List<StickerPack> getStickerPacks() {
         throw new UnsupportedOperationException();
@@ -469,7 +587,7 @@ public class DbusManagerImpl implements Manager {
             if (isWeakListener) {
                 weakHandlers.add(handler);
             } else {
-                if (messageHandlers.size() == 0) {
+                if (messageHandlers.isEmpty()) {
                     installMessageHandlers();
                 }
                 messageHandlers.add(handler);
@@ -482,7 +600,7 @@ public class DbusManagerImpl implements Manager {
         synchronized (messageHandlers) {
             weakHandlers.remove(handler);
             messageHandlers.remove(handler);
-            if (messageHandlers.size() == 0) {
+            if (messageHandlers.isEmpty()) {
                 uninstallMessageHandlers();
             }
         }
@@ -491,55 +609,75 @@ public class DbusManagerImpl implements Manager {
     @Override
     public boolean isReceiving() {
         synchronized (messageHandlers) {
-            return messageHandlers.size() > 0;
+            return !messageHandlers.isEmpty();
         }
     }
 
-    @Override
-    public void receiveMessages(final ReceiveMessageHandler handler) throws IOException {
-        addReceiveHandler(handler);
-        try {
-            synchronized (this) {
-                this.wait();
-            }
-        } catch (InterruptedException ignored) {
-        }
-        removeReceiveHandler(handler);
-    }
+    private Thread receiveThread;
 
     @Override
     public void receiveMessages(
-            final Duration timeout, final ReceiveMessageHandler handler
-    ) throws IOException {
+            Optional<Duration> timeout,
+            Optional<Integer> maxMessages,
+            ReceiveMessageHandler handler
+    ) throws IOException, AlreadyReceivingException {
+        if (receiveThread != null) {
+            throw new AlreadyReceivingException("Already receiving message.");
+        }
+        receiveThread = Thread.currentThread();
+
+        final var remainingMessages = new AtomicInteger(maxMessages.orElse(-1));
         final var lastMessage = new AtomicLong(System.currentTimeMillis());
+        final var thread = Thread.currentThread();
 
         final ReceiveMessageHandler receiveHandler = (envelope, e) -> {
             lastMessage.set(System.currentTimeMillis());
             handler.handleMessage(envelope, e);
+            if (remainingMessages.get() > 0) {
+                if (remainingMessages.decrementAndGet() <= 0) {
+                    remainingMessages.set(0);
+                    thread.interrupt();
+                }
+            }
         };
         addReceiveHandler(receiveHandler);
-        while (true) {
-            try {
-                final var sleepTimeRemaining = timeout.toMillis() - (System.currentTimeMillis() - lastMessage.get());
-                if (sleepTimeRemaining < 0) {
+        if (timeout.isPresent()) {
+            while (remainingMessages.get() != 0) {
+                try {
+                    final var passedTime = System.currentTimeMillis() - lastMessage.get();
+                    final var sleepTimeRemaining = timeout.get().toMillis() - passedTime;
+                    if (sleepTimeRemaining < 0) {
+                        break;
+                    }
+                    Thread.sleep(sleepTimeRemaining);
+                } catch (InterruptedException ignored) {
                     break;
                 }
-                Thread.sleep(sleepTimeRemaining);
+            }
+        } else {
+            try {
+                synchronized (this) {
+                    this.wait();
+                }
             } catch (InterruptedException ignored) {
             }
         }
+
         removeReceiveHandler(receiveHandler);
+        receiveThread = null;
+    }
+
+    @Override
+    public void stopReceiveMessages() {
+        if (receiveThread != null) {
+            receiveThread.interrupt();
+        }
     }
 
     @Override
     public void setReceiveConfig(final ReceiveConfig receiveConfig) {
     }
 
-    @Override
-    public boolean hasCaughtUpWithOldMessages() {
-        return true;
-    }
-
     @Override
     public boolean isContactBlocked(final RecipientIdentifier.Single recipient) {
         return signal.isContactBlocked(recipient.getIdentifier());
@@ -567,15 +705,30 @@ public class DbusManagerImpl implements Manager {
                 return null;
             }
             final var contactName = signal.getContactName(n);
-            if (onlyContacts && contactName.length() == 0) {
+            if (onlyContacts && contactName.isEmpty()) {
                 return null;
             }
             if (name.isPresent() && !name.get().equals(contactName)) {
                 return null;
             }
             return Recipient.newBuilder()
-                    .withAddress(new RecipientAddress(null, n))
-                    .withContact(new Contact(contactName, null, null, 0, contactBlocked, false, false))
+                    .withAddress(new RecipientAddress(n))
+                    .withContact(new Contact(contactName,
+                            null,
+                            null,
+                            null,
+                            null,
+                            null,
+                            null,
+                            0,
+                            1,
+                            0,
+                            false,
+                            contactBlocked,
+                            false,
+                            false,
+                            false,
+                            null))
                     .build();
         }).filter(Objects::nonNull).toList();
     }
@@ -601,19 +754,19 @@ public class DbusManagerImpl implements Manager {
                     (String) group.get("Description").getValue(),
                     GroupInviteLinkUrl.fromUri((String) group.get("GroupInviteLink").getValue()),
                     ((List<String>) group.get("Members").getValue()).stream()
-                            .map(m -> new RecipientAddress(null, m))
+                            .map(m -> new RecipientAddress(m))
                             .collect(Collectors.toSet()),
                     ((List<String>) group.get("PendingMembers").getValue()).stream()
-                            .map(m -> new RecipientAddress(null, m))
+                            .map(m -> new RecipientAddress(m))
                             .collect(Collectors.toSet()),
                     ((List<String>) group.get("RequestingMembers").getValue()).stream()
-                            .map(m -> new RecipientAddress(null, m))
+                            .map(m -> new RecipientAddress(m))
                             .collect(Collectors.toSet()),
                     ((List<String>) group.get("Admins").getValue()).stream()
-                            .map(m -> new RecipientAddress(null, m))
+                            .map(m -> new RecipientAddress(m))
                             .collect(Collectors.toSet()),
                     ((List<String>) group.get("Banned").getValue()).stream()
-                            .map(m -> new RecipientAddress(null, m))
+                            .map(m -> new RecipientAddress(m))
                             .collect(Collectors.toSet()),
                     (boolean) group.get("IsBlocked").getValue(),
                     (int) group.get("MessageExpirationTimer").getValue(),
@@ -629,29 +782,32 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public List<Identity> getIdentities() {
-        throw new UnsupportedOperationException();
+        final var identities = signal.listIdentities();
+        return identities.stream().map(Signal.StructIdentity::getObjectPath).map(this::getIdentity).toList();
     }
 
     @Override
     public List<Identity> getIdentities(final RecipientIdentifier.Single recipient) {
-        throw new UnsupportedOperationException();
+        final var path = signal.getIdentity(recipient.getIdentifier());
+        return List.of(getIdentity(path));
+    }
+
+    private Identity getIdentity(final DBusPath identityPath) {
+        final var group = getRemoteObject(identityPath, Signal.Identity.class).GetAll("org.asamk.Signal.Identity");
+        final var aci = (String) group.get("Uuid").getValue();
+        final var number = (String) group.get("Number").getValue();
+        return new Identity(new RecipientAddress(aci, null, number, null),
+                (byte[]) group.get("Fingerprint").getValue(),
+                (String) group.get("SafetyNumber").getValue(),
+                (byte[]) group.get("ScannableSafetyNumber").getValue(),
+                TrustLevel.valueOf((String) group.get("TrustLevel").getValue()),
+                (Long) group.get("AddedDate").getValue());
     }
 
     @Override
-    public boolean trustIdentityVerified(final RecipientIdentifier.Single recipient, final byte[] fingerprint) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean trustIdentityVerifiedSafetyNumber(
-            final RecipientIdentifier.Single recipient, final String safetyNumber
-    ) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean trustIdentityVerifiedSafetyNumber(
-            final RecipientIdentifier.Single recipient, final byte[] safetyNumber
+    public boolean trustIdentityVerified(
+            final RecipientIdentifier.Single recipient,
+            final IdentityVerificationCode verificationCode
     ) {
         throw new UnsupportedOperationException();
     }
@@ -678,7 +834,7 @@ public class DbusManagerImpl implements Manager {
             this.notify();
         }
         synchronized (messageHandlers) {
-            if (messageHandlers.size() > 0) {
+            if (!messageHandlers.isEmpty()) {
                 uninstallMessageHandlers();
             }
             weakHandlers.clear();
@@ -702,7 +858,7 @@ public class DbusManagerImpl implements Manager {
                 .map(RecipientIdentifier.Single.class::cast)
                 .map(RecipientIdentifier.Single::getIdentifier)
                 .toList();
-        if (singleRecipients.size() > 0) {
+        if (!singleRecipients.isEmpty()) {
             timestamp = recipientsHandler.apply(singleRecipients);
         }
 
@@ -726,7 +882,7 @@ public class DbusManagerImpl implements Manager {
 
     private <T extends DBusInterface> T getRemoteObject(final DBusPath path, final Class<T> type) {
         try {
-            return connection.getRemoteObject(DbusConfig.getBusname(), path.getPath(), type);
+            return connection.getRemoteObject(busname, path.getPath(), type);
         } catch (DBusException e) {
             throw new AssertionError(e);
         }
@@ -736,8 +892,7 @@ public class DbusManagerImpl implements Manager {
         try {
             this.dbusMsgHandler = messageReceived -> {
                 final var extras = messageReceived.getExtras();
-                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(null,
-                        messageReceived.getSender())),
+                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(messageReceived.getSender())),
                         0,
                         messageReceived.getTimestamp(),
                         0,
@@ -751,12 +906,14 @@ public class DbusManagerImpl implements Manager {
                                         messageReceived.getGroupId()), false, 0))
                                         : Optional.empty(),
                                 Optional.empty(),
+                                Optional.empty(),
                                 Optional.of(messageReceived.getMessage()),
                                 0,
                                 false,
                                 false,
                                 false,
                                 false,
+                                false,
                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty(),
@@ -764,69 +921,42 @@ public class DbusManagerImpl implements Manager {
                                 Optional.empty(),
                                 Optional.empty(),
                                 List.of(),
+                                getMentions(extras),
                                 List.of(),
                                 List.of())),
                         Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty(),
                         Optional.empty());
                 notifyMessageHandlers(envelope);
             };
             connection.addSigHandler(Signal.MessageReceivedV2.class, signal, this.dbusMsgHandler);
-
-            this.dbusRcptHandler = receiptReceived -> {
-                final var type = switch (receiptReceived.getReceiptType()) {
-                    case "read" -> MessageEnvelope.Receipt.Type.READ;
-                    case "viewed" -> MessageEnvelope.Receipt.Type.VIEWED;
-                    case "delivery" -> MessageEnvelope.Receipt.Type.DELIVERY;
-                    default -> MessageEnvelope.Receipt.Type.UNKNOWN;
-                };
-                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(null,
-                        receiptReceived.getSender())),
+            this.dbusEditMsgHandler = messageReceived -> {
+                final var extras = messageReceived.getExtras();
+                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(messageReceived.getSender())),
                         0,
-                        receiptReceived.getTimestamp(),
-                        0,
-                        0,
-                        false,
-                        Optional.of(new MessageEnvelope.Receipt(receiptReceived.getTimestamp(),
-                                type,
-                                List.of(receiptReceived.getTimestamp()))),
-                        Optional.empty(),
-                        Optional.empty(),
-                        Optional.empty(),
-                        Optional.empty());
-                notifyMessageHandlers(envelope);
-            };
-            connection.addSigHandler(Signal.ReceiptReceivedV2.class, signal, this.dbusRcptHandler);
-
-            this.dbusSyncHandler = syncReceived -> {
-                final var extras = syncReceived.getExtras();
-                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(null,
-                        syncReceived.getSource())),
-                        0,
-                        syncReceived.getTimestamp(),
+                        messageReceived.getTimestamp(),
                         0,
                         0,
                         false,
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
-                        Optional.of(new MessageEnvelope.Sync(Optional.of(new MessageEnvelope.Sync.Sent(syncReceived.getTimestamp(),
-                                syncReceived.getTimestamp(),
-                                syncReceived.getDestination().isEmpty()
-                                        ? Optional.empty()
-                                        : Optional.of(new RecipientAddress(null, syncReceived.getDestination())),
-                                Set.of(),
-                                Optional.of(new MessageEnvelope.Data(syncReceived.getTimestamp(),
-                                        syncReceived.getGroupId().length > 0
+                        Optional.of(new MessageEnvelope.Edit(messageReceived.getTargetSentTimestamp(),
+                                new MessageEnvelope.Data(messageReceived.getTimestamp(),
+                                        messageReceived.getGroupId().length > 0
                                                 ? Optional.of(new MessageEnvelope.Data.GroupContext(GroupId.unknownVersion(
-                                                syncReceived.getGroupId()), false, 0))
+                                                messageReceived.getGroupId()), false, 0))
                                                 : Optional.empty(),
                                         Optional.empty(),
-                                        Optional.of(syncReceived.getMessage()),
+                                        Optional.empty(),
+                                        Optional.of(messageReceived.getMessage()),
                                         0,
                                         false,
                                         false,
                                         false,
                                         false,
+                                        false,
                                         Optional.empty(),
                                         Optional.empty(),
                                         Optional.empty(),
@@ -834,8 +964,86 @@ public class DbusManagerImpl implements Manager {
                                         Optional.empty(),
                                         Optional.empty(),
                                         List.of(),
+                                        getMentions(extras),
                                         List.of(),
-                                        List.of())))),
+                                        List.of()))),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty());
+                notifyMessageHandlers(envelope);
+            };
+            connection.addSigHandler(Signal.EditMessageReceived.class, signal, this.dbusEditMsgHandler);
+
+            this.dbusRcptHandler = receiptReceived -> {
+                final var type = switch (receiptReceived.getReceiptType()) {
+                    case "read" -> MessageEnvelope.Receipt.Type.READ;
+                    case "viewed" -> MessageEnvelope.Receipt.Type.VIEWED;
+                    case "delivery" -> MessageEnvelope.Receipt.Type.DELIVERY;
+                    default -> MessageEnvelope.Receipt.Type.UNKNOWN;
+                };
+                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(receiptReceived.getSender())),
+                        0,
+                        receiptReceived.getTimestamp(),
+                        0,
+                        0,
+                        false,
+                        Optional.of(new MessageEnvelope.Receipt(receiptReceived.getTimestamp(),
+                                type,
+                                List.of(receiptReceived.getTimestamp()))),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty());
+                notifyMessageHandlers(envelope);
+            };
+            connection.addSigHandler(Signal.ReceiptReceivedV2.class, signal, this.dbusRcptHandler);
+
+            this.dbusSyncHandler = syncReceived -> {
+                final var extras = syncReceived.getExtras();
+                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(syncReceived.getSource())),
+                        0,
+                        syncReceived.getTimestamp(),
+                        0,
+                        0,
+                        false,
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.of(new MessageEnvelope.Sync(Optional.of(new MessageEnvelope.Sync.Sent(syncReceived.getTimestamp(),
+                                syncReceived.getTimestamp(),
+                                syncReceived.getDestination().isEmpty()
+                                        ? Optional.empty()
+                                        : Optional.of(new RecipientAddress(syncReceived.getDestination())),
+                                Set.of(),
+                                Optional.of(new MessageEnvelope.Data(syncReceived.getTimestamp(),
+                                        syncReceived.getGroupId().length > 0
+                                                ? Optional.of(new MessageEnvelope.Data.GroupContext(GroupId.unknownVersion(
+                                                syncReceived.getGroupId()), false, 0))
+                                                : Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.of(syncReceived.getMessage()),
+                                        0,
+                                        false,
+                                        false,
+                                        false,
+                                        false,
+                                        false,
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        getAttachments(extras),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        List.of(),
+                                        getMentions(extras),
+                                        List.of(),
+                                        List.of())),
+                                Optional.empty(),
+                                Optional.empty())),
                                 Optional.empty(),
                                 List.of(),
                                 List.of(),
@@ -843,12 +1051,13 @@ public class DbusManagerImpl implements Manager {
                                 Optional.empty(),
                                 Optional.empty(),
                                 Optional.empty())),
+                        Optional.empty(),
                         Optional.empty());
                 notifyMessageHandlers(envelope);
             };
             connection.addSigHandler(Signal.SyncMessageReceivedV2.class, signal, this.dbusSyncHandler);
         } catch (DBusException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
         signal.subscribeReceive();
     }
@@ -864,10 +1073,11 @@ public class DbusManagerImpl implements Manager {
         try {
             signal.unsubscribeReceive();
             connection.removeSigHandler(Signal.MessageReceivedV2.class, signal, this.dbusMsgHandler);
+            connection.removeSigHandler(Signal.EditMessageReceived.class, signal, this.dbusEditMsgHandler);
             connection.removeSigHandler(Signal.ReceiptReceivedV2.class, signal, this.dbusRcptHandler);
             connection.removeSigHandler(Signal.SyncMessageReceivedV2.class, signal, this.dbusSyncHandler);
         } catch (DBusException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
     }
 
@@ -876,7 +1086,7 @@ public class DbusManagerImpl implements Manager {
             return List.of();
         }
 
-        final List<DBusMap<String, Variant<?>>> attachments = getValue(extras, "attachments");
+        final List<Map<String, Variant<?>>> attachments = getValue(extras, "attachments");
         return attachments.stream().map(a -> {
             final String file = a.containsKey("file") ? getValue(a, "file") : null;
             return new MessageEnvelope.Data.Attachment(a.containsKey("remoteId")
@@ -898,10 +1108,46 @@ public class DbusManagerImpl implements Manager {
         }).toList();
     }
 
+    private List<MessageEnvelope.Data.Mention> getMentions(final Map<String, Variant<?>> extras) {
+        if (!extras.containsKey("mentions")) {
+            return List.of();
+        }
+
+        final List<Map<String, Variant<?>>> mentions = getValue(extras, "mentions");
+        return mentions.stream()
+                .map(a -> new MessageEnvelope.Data.Mention(new RecipientAddress(this.<String>getValue(a, "recipient")),
+                        getValue(a, "start"),
+                        getValue(a, "length")))
+                .toList();
+    }
+
+    @Override
+    public InputStream retrieveAttachment(final String id) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public InputStream retrieveContactAvatar(final RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public InputStream retrieveProfileAvatar(final RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public InputStream retrieveGroupAvatar(final GroupId groupId) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public InputStream retrieveSticker(final StickerPackId stickerPackId, final int stickerId) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
     @SuppressWarnings("unchecked")
-    private <T> T getValue(
-            final Map<String, Variant<?>> stringVariantMap, final String field
-    ) {
+    private <T> T getValue(final Map<String, Variant<?>> stringVariantMap, final String field) {
         return (T) stringVariantMap.get(field).getValue();
     }
 }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusMultiAccountManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusMultiAccountManagerImpl.java
index 2c5f720f..2b9a0a77 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusMultiAccountManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusMultiAccountManagerImpl.java
@@ -2,7 +2,6 @@ package org.asamk.signal.dbus;
 
 import org.asamk.Signal;
 import org.asamk.SignalControl;
-import org.asamk.signal.DbusConfig;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.MultiAccountManager;
 import org.asamk.signal.manager.ProvisioningManager;
@@ -32,10 +31,16 @@ public class DbusMultiAccountManagerImpl implements MultiAccountManager {
     // TODO add listeners for added/removed accounts
     private final Set<Consumer<Manager>> onManagerAddedHandlers = new HashSet<>();
     private final Set<Consumer<Manager>> onManagerRemovedHandlers = new HashSet<>();
+    private final String busname;
 
-    public DbusMultiAccountManagerImpl(final SignalControl signalControl, DBusConnection connection) {
+    public DbusMultiAccountManagerImpl(
+            final SignalControl signalControl,
+            DBusConnection connection,
+            final String busname
+    ) {
         this.signalControl = signalControl;
         this.connection = connection;
+        this.busname = busname;
     }
 
     @Override
@@ -50,7 +55,7 @@ public class DbusMultiAccountManagerImpl implements MultiAccountManager {
     public List<Manager> getManagers() {
         return signalControl.listAccounts()
                 .stream()
-                .map(a -> (Manager) new DbusManagerImpl(getRemoteObject(a, Signal.class), connection))
+                .map(a -> (Manager) new DbusManagerImpl(getRemoteObject(a, Signal.class), connection, busname))
                 .toList();
     }
 
@@ -70,7 +75,9 @@ public class DbusMultiAccountManagerImpl implements MultiAccountManager {
 
     @Override
     public Manager getManager(final String phoneNumber) {
-        return new DbusManagerImpl(getRemoteObject(signalControl.getAccount(phoneNumber), Signal.class), connection);
+        return new DbusManagerImpl(getRemoteObject(signalControl.getAccount(phoneNumber), Signal.class),
+                connection,
+                busname);
     }
 
     @Override
@@ -98,7 +105,7 @@ public class DbusMultiAccountManagerImpl implements MultiAccountManager {
 
     private <T extends DBusInterface> T getRemoteObject(final DBusPath path, final Class<T> type) {
         try {
-            return connection.getRemoteObject(DbusConfig.getBusname(), path.getPath(), type);
+            return connection.getRemoteObject(busname, path.getPath(), type);
         } catch (DBusException e) {
             throw new AssertionError(e);
         }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusProperties.java b/src/main/java/org/asamk/signal/dbus/DbusProperties.java
index 256b858d..419a034b 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusProperties.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusProperties.java
@@ -52,7 +52,6 @@ public abstract class DbusProperties implements Properties {
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public Map<String, Variant<?>> GetAll(final String interface_name) {
         final var handler = getHandlerOptional(interface_name);
         if (handler.isEmpty()) {
@@ -65,7 +64,7 @@ public abstract class DbusProperties implements Properties {
                 .filter(p -> p.getGetter() != null)
                 .collect(Collectors.toMap(DbusProperty::getName, p -> {
                     final Object o = p.getGetter().get();
-                    return o instanceof Variant ? (Variant<Object>) o : new Variant<>(o);
+                    return o instanceof Variant<?> variant ? variant : new Variant<>(o);
                 }));
     }
 }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusProvisioningManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusProvisioningManagerImpl.java
index 2e026c8a..e3cf4c12 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusProvisioningManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusProvisioningManagerImpl.java
@@ -27,7 +27,9 @@ public class DbusProvisioningManagerImpl implements ProvisioningManager {
     }
 
     public DbusProvisioningManagerImpl(
-            final SignalControl signalControl, DBusConnection connection, URI deviceLinkUri
+            final SignalControl signalControl,
+            DBusConnection connection,
+            URI deviceLinkUri
     ) {
         this.signalControl = signalControl;
         this.connection = connection;
diff --git a/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
index dcea2bf1..29f4a4c9 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
@@ -2,9 +2,9 @@ package org.asamk.signal.dbus;
 
 import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.MessageEnvelope;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.asamk.signal.manager.api.RecipientAddress;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.types.Variant;
@@ -30,7 +30,7 @@ public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler
         try {
             sendDbusMessages(envelope);
         } catch (DBusException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
     }
 
@@ -74,6 +74,27 @@ public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler
                         getMessageExtras(message)));
             }
         }
+        if (envelope.edit().isPresent()) {
+            var editMessage = envelope.edit().get();
+            var message = editMessage.dataMessage();
+
+            var groupId = message.groupContext()
+                    .map(MessageEnvelope.Data.GroupContext::groupId)
+                    .map(GroupId::serialize)
+                    .orElseGet(() -> new byte[0]);
+            var isGroupUpdate = message.groupContext()
+                    .map(MessageEnvelope.Data.GroupContext::isGroupUpdate)
+                    .orElse(false);
+            if (!message.isEndSession() && !isGroupUpdate) {
+                conn.sendMessage(new Signal.EditMessageReceived(objectPath,
+                        message.timestamp(),
+                        editMessage.targetSentTimestamp(),
+                        senderString,
+                        groupId,
+                        message.body().orElse(""),
+                        getMessageExtras(message)));
+            }
+        }
         if (envelope.sync().isPresent()) {
             var syncMessage = envelope.sync().get();
             if (syncMessage.sent().isPresent()) {
@@ -110,7 +131,7 @@ public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler
 
     private List<String> getAttachments(MessageEnvelope.Data message) {
         var attachments = new ArrayList<String>();
-        if (message.attachments().size() > 0) {
+        if (!message.attachments().isEmpty()) {
             for (var attachment : message.attachments()) {
                 if (attachment.file().isPresent()) {
                     attachments.add(attachment.file().get().getAbsolutePath());
@@ -122,7 +143,7 @@ public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler
 
     private HashMap<String, Variant<?>> getMessageExtras(MessageEnvelope.Data message) {
         var extras = new HashMap<String, Variant<?>>();
-        if (message.attachments().size() > 0) {
+        if (!message.attachments().isEmpty()) {
             var attachments = message.attachments()
                     .stream()
                     .filter(a -> a.id().isPresent())
@@ -130,7 +151,7 @@ public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler
                     .toList();
             extras.put("attachments", new Variant<>(attachments, "aa{sv}"));
         }
-        if (message.mentions().size() > 0) {
+        if (!message.mentions().isEmpty()) {
             var mentions = message.mentions().stream().map(this::getMentionMap).toList();
             extras.put("mentions", new Variant<>(mentions, "aa{sv}"));
         }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusRegistrationManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusRegistrationManagerImpl.java
index 4d43b98c..0c02c680 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusRegistrationManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusRegistrationManagerImpl.java
@@ -27,8 +27,13 @@ public class DbusRegistrationManagerImpl implements RegistrationManager {
 
     @Override
     public void register(
-            final boolean voiceVerification, final String captcha
+            final boolean voiceVerification,
+            final String captcha,
+            final boolean forceRegister
     ) throws IOException, CaptchaRequiredException {
+        if (forceRegister) {
+            throw new UnsupportedOperationException();
+        }
         if (captcha == null) {
             signalControl.register(number, voiceVerification);
         } else {
@@ -38,7 +43,8 @@ public class DbusRegistrationManagerImpl implements RegistrationManager {
 
     @Override
     public void verifyAccount(
-            final String verificationCode, final String pin
+            final String verificationCode,
+            final String pin
     ) throws IOException, PinLockedException, IncorrectPinException {
         if (pin == null) {
             signalControl.verify(number, verificationCode);
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
index 59afebf8..50150a98 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -10,9 +10,14 @@ import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.PinLockMissingException;
 import org.asamk.signal.manager.api.PinLockedException;
+import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.UserAlreadyExistsException;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 import org.freedesktop.dbus.DBusPath;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.net.URI;
@@ -23,6 +28,7 @@ import java.util.concurrent.TimeoutException;
 
 public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
+    private static final Logger logger = LoggerFactory.getLogger(DbusSignalControlImpl.class);
     private final MultiAccountManager c;
 
     private final String objectPath;
@@ -44,21 +50,27 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
     @Override
     public void register(
-            final String number, final boolean voiceVerification
+            final String number,
+            final boolean voiceVerification
     ) throws Error.Failure, Error.InvalidNumber {
         registerWithCaptcha(number, voiceVerification, null);
     }
 
     @Override
     public void registerWithCaptcha(
-            final String number, final boolean voiceVerification, final String captcha
+            final String number,
+            final boolean voiceVerification,
+            final String captcha
     ) throws Error.Failure, Error.InvalidNumber {
         if (!Manager.isValidNumber(number, null)) {
             throw new SignalControl.Error.InvalidNumber(
                     "Invalid account (phone number), make sure you include the country code.");
         }
         try (final RegistrationManager registrationManager = c.getNewRegistrationManager(number)) {
-            registrationManager.register(voiceVerification, captcha);
+            registrationManager.register(voiceVerification, captcha, false);
+        } catch (RateLimitException e) {
+            String message = "Rate limit reached";
+            throw new SignalControl.Error.Failure(message);
         } catch (CaptchaRequiredException e) {
             String message = captcha == null ? "Captcha required for verification." : "Invalid captcha given.";
             throw new SignalControl.Error.RequiresCaptcha(message);
@@ -66,7 +78,7 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
             throw new Error.InvalidNumber(e.getMessage());
         } catch (OverlappingFileLockException e) {
             throw new SignalControl.Error.Failure("Account is already in use");
-        } catch (IOException e) {
+        } catch (IOException | VerificationMethodNotAvailableException e) {
             throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
         }
     }
@@ -78,7 +90,9 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
     @Override
     public void verifyWithPin(
-            final String number, final String verificationCode, final String pin
+            final String number,
+            final String verificationCode,
+            final String pin
     ) throws Error.Failure, Error.InvalidNumber {
         try (final RegistrationManager registrationManager = c.getNewRegistrationManager(number)) {
             registrationManager.verifyAccount(verificationCode, pin);
@@ -92,27 +106,28 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
                             + (e.getTimeRemaining() / 1000 / 60 / 60));
         } catch (IncorrectPinException e) {
             throw new Error.Failure("Verification failed! Invalid pin, tries remaining: " + e.getTriesRemaining());
+        } catch (PinLockMissingException e) {
+            throw new Error.Failure("Account is pin locked, but pin data has been deleted on the server.");
         }
     }
 
     @Override
     public String link(final String newDeviceName) throws Error.Failure {
+        final URI deviceLinkUri;
         try {
-            final URI deviceLinkUri = c.getNewProvisioningDeviceLinkUri();
-            final var thread = new Thread(() -> {
-                final ProvisioningManager provisioningManager = c.getProvisioningManagerFor(deviceLinkUri);
-                try {
-                    provisioningManager.finishDeviceLink(newDeviceName);
-                } catch (IOException | TimeoutException | UserAlreadyExistsException e) {
-                    e.printStackTrace();
-                }
-            });
-            thread.setName("dbus-link");
-            thread.start();
-            return deviceLinkUri.toString();
+            deviceLinkUri = c.getNewProvisioningDeviceLinkUri();
         } catch (TimeoutException | IOException e) {
             throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
         }
+        Thread.ofPlatform().name("dbus-link").start(() -> {
+            final ProvisioningManager provisioningManager = c.getProvisioningManagerFor(deviceLinkUri);
+            try {
+                provisioningManager.finishDeviceLink(newDeviceName);
+            } catch (IOException | TimeoutException | UserAlreadyExistsException e) {
+                logger.warn("Failed to finish linking", e);
+            }
+        });
+        return deviceLinkUri.toString();
     }
 
     @Override
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index d2ac27a9..725df8b1 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -4,12 +4,27 @@ import org.asamk.Signal;
 import org.asamk.signal.BaseConfig;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.CaptchaRejectedException;
+import org.asamk.signal.manager.api.DeviceLimitExceededException;
+import org.asamk.signal.manager.api.DeviceLinkUrl;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupLinkState;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupPermission;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.api.IdentityVerificationCode;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidNumberException;
 import org.asamk.signal.manager.api.InvalidStickerException;
+import org.asamk.signal.manager.api.LastGroupAdminException;
 import org.asamk.signal.manager.api.Message;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
+import org.asamk.signal.manager.api.PendingAdminApprovalException;
+import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.RecipientAddress;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendMessageResult;
 import org.asamk.signal.manager.api.SendMessageResults;
@@ -19,15 +34,7 @@ import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupLinkState;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupPermission;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.LastGroupAdminException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.asamk.signal.util.DateUtils;
 import org.asamk.signal.util.SendMessageResultUtils;
 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
@@ -52,9 +59,12 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
-public class DbusSignalImpl implements Signal {
+import static org.asamk.signal.dbus.DbusUtils.makeValidObjectPathElement;
+
+public class DbusSignalImpl implements Signal, AutoCloseable {
 
     private final Manager m;
     private final DBusConnection connection;
@@ -64,13 +74,17 @@ public class DbusSignalImpl implements Signal {
     private DBusPath thisDevice;
     private final List<StructDevice> devices = new ArrayList<>();
     private final List<StructGroup> groups = new ArrayList<>();
+    private final List<StructIdentity> identities = new ArrayList<>();
     private DbusReceiveMessageHandler dbusMessageHandler;
     private int subscriberCount;
 
-    private final static Logger logger = LoggerFactory.getLogger(DbusSignalImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(DbusSignalImpl.class);
 
     public DbusSignalImpl(
-            final Manager m, DBusConnection connection, final String objectPath, final boolean noReceiveOnStart
+            final Manager m,
+            DBusConnection connection,
+            final String objectPath,
+            final boolean noReceiveOnStart
     ) {
         this.m = m;
         this.connection = connection;
@@ -96,8 +110,10 @@ public class DbusSignalImpl implements Signal {
         updateDevices();
         updateGroups();
         updateConfiguration();
+        updateIdentities();
     }
 
+    @Override
     public void close() {
         if (dbusMessageHandler != null) {
             m.removeReceiveHandler(dbusMessageHandler);
@@ -110,6 +126,7 @@ public class DbusSignalImpl implements Signal {
         unExportDevices();
         unExportGroups();
         unExportConfiguration();
+        unExportIdentities();
         connection.unExportObject(this.objectPath);
     }
 
@@ -147,8 +164,10 @@ public class DbusSignalImpl implements Signal {
             m.submitRateLimitRecaptchaChallenge(challenge, captcha);
         } catch (IOException e) {
             throw new Error.Failure("Submit challenge error: " + e.getMessage());
+        } catch (CaptchaRejectedException e) {
+            throw new Error.Failure(
+                    "Captcha rejected, it may be outdated, already used or solved from a different IP address.");
         }
-
     }
 
     @Override
@@ -172,9 +191,12 @@ public class DbusSignalImpl implements Signal {
     @Override
     public void addDevice(String uri) {
         try {
-            m.addDeviceLink(new URI(uri));
-        } catch (IOException | InvalidDeviceLinkException e) {
+            var deviceLinkUrl = DeviceLinkUrl.parseDeviceLinkUri(new URI(uri));
+            m.addDeviceLink(deviceLinkUrl);
+        } catch (IOException | InvalidDeviceLinkException | DeviceLimitExceededException e) {
             throw new Error.Failure(e.getClass().getSimpleName() + " Add device link failed. " + e.getMessage());
+        } catch (NotPrimaryDeviceException e) {
+            throw new Error.Failure("This command doesn't work on linked devices.");
         } catch (URISyntaxException e) {
             throw new Error.InvalidUri(e.getClass().getSimpleName()
                     + " Device link uri has invalid format: "
@@ -210,17 +232,21 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
-    public long sendMessage(final String message, final List<String> attachments, final List<String> recipients) {
+    public long sendMessage(final String messageText, final List<String> attachments, final List<String> recipients) {
         try {
-            final var results = m.sendMessage(new Message(message,
-                            attachments,
-                            List.of(),
-                            Optional.empty(),
-                            Optional.empty(),
-                            List.of()),
-                    getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
-                            .map(RecipientIdentifier.class::cast)
-                            .collect(Collectors.toSet()));
+            final var message = new Message(messageText,
+                    attachments,
+                    false,
+                    List.of(),
+                    Optional.empty(),
+                    Optional.empty(),
+                    List.of(),
+                    Optional.empty(),
+                    List.of());
+            final var recipientIdentifiers = getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
+                    .map(RecipientIdentifier.class::cast)
+                    .collect(Collectors.toSet());
+            final var results = m.sendMessage(message, recipientIdentifiers, false);
 
             checkSendMessageResults(results);
             return results.timestamp();
@@ -236,16 +262,12 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
-    public long sendRemoteDeleteMessage(
-            final long targetSentTimestamp, final String recipient
-    ) {
+    public long sendRemoteDeleteMessage(final long targetSentTimestamp, final String recipient) {
         return sendRemoteDeleteMessage(targetSentTimestamp, List.of(recipient));
     }
 
     @Override
-    public long sendRemoteDeleteMessage(
-            final long targetSentTimestamp, final List<String> recipients
-    ) {
+    public long sendRemoteDeleteMessage(final long targetSentTimestamp, final List<String> recipients) {
         try {
             final var results = m.sendRemoteDeleteMessage(targetSentTimestamp,
                     getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
@@ -286,7 +308,8 @@ public class DbusSignalImpl implements Signal {
                     targetSentTimestamp,
                     getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
                             .map(RecipientIdentifier.class::cast)
-                            .collect(Collectors.toSet()));
+                            .collect(Collectors.toSet()),
+                    false);
             checkSendMessageResults(results);
             return results.timestamp();
         } catch (IOException e) {
@@ -298,9 +321,27 @@ public class DbusSignalImpl implements Signal {
         }
     }
 
+    @Override
+    public long sendPaymentNotification(
+            final byte[] receipt,
+            final String note,
+            final String recipient
+    ) throws Error.Failure {
+        try {
+            final var results = m.sendPaymentNotificationMessage(receipt,
+                    note,
+                    getSingleRecipientIdentifier(recipient, m.getSelfNumber()));
+            checkSendMessageResults(results);
+            return results.timestamp();
+        } catch (IOException e) {
+            throw new Error.Failure(e.getMessage());
+        }
+    }
+
     @Override
     public void sendTyping(
-            final String recipient, final boolean stop
+            final String recipient,
+            final boolean stop
     ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity {
         try {
             final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,
@@ -317,28 +358,20 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public void sendReadReceipt(
-            final String recipient, final List<Long> messageIds
+            final String recipient,
+            final List<Long> messageIds
     ) throws Error.Failure, Error.UntrustedIdentity {
-        try {
-            final var results = m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()),
-                    messageIds);
-            checkSendMessageResults(results);
-        } catch (IOException e) {
-            throw new Error.Failure(e.getMessage());
-        }
+        final var results = m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()), messageIds);
+        checkSendMessageResults(results);
     }
 
     @Override
     public void sendViewedReceipt(
-            final String recipient, final List<Long> messageIds
+            final String recipient,
+            final List<Long> messageIds
     ) throws Error.Failure, Error.UntrustedIdentity {
-        try {
-            final var results = m.sendViewedReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()),
-                    messageIds);
-            checkSendMessageResults(results);
-        } catch (IOException e) {
-            throw new Error.Failure(e.getMessage());
-        }
+        final var results = m.sendViewedReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()), messageIds);
+        checkSendMessageResults(results);
     }
 
     @Override
@@ -361,15 +394,20 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public long sendNoteToSelfMessage(
-            final String message, final List<String> attachments
+            final String messageText,
+            final List<String> attachments
     ) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
         try {
-            final var results = m.sendMessage(new Message(message,
+            final var message = new Message(messageText,
                     attachments,
+                    false,
                     List.of(),
                     Optional.empty(),
                     Optional.empty(),
-                    List.of()), Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
+                    List.of(),
+                    Optional.empty(),
+                    List.of());
+            final var results = m.sendMessage(message, Set.of(RecipientIdentifier.NoteToSelf.INSTANCE), false);
             checkSendMessageResults(results);
             return results.timestamp();
         } catch (AttachmentInvalidException e) {
@@ -404,14 +442,18 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
-    public long sendGroupMessage(final String message, final List<String> attachments, final byte[] groupId) {
+    public long sendGroupMessage(final String messageText, final List<String> attachments, final byte[] groupId) {
         try {
-            var results = m.sendMessage(new Message(message,
+            final var message = new Message(messageText,
                     attachments,
+                    false,
                     List.of(),
                     Optional.empty(),
                     Optional.empty(),
-                    List.of()), Set.of(getGroupRecipientIdentifier(groupId)));
+                    List.of(),
+                    Optional.empty(),
+                    List.of());
+            var results = m.sendMessage(message, Set.of(getGroupRecipientIdentifier(groupId)), false);
             checkSendMessageResults(results);
             return results.timestamp();
         } catch (IOException | InvalidStickerException e) {
@@ -427,7 +469,8 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public void sendGroupTyping(
-            final byte[] groupId, final boolean stop
+            final byte[] groupId,
+            final boolean stop
     ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity {
         try {
             final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,
@@ -441,9 +484,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
-    public long sendGroupRemoteDeleteMessage(
-            final long targetSentTimestamp, final byte[] groupId
-    ) {
+    public long sendGroupRemoteDeleteMessage(final long targetSentTimestamp, final byte[] groupId) {
         try {
             final var results = m.sendRemoteDeleteMessage(targetSentTimestamp,
                     Set.of(getGroupRecipientIdentifier(groupId)));
@@ -469,7 +510,8 @@ public class DbusSignalImpl implements Signal {
                     remove,
                     getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber()),
                     targetSentTimestamp,
-                    Set.of(getGroupRecipientIdentifier(groupId)));
+                    Set.of(getGroupRecipientIdentifier(groupId)),
+                    false);
             checkSendMessageResults(results);
             return results.timestamp();
         } catch (IOException e) {
@@ -492,11 +534,9 @@ public class DbusSignalImpl implements Signal {
     @Override
     public void setContactName(final String number, final String name) {
         try {
-            m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name, "");
+            m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name, "", null, null, null);
         } catch (NotPrimaryDeviceException e) {
             throw new Error.Failure("This command doesn't work on linked devices.");
-        } catch (IOException e) {
-            throw new Error.Failure("Contact is not registered.");
         } catch (UnregisteredRecipientException e) {
             throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");
         }
@@ -527,6 +567,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
+    @Deprecated
     public void setGroupBlocked(final byte[] groupId, final boolean blocked) {
         try {
             m.setGroupsBlocked(List.of(getGroupId(groupId)), blocked);
@@ -540,6 +581,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
+    @Deprecated
     public List<byte[]> getGroupIds() {
         var groups = m.getGroups();
         return groups.stream().map(g -> g.groupId().serialize()).toList();
@@ -562,6 +604,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
+    @Deprecated
     public String getGroupName(final byte[] groupId) {
         var group = m.getGroup(getGroupId(groupId));
         if (group == null || group.title() == null) {
@@ -572,6 +615,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
+    @Deprecated
     public List<String> getGroupMembers(final byte[] groupId) {
         var group = m.getGroup(getGroupId(groupId));
         if (group == null) {
@@ -584,20 +628,27 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public byte[] createGroup(
-            final String name, final List<String> members, final String avatar
+            final String name,
+            final List<String> members,
+            final String avatar
     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber {
-        return updateGroup(new byte[0], name, members, avatar);
+        return updateGroupInternal(new byte[0], name, members, avatar);
     }
 
     @Override
+    @Deprecated
     public byte[] updateGroup(byte[] groupId, String name, List<String> members, String avatar) {
+        return updateGroupInternal(groupId, name, members, avatar);
+    }
+
+    public byte[] updateGroupInternal(byte[] groupId, String name, List<String> members, String avatar) {
         try {
             groupId = nullIfEmpty(groupId);
             name = nullIfEmpty(name);
             avatar = nullIfEmpty(avatar);
             final var memberIdentifiers = getSingleRecipientIdentifiers(members, m.getSelfNumber());
             if (groupId == null) {
-                final var results = m.createGroup(name, memberIdentifiers, avatar == null ? null : new File(avatar));
+                final var results = m.createGroup(name, memberIdentifiers, avatar);
                 updateGroups();
                 checkGroupSendMessageResults(results.second().timestamp(), results.second().results());
                 return results.first().serialize();
@@ -606,7 +657,7 @@ public class DbusSignalImpl implements Signal {
                         UpdateGroup.newBuilder()
                                 .withName(name)
                                 .withMembers(memberIdentifiers)
-                                .withAvatarFile(avatar == null ? null : new File(avatar))
+                                .withAvatarFile(avatar)
                                 .build());
                 if (results != null) {
                     checkGroupSendMessageResults(results.timestamp(), results.results());
@@ -625,6 +676,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
+    @Deprecated
     public boolean isRegistered() {
         return true;
     }
@@ -632,7 +684,7 @@ public class DbusSignalImpl implements Signal {
     @Override
     public boolean isRegistered(String number) {
         var result = isRegistered(List.of(number));
-        return result.get(0);
+        return result.getFirst();
     }
 
     @Override
@@ -646,6 +698,10 @@ public class DbusSignalImpl implements Signal {
             registered = m.getUserStatus(new HashSet<>(numbers));
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
+        } catch (RateLimitException e) {
+            throw new Error.Failure(e.getMessage()
+                    + ", retry at "
+                    + DateUtils.formatTimestamp(e.getNextAttemptTimestamp()));
         }
 
         return numbers.stream().map(number -> registered.get(number).uuid() != null).toList();
@@ -666,7 +722,7 @@ public class DbusSignalImpl implements Signal {
             about = nullIfEmpty(about);
             aboutEmoji = nullIfEmpty(aboutEmoji);
             avatarPath = nullIfEmpty(avatarPath);
-            File avatarFile = removeAvatar || avatarPath == null ? null : new File(avatarPath);
+            final var avatarFile = removeAvatar || avatarPath == null ? null : avatarPath;
             m.updateProfile(UpdateProfile.newBuilder()
                     .withGivenName(givenName)
                     .withFamilyName(familyName)
@@ -741,6 +797,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
+    @Deprecated
     public void quitGroup(final byte[] groupId) {
         var group = getGroupId(groupId);
         try {
@@ -763,6 +820,8 @@ public class DbusSignalImpl implements Signal {
             }
             final var result = m.joinGroup(linkUrl);
             return result.first().serialize();
+        } catch (PendingAdminApprovalException e) {
+            throw new Error.Failure("Pending admin approval: " + e.getMessage());
         } catch (GroupInviteLinkUrl.InvalidGroupLinkException | InactiveGroupLinkException e) {
             throw new Error.Failure("Group link is invalid: " + e.getMessage());
         } catch (GroupInviteLinkUrl.UnknownGroupLinkVersionException e) {
@@ -778,6 +837,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
+    @Deprecated
     public boolean isGroupBlocked(final byte[] groupId) {
         var group = m.getGroup(getGroupId(groupId));
         if (group == null) {
@@ -788,6 +848,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
+    @Deprecated
     public boolean isMember(final byte[] groupId) {
         var group = m.getGroup(getGroupId(groupId));
         if (group == null) {
@@ -848,7 +909,8 @@ public class DbusSignalImpl implements Signal {
     }
 
     private static void checkGroupSendMessageResults(
-            long timestamp, Collection<SendMessageResult> results
+            long timestamp,
+            Collection<SendMessageResult> results
     ) throws DBusExecutionException {
         if (results.size() == 1) {
             checkSendMessageResult(timestamp, results.stream().findFirst().get());
@@ -856,7 +918,7 @@ public class DbusSignalImpl implements Signal {
         }
 
         var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results);
-        if (errors.size() == 0 || errors.size() < results.size()) {
+        if (errors.isEmpty() || errors.size() < results.size()) {
             return;
         }
 
@@ -875,7 +937,8 @@ public class DbusSignalImpl implements Signal {
     }
 
     private static Set<RecipientIdentifier.Single> getSingleRecipientIdentifiers(
-            final Collection<String> recipientStrings, final String localNumber
+            final Collection<String> recipientStrings,
+            final String localNumber
     ) throws DBusExecutionException {
         final var identifiers = new HashSet<RecipientIdentifier.Single>();
         for (var recipientString : recipientStrings) {
@@ -885,7 +948,8 @@ public class DbusSignalImpl implements Signal {
     }
 
     private static RecipientIdentifier.Single getSingleRecipientIdentifier(
-            final String recipientString, final String localNumber
+            final String recipientString,
+            final String localNumber
     ) throws DBusExecutionException {
         try {
             return RecipientIdentifier.Single.fromString(recipientString, localNumber);
@@ -952,11 +1016,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     private static String getGroupObjectPath(String basePath, byte[] groupId) {
-        return basePath + "/Groups/" + Base64.getEncoder()
-                .encodeToString(groupId)
-                .replace("+", "_")
-                .replace("/", "_")
-                .replace("=", "_");
+        return basePath + "/Groups/" + makeValidObjectPathElement(Base64.getEncoder().encodeToString(groupId));
     }
 
     private void updateGroups() {
@@ -999,7 +1059,114 @@ public class DbusSignalImpl implements Signal {
             connection.exportObject(object);
             logger.debug("Exported dbus object: " + object.getObjectPath());
         } catch (DBusException e) {
-            e.printStackTrace();
+            logger.warn("Failed to export dbus object (" + object.getObjectPath() + "): " + e.getMessage());
+        }
+    }
+
+    private void updateIdentities() {
+        List<org.asamk.signal.manager.api.Identity> identities;
+        identities = m.getIdentities();
+
+        unExportIdentities();
+
+        identities.forEach(i -> {
+            final var object = new DbusSignalIdentityImpl(i);
+            exportObject(object);
+            this.identities.add(new StructIdentity(new DBusPath(object.getObjectPath()),
+                    i.recipient().uuid().map(UUID::toString).orElse(""),
+                    i.recipient().number().orElse("")));
+        });
+    }
+
+    private static String getIdentityObjectPath(String basePath, String id) {
+        return basePath + "/Identities/" + makeValidObjectPathElement(id);
+    }
+
+    private void unExportIdentities() {
+        this.identities.stream()
+                .map(StructIdentity::getObjectPath)
+                .map(DBusPath::getPath)
+                .forEach(connection::unExportObject);
+        this.identities.clear();
+    }
+
+    @Override
+    public DBusPath getIdentity(String number) throws Error.Failure {
+        final var found = identities.stream()
+                .filter(identity -> identity.getNumber().equals(number) || identity.getUuid().equals(number))
+                .findFirst();
+
+        if (found.isEmpty()) {
+            throw new Error.Failure("Identity for " + number + " unknown");
+        }
+        return found.get().getObjectPath();
+    }
+
+    @Override
+    public List<StructIdentity> listIdentities() {
+        updateIdentities();
+        return this.identities;
+    }
+
+    public class DbusSignalIdentityImpl extends DbusProperties implements Signal.Identity {
+
+        private final org.asamk.signal.manager.api.Identity identity;
+
+        public DbusSignalIdentityImpl(final org.asamk.signal.manager.api.Identity identity) {
+            this.identity = identity;
+            super.addPropertiesHandler(new DbusInterfacePropertiesHandler("org.asamk.Signal.Identity",
+                    List.of(new DbusProperty<>("Number", () -> identity.recipient().number().orElse("")),
+                            new DbusProperty<>("Uuid",
+                                    () -> identity.recipient().uuid().map(UUID::toString).orElse("")),
+                            new DbusProperty<>("Fingerprint", identity::fingerprint),
+                            new DbusProperty<>("SafetyNumber", identity::safetyNumber),
+                            new DbusProperty<>("ScannableSafetyNumber", identity::scannableSafetyNumber),
+                            new DbusProperty<>("TrustLevel", identity::trustLevel),
+                            new DbusProperty<>("AddedDate", identity::dateAddedTimestamp))));
+        }
+
+        @Override
+        public String getObjectPath() {
+            return getIdentityObjectPath(objectPath,
+                    identity.recipient().getLegacyIdentifier() + "_" + identity.recipient().getIdentifier());
+        }
+
+        @Override
+        public void trust() throws Error.Failure {
+            var recipient = RecipientIdentifier.Single.fromAddress(identity.recipient());
+            try {
+                m.trustIdentityAllKeys(recipient);
+            } catch (UnregisteredRecipientException e) {
+                throw new Error.Failure("The user " + e.getSender().getIdentifier() + " is not registered.");
+            }
+            updateIdentities();
+        }
+
+        @Override
+        public void trustVerified(String safetyNumber) throws Error.Failure {
+            var recipient = RecipientIdentifier.Single.fromAddress(identity.recipient());
+
+            if (safetyNumber == null) {
+                throw new Error.Failure("You need to specify a fingerprint/safety number");
+            }
+            final IdentityVerificationCode verificationCode;
+            try {
+                verificationCode = IdentityVerificationCode.parse(safetyNumber);
+            } catch (Exception e) {
+                throw new Error.Failure(
+                        "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
+            }
+
+            try {
+                final var res = m.trustIdentityVerified(recipient, verificationCode);
+                if (!res) {
+                    throw new Error.Failure(
+                            "Failed to set the trust for this number, make sure the number and the fingerprint/safety number are correct.");
+                }
+            } catch (UnregisteredRecipientException e) {
+                throw new Error.Failure("The user " + e.getSender().getIdentifier() + " is not registered.");
+            }
+            updateIdentities();
         }
     }
 
@@ -1026,6 +1193,8 @@ public class DbusSignalImpl implements Signal {
             try {
                 m.removeLinkedDevices(device.id());
                 updateDevices();
+            } catch (NotPrimaryDeviceException e) {
+                throw new Error.Failure("This command doesn't work on linked devices.");
             } catch (IOException e) {
                 throw new Error.Failure(e.getMessage());
             }
@@ -1036,7 +1205,7 @@ public class DbusSignalImpl implements Signal {
                 throw new Error.Failure("Only the name of this device can be changed");
             }
             try {
-                m.updateAccountAttributes(name);
+                m.updateAccountAttributes(name, null, null, null);
                 // update device list
                 updateDevices();
             } catch (IOException e) {
@@ -1047,8 +1216,7 @@ public class DbusSignalImpl implements Signal {
 
     public class DbusSignalConfigurationImpl extends DbusProperties implements Signal.Configuration {
 
-        public DbusSignalConfigurationImpl(
-        ) {
+        public DbusSignalConfigurationImpl() {
             super.addPropertiesHandler(new DbusInterfacePropertiesHandler("org.asamk.Signal.Configuration",
                     List.of(new DbusProperty<>("ReadReceipts", this::getReadReceipts, this::setReadReceipts),
                             new DbusProperty<>("UnidentifiedDeliveryIndicators",
@@ -1093,8 +1261,6 @@ public class DbusSignalImpl implements Signal {
                         Optional.ofNullable(unidentifiedDeliveryIndicators),
                         Optional.ofNullable(typingIndicators),
                         Optional.ofNullable(linkPreviews)));
-            } catch (IOException e) {
-                throw new Error.Failure("UpdateAccount error: " + e.getMessage());
             } catch (NotPrimaryDeviceException e) {
                 throw new Error.Failure("This command doesn't work on linked devices.");
             }
@@ -1170,8 +1336,10 @@ public class DbusSignalImpl implements Signal {
         public void quitGroup() throws Error.Failure {
             try {
                 m.quitGroup(groupId, Set.of());
-            } catch (GroupNotFoundException | NotAGroupMemberException e) {
+            } catch (GroupNotFoundException e) {
                 throw new Error.GroupNotFound(e.getMessage());
+            } catch (NotAGroupMemberException e) {
+                throw new Error.NotAGroupMember(e.getMessage());
             } catch (IOException e) {
                 throw new Error.Failure(e.getMessage());
             } catch (LastGroupAdminException e) {
@@ -1247,7 +1415,7 @@ public class DbusSignalImpl implements Signal {
         }
 
         private void setGroupAvatar(final String avatar) {
-            updateGroup(UpdateGroup.newBuilder().withAvatarFile(new File(avatar)).build());
+            updateGroup(UpdateGroup.newBuilder().withAvatarFile(avatar).build());
         }
 
         private void setMessageExpirationTime(final int expirationTime) {
diff --git a/src/main/java/org/asamk/signal/dbus/DbusUtils.java b/src/main/java/org/asamk/signal/dbus/DbusUtils.java
new file mode 100644
index 00000000..eba0cccf
--- /dev/null
+++ b/src/main/java/org/asamk/signal/dbus/DbusUtils.java
@@ -0,0 +1,12 @@
+package org.asamk.signal.dbus;
+
+public final class DbusUtils {
+
+    private DbusUtils() {
+
+    }
+
+    public static String makeValidObjectPathElement(String pathElement) {
+        return pathElement.replaceAll("[^A-Za-z0-9_]", "_");
+    }
+}
diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
new file mode 100644
index 00000000..542d928b
--- /dev/null
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -0,0 +1,270 @@
+package org.asamk.signal.http;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpServer;
+
+import org.asamk.signal.commands.Commands;
+import org.asamk.signal.json.JsonReceiveMessageHandler;
+import org.asamk.signal.jsonrpc.JsonRpcReader;
+import org.asamk.signal.jsonrpc.JsonRpcResponse;
+import org.asamk.signal.jsonrpc.JsonRpcSender;
+import org.asamk.signal.jsonrpc.SignalJsonRpcCommandHandler;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.MultiAccountManager;
+import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.util.Util;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class HttpServerHandler implements AutoCloseable {
+
+    private static final Logger logger = LoggerFactory.getLogger(HttpServerHandler.class);
+
+    private final ObjectMapper objectMapper = Util.createJsonObjectMapper();
+
+    private final InetSocketAddress address;
+
+    private final SignalJsonRpcCommandHandler commandHandler;
+    private final MultiAccountManager c;
+    private final Manager m;
+    private HttpServer server;
+    private final AtomicBoolean shutdown = new AtomicBoolean(false);
+
+    public HttpServerHandler(final InetSocketAddress address, final Manager m) {
+        this.address = address;
+        commandHandler = new SignalJsonRpcCommandHandler(m, Commands::getCommand);
+        this.c = null;
+        this.m = m;
+    }
+
+    public HttpServerHandler(final InetSocketAddress address, final MultiAccountManager c) {
+        this.address = address;
+        commandHandler = new SignalJsonRpcCommandHandler(c, Commands::getCommand);
+        this.c = c;
+        this.m = null;
+    }
+
+    public void init() throws IOException {
+        if (server != null) {
+            throw new AssertionError("HttpServerHandler already initialized");
+        }
+        logger.debug("Starting HTTP server on {}", address);
+
+        server = HttpServer.create(address, 0);
+        server.setExecutor(Executors.newCachedThreadPool());
+
+        server.createContext("/api/v1/rpc", this::handleRpcEndpoint);
+        server.createContext("/api/v1/events", this::handleEventsEndpoint);
+        server.createContext("/api/v1/check", this::handleCheckEndpoint);
+
+        server.start();
+        logger.info("Started HTTP server on {}", address);
+    }
+
+    @Override
+    public void close() {
+        if (server != null) {
+            shutdown.set(true);
+            synchronized (this) {
+                this.notifyAll();
+            }
+            // Increase this delay when https://bugs.openjdk.org/browse/JDK-8304065 is fixed
+            server.stop(2);
+            server = null;
+            shutdown.set(false);
+        }
+    }
+
+    private void sendResponse(int status, Object response, HttpExchange httpExchange) throws IOException {
+        if (response != null) {
+            final var byteResponse = objectMapper.writeValueAsBytes(response);
+
+            httpExchange.getResponseHeaders().add("Content-Type", "application/json");
+            httpExchange.sendResponseHeaders(status, byteResponse.length);
+
+            httpExchange.getResponseBody().write(byteResponse);
+        } else {
+            httpExchange.sendResponseHeaders(status, -1);
+        }
+
+        httpExchange.getResponseBody().close();
+    }
+
+    private void handleRpcEndpoint(HttpExchange httpExchange) throws IOException {
+        if (!"/api/v1/rpc".equals(httpExchange.getRequestURI().getPath())) {
+            sendResponse(404, null, httpExchange);
+            return;
+        }
+        if (!"POST".equals(httpExchange.getRequestMethod())) {
+            sendResponse(405, null, httpExchange);
+            return;
+        }
+
+        final var contentType = httpExchange.getRequestHeaders().getFirst("Content-Type");
+        if (contentType == null || !contentType.startsWith("application/json")) {
+            sendResponse(415, null, httpExchange);
+            return;
+        }
+
+        try {
+
+            final Object[] result = {null};
+            final var jsonRpcSender = new JsonRpcSender(s -> {
+                if (result[0] != null) {
+                    throw new AssertionError("There should only be a single JSON-RPC response");
+                }
+
+                result[0] = s;
+            });
+
+            final var jsonRpcReader = new JsonRpcReader(jsonRpcSender, httpExchange.getRequestBody());
+            jsonRpcReader.readMessages((method, params) -> commandHandler.handleRequest(objectMapper, method, params),
+                    response -> logger.debug("Received unexpected response for id {}", response.getId()));
+
+            if (result[0] != null) {
+                sendResponse(200, result[0], httpExchange);
+            } else {
+                sendResponse(201, null, httpExchange);
+            }
+
+        } catch (Throwable aEx) {
+            logger.error("Failed to process request.", aEx);
+            sendResponse(200,
+                    JsonRpcResponse.forError(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR,
+                            "An internal server error has occurred.",
+                            null), null),
+                    httpExchange);
+        }
+    }
+
+    private void handleEventsEndpoint(HttpExchange httpExchange) throws IOException {
+        if (!"/api/v1/events".equals(httpExchange.getRequestURI().getPath())) {
+            sendResponse(404, null, httpExchange);
+            return;
+        }
+        if (!"GET".equals(httpExchange.getRequestMethod())) {
+            sendResponse(405, null, httpExchange);
+            return;
+        }
+
+        try {
+            final var queryString = httpExchange.getRequestURI().getRawQuery();
+            final var query = queryString == null ? Map.<String, String>of() : Util.getQueryMap(queryString);
+
+            List<Manager> managers = getManagerFromQuery(query);
+            if (managers == null) {
+                sendResponse(400, null, httpExchange);
+                return;
+            }
+
+            httpExchange.getResponseHeaders().add("Content-Type", "text/event-stream");
+            httpExchange.sendResponseHeaders(200, 0);
+            final var sender = new ServerSentEventSender(httpExchange.getResponseBody());
+
+            final var shouldStop = new AtomicBoolean(false);
+            final var handlers = subscribeReceiveHandlers(managers, sender, () -> {
+                shouldStop.set(true);
+                synchronized (this) {
+                    this.notifyAll();
+                }
+            });
+
+            try {
+                while (true) {
+                    synchronized (this) {
+                        wait(15_000);
+                    }
+                    if (shouldStop.get() || shutdown.get()) {
+                        break;
+                    }
+
+                    try {
+                        sender.sendKeepAlive();
+                    } catch (IOException e) {
+                        break;
+                    }
+                }
+            } finally {
+                for (final var pair : handlers) {
+                    unsubscribeReceiveHandler(pair);
+                }
+                try {
+                    httpExchange.getResponseBody().close();
+                } catch (IOException ignored) {
+                }
+            }
+        } catch (Throwable aEx) {
+            logger.error("Failed to process request.", aEx);
+            sendResponse(500, null, httpExchange);
+        }
+    }
+
+    private void handleCheckEndpoint(HttpExchange httpExchange) throws IOException {
+        if (!"/api/v1/check".equals(httpExchange.getRequestURI().getPath())) {
+            sendResponse(404, null, httpExchange);
+            return;
+        }
+        if (!"GET".equals(httpExchange.getRequestMethod())) {
+            sendResponse(405, null, httpExchange);
+            return;
+        }
+
+        sendResponse(200, null, httpExchange);
+    }
+
+    private List<Manager> getManagerFromQuery(final Map<String, String> query) {
+        if (m != null) {
+            return List.of(m);
+        }
+        if (c != null) {
+            final var account = query.get("account");
+            if (account == null || account.isEmpty()) {
+                return c.getManagers();
+            } else {
+                final var manager = c.getManager(account);
+                if (manager == null) {
+                    return null;
+                }
+                return List.of(manager);
+            }
+        }
+        throw new AssertionError("Unreachable state");
+    }
+
+    private List<Pair<Manager, Manager.ReceiveMessageHandler>> subscribeReceiveHandlers(
+            final List<Manager> managers,
+            final ServerSentEventSender sender,
+            Callable unsubscribe
+    ) {
+        return managers.stream().map(m1 -> {
+            final var receiveMessageHandler = new JsonReceiveMessageHandler(m1, s -> {
+                try {
+                    sender.sendEvent(null, "receive", List.of(objectMapper.writeValueAsString(s)));
+                } catch (IOException e) {
+                    unsubscribe.call();
+                }
+            });
+            m1.addReceiveHandler(receiveMessageHandler);
+            return new Pair<>(m1, (Manager.ReceiveMessageHandler) receiveMessageHandler);
+        }).toList();
+    }
+
+    private void unsubscribeReceiveHandler(final Pair<Manager, Manager.ReceiveMessageHandler> pair) {
+        final var m = pair.first();
+        final var handler = pair.second();
+        m.removeReceiveHandler(handler);
+    }
+
+    private interface Callable {
+
+        void call();
+    }
+}
diff --git a/src/main/java/org/asamk/signal/http/ServerSentEventSender.java b/src/main/java/org/asamk/signal/http/ServerSentEventSender.java
new file mode 100644
index 00000000..a1452a63
--- /dev/null
+++ b/src/main/java/org/asamk/signal/http/ServerSentEventSender.java
@@ -0,0 +1,55 @@
+package org.asamk.signal.http;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+/**
+ * This class send Server-sent events payload to an OutputStream.
+ * See <a href="https://html.spec.whatwg.org/multipage/server-sent-events.html">spec</a>
+ */
+public class ServerSentEventSender {
+
+    private final BufferedWriter writer;
+
+    public ServerSentEventSender(final OutputStream outputStream) {
+        this.writer = new BufferedWriter(new OutputStreamWriter(outputStream, StandardCharsets.UTF_8));
+    }
+
+    /**
+     * @param id    Event id
+     * @param event Event type
+     * @param data  Event data, each entry must not contain newline chars.
+     */
+    public synchronized void sendEvent(String id, String event, List<String> data) throws IOException {
+        if (id != null) {
+            writer.write("id:");
+            writer.write(id);
+            writer.write("\n");
+        }
+        if (event != null) {
+            writer.write("event:");
+            writer.write(event);
+            writer.write("\n");
+        }
+        if (data.isEmpty()) {
+            writer.write("data\n");
+        } else {
+            for (final var d : data) {
+                writer.write("data:");
+                writer.write(d);
+                writer.write("\n");
+            }
+        }
+        writer.write("\n");
+        writer.flush();
+    }
+
+    public synchronized void sendKeepAlive() throws IOException {
+        writer.write(":\n");
+        writer.flush();
+    }
+}
diff --git a/src/main/java/org/asamk/signal/json/JsonAttachment.java b/src/main/java/org/asamk/signal/json/JsonAttachment.java
index 1f6e6510..c75b3987 100644
--- a/src/main/java/org/asamk/signal/json/JsonAttachment.java
+++ b/src/main/java/org/asamk/signal/json/JsonAttachment.java
@@ -2,12 +2,33 @@ package org.asamk.signal.json;
 
 import org.asamk.signal.manager.api.MessageEnvelope;
 
-record JsonAttachment(String contentType, String filename, String id, Long size) {
+record JsonAttachment(
+        String contentType,
+        String filename,
+        String id,
+        Long size,
+        Integer width,
+        Integer height,
+        String caption,
+        Long uploadTimestamp
+) {
 
     static JsonAttachment from(MessageEnvelope.Data.Attachment attachment) {
         final var id = attachment.id().orElse(null);
         final var filename = attachment.fileName().orElse(null);
         final var size = attachment.size().orElse(null);
-        return new JsonAttachment(attachment.contentType(), filename, id, size);
+        final var width = attachment.width().orElse(null);
+        final var height = attachment.height().orElse(null);
+        final var caption = attachment.caption().orElse(null);
+        final var uploadTimestamp = attachment.uploadTimestamp().orElse(null);
+
+        return new JsonAttachment(attachment.contentType(),
+                filename,
+                id,
+                size,
+                width,
+                height,
+                caption,
+                uploadTimestamp);
     }
 }
diff --git a/src/main/java/org/asamk/signal/json/JsonAttachmentData.java b/src/main/java/org/asamk/signal/json/JsonAttachmentData.java
new file mode 100644
index 00000000..05a90c21
--- /dev/null
+++ b/src/main/java/org/asamk/signal/json/JsonAttachmentData.java
@@ -0,0 +1,5 @@
+package org.asamk.signal.json;
+
+public record JsonAttachmentData(
+        String data
+) {}
diff --git a/src/main/java/org/asamk/signal/json/JsonCallMessage.java b/src/main/java/org/asamk/signal/json/JsonCallMessage.java
index 70b1951c..1b1bc2ba 100644
--- a/src/main/java/org/asamk/signal/json/JsonCallMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonCallMessage.java
@@ -23,20 +23,17 @@ record JsonCallMessage(
                 callMessage.iceUpdate().stream().map(IceUpdate::from).toList());
     }
 
-    record Offer(long id, String sdp, String type, String opaque) {
+    record Offer(long id, String type, String opaque) {
 
         public static Offer from(final MessageEnvelope.Call.Offer offer) {
-            return new Offer(offer.id(),
-                    offer.sdp(),
-                    offer.type().name(),
-                    Base64.getEncoder().encodeToString(offer.opaque()));
+            return new Offer(offer.id(), offer.type().name(), Base64.getEncoder().encodeToString(offer.opaque()));
         }
     }
 
-    public record Answer(long id, String sdp, String opaque) {
+    public record Answer(long id, String opaque) {
 
         public static Answer from(final MessageEnvelope.Call.Answer answer) {
-            return new Answer(answer.id(), answer.sdp(), Base64.getEncoder().encodeToString(answer.opaque()));
+            return new Answer(answer.id(), Base64.getEncoder().encodeToString(answer.opaque()));
         }
     }
 
@@ -47,19 +44,17 @@ record JsonCallMessage(
         }
     }
 
-    public record Hangup(long id, String type, int deviceId, boolean isLegacy) {
+    public record Hangup(long id, String type, int deviceId) {
 
         public static Hangup from(final MessageEnvelope.Call.Hangup hangup) {
-            return new Hangup(hangup.id(), hangup.type().name(), hangup.deviceId(), hangup.isLegacy());
+            return new Hangup(hangup.id(), hangup.type().name(), hangup.deviceId());
         }
     }
 
-    public record IceUpdate(long id, String sdp, String opaque) {
+    public record IceUpdate(long id, String opaque) {
 
         public static IceUpdate from(final MessageEnvelope.Call.IceUpdate iceUpdate) {
-            return new IceUpdate(iceUpdate.id(),
-                    iceUpdate.sdp(),
-                    Base64.getEncoder().encodeToString(iceUpdate.opaque()));
+            return new IceUpdate(iceUpdate.id(), Base64.getEncoder().encodeToString(iceUpdate.opaque()));
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/json/JsonContact.java b/src/main/java/org/asamk/signal/json/JsonContact.java
new file mode 100644
index 00000000..71f05c8d
--- /dev/null
+++ b/src/main/java/org/asamk/signal/json/JsonContact.java
@@ -0,0 +1,44 @@
+package org.asamk.signal.json;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.util.List;
+
+public record JsonContact(
+        String number,
+        String uuid,
+        String username,
+        String name,
+        String givenName,
+        String familyName,
+        String nickName,
+        String nickGivenName,
+        String nickFamilyName,
+        String note,
+        String color,
+        boolean isBlocked,
+        boolean isHidden,
+        int messageExpirationTime,
+        boolean profileSharing,
+        boolean unregistered,
+        JsonProfile profile,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonInternal internal
+) {
+
+    public record JsonProfile(
+            long lastUpdateTimestamp,
+            String givenName,
+            String familyName,
+            String about,
+            String aboutEmoji,
+            boolean hasAvatar,
+            String mobileCoinAddress
+    ) {}
+
+    public record JsonInternal(
+            List<String> capabilities,
+            String unidentifiedAccessMode,
+            Boolean sharesPhoneNumber,
+            Boolean discoverableByPhonenumber
+    ) {}
+}
diff --git a/src/main/java/org/asamk/signal/json/JsonContactName.java b/src/main/java/org/asamk/signal/json/JsonContactName.java
index fdf11298..4d8c2327 100644
--- a/src/main/java/org/asamk/signal/json/JsonContactName.java
+++ b/src/main/java/org/asamk/signal/json/JsonContactName.java
@@ -4,11 +4,11 @@ import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.util.Util;
 
 public record JsonContactName(
-        String display, String given, String family, String prefix, String suffix, String middle
+        String nickname, String given, String family, String prefix, String suffix, String middle
 ) {
 
     static JsonContactName from(MessageEnvelope.Data.SharedContact.Name name) {
-        return new JsonContactName(Util.getStringIfNotBlank(name.display()),
+        return new JsonContactName(Util.getStringIfNotBlank(name.nickname()),
                 Util.getStringIfNotBlank(name.given()),
                 Util.getStringIfNotBlank(name.family()),
                 Util.getStringIfNotBlank(name.prefix()),
diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
index 74c07cd7..f24fdbba 100644
--- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
@@ -2,6 +2,7 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
@@ -20,40 +21,49 @@ record JsonDataMessage(
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonSticker sticker,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonRemoteDelete remoteDelete,
         @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonSharedContact> contacts,
-        @JsonInclude(JsonInclude.Include.NON_NULL) JsonGroupInfo groupInfo
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonTextStyle> textStyles,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonGroupInfo groupInfo,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonStoryContext storyContext
 ) {
 
-    static JsonDataMessage from(MessageEnvelope.Data dataMessage) {
+    static JsonDataMessage from(MessageEnvelope.Data dataMessage, Manager m) {
         final var timestamp = dataMessage.timestamp();
         final var groupInfo = dataMessage.groupContext().isPresent() ? JsonGroupInfo.from(dataMessage.groupContext()
-                .get()) : null;
+                .get(), m) : null;
+        final var storyContext = dataMessage.storyContext().isPresent()
+                ? JsonStoryContext.from(dataMessage.storyContext().get())
+                : null;
         final var message = dataMessage.body().orElse(null);
         final var expiresInSeconds = dataMessage.expiresInSeconds();
         final var viewOnce = dataMessage.isViewOnce();
         final var reaction = dataMessage.reaction().map(JsonReaction::from).orElse(null);
         final var quote = dataMessage.quote().isPresent() ? JsonQuote.from(dataMessage.quote().get()) : null;
         final var payment = dataMessage.payment().isPresent() ? JsonPayment.from(dataMessage.payment().get()) : null;
-        final var mentions = dataMessage.mentions().size() > 0 ? dataMessage.mentions()
+        final var mentions = !dataMessage.mentions().isEmpty() ? dataMessage.mentions()
                 .stream()
                 .map(JsonMention::from)
                 .toList() : null;
-        final var previews = dataMessage.previews().size() > 0 ? dataMessage.previews()
+        final var previews = !dataMessage.previews().isEmpty() ? dataMessage.previews()
                 .stream()
                 .map(JsonPreview::from)
                 .toList() : null;
         final var remoteDelete = dataMessage.remoteDeleteId().isPresent()
                 ? new JsonRemoteDelete(dataMessage.remoteDeleteId().get())
                 : null;
-        final var attachments = dataMessage.attachments().size() > 0 ? dataMessage.attachments()
+        final var attachments = !dataMessage.attachments().isEmpty() ? dataMessage.attachments()
                 .stream()
                 .map(JsonAttachment::from)
                 .toList() : null;
         final var sticker = dataMessage.sticker().isPresent() ? JsonSticker.from(dataMessage.sticker().get()) : null;
-
-        final var contacts = dataMessage.sharedContacts().size() > 0 ? dataMessage.sharedContacts()
+        final var contacts = !dataMessage.sharedContacts().isEmpty() ? dataMessage.sharedContacts()
                 .stream()
                 .map(JsonSharedContact::from)
                 .toList() : null;
+        final var textStyles = !dataMessage.textStyles().isEmpty() ? dataMessage.textStyles()
+                .stream()
+                .map(JsonTextStyle::from)
+                .toList() : null;
+
         return new JsonDataMessage(timestamp,
                 message,
                 expiresInSeconds,
@@ -67,6 +77,8 @@ record JsonDataMessage(
                 sticker,
                 remoteDelete,
                 contacts,
-                groupInfo);
+                textStyles,
+                groupInfo,
+                storyContext);
     }
 }
diff --git a/src/main/java/org/asamk/signal/json/JsonEditMessage.java b/src/main/java/org/asamk/signal/json/JsonEditMessage.java
new file mode 100644
index 00000000..ef61e343
--- /dev/null
+++ b/src/main/java/org/asamk/signal/json/JsonEditMessage.java
@@ -0,0 +1,12 @@
+package org.asamk.signal.json;
+
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.MessageEnvelope;
+
+record JsonEditMessage(long targetSentTimestamp, JsonDataMessage dataMessage) {
+
+    static JsonEditMessage from(MessageEnvelope.Edit editMessage, Manager m) {
+        return new JsonEditMessage(editMessage.targetSentTimestamp(),
+                JsonDataMessage.from(editMessage.dataMessage(), m));
+    }
+}
diff --git a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
index 01e39900..c370d1e2 100644
--- a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
+++ b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
@@ -1,11 +1,14 @@
 package org.asamk.signal.json;
 
+import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
-record JsonGroupInfo(String groupId, String type) {
+record JsonGroupInfo(String groupId, String groupName, int revision, String type) {
 
-    static JsonGroupInfo from(MessageEnvelope.Data.GroupContext groupContext) {
+    static JsonGroupInfo from(MessageEnvelope.Data.GroupContext groupContext, Manager m) {
         return new JsonGroupInfo(groupContext.groupId().toBase64(),
+                m.getGroup(groupContext.groupId()).title(),
+                groupContext.revision(),
                 groupContext.isGroupUpdate() ? "UPDATE" : "DELIVER");
     }
 }
diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
index 18207747..8ab8ea83 100644
--- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
@@ -4,9 +4,9 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.RecipientAddress;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.UntrustedIdentityException;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 
 import java.util.UUID;
 
@@ -17,16 +17,18 @@ public record JsonMessageEnvelope(
         String sourceName,
         Integer sourceDevice,
         long timestamp,
+        long serverReceivedTimestamp,
+        long serverDeliveredTimestamp,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonDataMessage dataMessage,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonEditMessage editMessage,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonStoryMessage storyMessage,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncMessage syncMessage,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonCallMessage callMessage,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonReceiptMessage receiptMessage,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonTypingMessage typingMessage
 ) {
 
-    public static JsonMessageEnvelope from(
-            MessageEnvelope envelope, Throwable exception, Manager m
-    ) {
+    public static JsonMessageEnvelope from(MessageEnvelope envelope, Throwable exception, Manager m) {
         final RecipientAddress sourceAddress;
         final Integer sourceDevice;
         if (envelope.sourceAddress().isPresent()) {
@@ -56,11 +58,15 @@ public record JsonMessageEnvelope(
             sourceName = null;
         }
         final var timestamp = envelope.timestamp();
+        final var serverReceivedTimestamp = envelope.serverReceivedTimestamp();
+        final var serverDeliveredTimestamp = envelope.serverDeliveredTimestamp();
         final var receiptMessage = envelope.receipt().map(JsonReceiptMessage::from).orElse(null);
         final var typingMessage = envelope.typing().map(JsonTypingMessage::from).orElse(null);
 
-        final var dataMessage = envelope.data().map(JsonDataMessage::from).orElse(null);
-        final var syncMessage = envelope.sync().map(JsonSyncMessage::from).orElse(null);
+        final var dataMessage = envelope.data().map(data -> JsonDataMessage.from(data, m)).orElse(null);
+        final var editMessage = envelope.edit().map(data -> JsonEditMessage.from(data, m)).orElse(null);
+        final var storyMessage = envelope.story().map(JsonStoryMessage::from).orElse(null);
+        final var syncMessage = envelope.sync().map(data -> JsonSyncMessage.from(data, m)).orElse(null);
         final var callMessage = envelope.call().map(JsonCallMessage::from).orElse(null);
 
         return new JsonMessageEnvelope(source,
@@ -69,7 +75,11 @@ public record JsonMessageEnvelope(
                 sourceName,
                 sourceDevice,
                 timestamp,
+                serverReceivedTimestamp,
+                serverDeliveredTimestamp,
                 dataMessage,
+                editMessage,
+                storyMessage,
                 syncMessage,
                 callMessage,
                 receiptMessage,
diff --git a/src/main/java/org/asamk/signal/json/JsonQuote.java b/src/main/java/org/asamk/signal/json/JsonQuote.java
index 01e35eb7..514f3db9 100644
--- a/src/main/java/org/asamk/signal/json/JsonQuote.java
+++ b/src/main/java/org/asamk/signal/json/JsonQuote.java
@@ -14,7 +14,8 @@ public record JsonQuote(
         String authorUuid,
         String text,
         @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonMention> mentions,
-        List<JsonQuotedAttachment> attachments
+        List<JsonQuotedAttachment> attachments,
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonTextStyle> textStyles
 ) {
 
     static JsonQuote from(MessageEnvelope.Data.Quote quote) {
@@ -25,15 +26,20 @@ public record JsonQuote(
         final var authorUuid = address.uuid().map(UUID::toString).orElse(null);
         final var text = quote.text().orElse(null);
 
-        final var mentions = quote.mentions().size() > 0
+        final var mentions = !quote.mentions().isEmpty()
                 ? quote.mentions().stream().map(JsonMention::from).toList()
                 : null;
 
-        final var attachments = quote.attachments().size() > 0 ? quote.attachments()
+        final var attachments = !quote.attachments().isEmpty() ? quote.attachments()
                 .stream()
                 .map(JsonQuotedAttachment::from)
                 .toList() : List.<JsonQuotedAttachment>of();
 
-        return new JsonQuote(id, author, authorNumber, authorUuid, text, mentions, attachments);
+        final var textStyles = !quote.textStyles().isEmpty() ? quote.textStyles()
+                .stream()
+                .map(JsonTextStyle::from)
+                .toList() : null;
+
+        return new JsonQuote(id, author, authorNumber, authorUuid, text, mentions, attachments, textStyles);
     }
 }
diff --git a/src/main/java/org/asamk/signal/json/JsonReceiveMessageHandler.java b/src/main/java/org/asamk/signal/json/JsonReceiveMessageHandler.java
index da29ed6c..ca0dba2b 100644
--- a/src/main/java/org/asamk/signal/json/JsonReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/json/JsonReceiveMessageHandler.java
@@ -10,7 +10,7 @@ import java.util.HashMap;
 
 public class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler {
 
-    private final static Logger logger = LoggerFactory.getLogger(JsonReceiveMessageHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(JsonReceiveMessageHandler.class);
 
     private final Manager m;
     private final JsonWriter jsonWriter;
diff --git a/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java b/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java
index 1bd09e83..e25385b6 100644
--- a/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java
+++ b/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.json;
 
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.asamk.signal.manager.api.RecipientAddress;
 
 import java.util.UUID;
 
diff --git a/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java b/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java
index dd7f235f..f9ca8f86 100644
--- a/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java
+++ b/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java
@@ -2,8 +2,8 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.SendMessageResult;
-import org.asamk.signal.manager.groups.GroupId;
 
 public record JsonSendMessageResult(
         JsonRecipientAddress recipientAddress,
@@ -28,7 +28,9 @@ public record JsonSendMessageResult(
                                         ? Type.NETWORK_FAILURE
                                         : result.isUnregisteredFailure()
                                                 ? Type.UNREGISTERED_FAILURE
-                                                : Type.IDENTITY_FAILURE,
+                                                : result.isInvalidPreKeyFailure()
+                                                        ? Type.INVALID_PRE_KEY_FAILURE
+                                                        : Type.IDENTITY_FAILURE,
                 result.proofRequiredFailure() != null ? result.proofRequiredFailure().getToken() : null,
                 result.proofRequiredFailure() != null ? result.proofRequiredFailure().getRetryAfterSeconds() : null);
     }
@@ -39,5 +41,6 @@ public record JsonSendMessageResult(
         UNREGISTERED_FAILURE,
         IDENTITY_FAILURE,
         RATE_LIMIT_FAILURE,
+        INVALID_PRE_KEY_FAILURE,
     }
 }
diff --git a/src/main/java/org/asamk/signal/json/JsonSharedContact.java b/src/main/java/org/asamk/signal/json/JsonSharedContact.java
index e71feda6..d898c63f 100644
--- a/src/main/java/org/asamk/signal/json/JsonSharedContact.java
+++ b/src/main/java/org/asamk/signal/json/JsonSharedContact.java
@@ -19,15 +19,15 @@ public record JsonSharedContact(
         final var name = JsonContactName.from(contact.name());
         final var avatar = contact.avatar().isPresent() ? JsonContactAvatar.from(contact.avatar().get()) : null;
 
-        final var phone = contact.phone().size() > 0
+        final var phone = !contact.phone().isEmpty()
                 ? contact.phone().stream().map(JsonContactPhone::from).toList()
                 : null;
 
-        final var email = contact.email().size() > 0
+        final var email = !contact.email().isEmpty()
                 ? contact.email().stream().map(JsonContactEmail::from).toList()
                 : null;
 
-        final var address = contact.address().size() > 0 ? contact.address()
+        final var address = !contact.address().isEmpty() ? contact.address()
                 .stream()
                 .map(JsonContactAddress::from)
                 .toList() : null;
diff --git a/src/main/java/org/asamk/signal/json/JsonStoryContext.java b/src/main/java/org/asamk/signal/json/JsonStoryContext.java
new file mode 100644
index 00000000..e2cc0c55
--- /dev/null
+++ b/src/main/java/org/asamk/signal/json/JsonStoryContext.java
@@ -0,0 +1,16 @@
+package org.asamk.signal.json;
+
+import org.asamk.signal.manager.api.MessageEnvelope;
+
+import java.util.UUID;
+
+record JsonStoryContext(
+        String authorNumber, String authorUuid, long sentTimestamp
+) {
+
+    static JsonStoryContext from(MessageEnvelope.Data.StoryContext storyContext) {
+        return new JsonStoryContext(storyContext.author().number().orElse(null),
+                storyContext.author().uuid().map(UUID::toString).orElse(null),
+                storyContext.sentTimestamp());
+    }
+}
diff --git a/src/main/java/org/asamk/signal/json/JsonStoryMessage.java b/src/main/java/org/asamk/signal/json/JsonStoryMessage.java
new file mode 100644
index 00000000..c1ca6144
--- /dev/null
+++ b/src/main/java/org/asamk/signal/json/JsonStoryMessage.java
@@ -0,0 +1,63 @@
+package org.asamk.signal.json;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import org.asamk.signal.manager.api.Color;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.MessageEnvelope;
+
+import java.util.List;
+
+record JsonStoryMessage(
+        boolean allowsReplies,
+        @JsonInclude(JsonInclude.Include.NON_NULL) String groupId,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonAttachment fileAttachment,
+        @JsonInclude(JsonInclude.Include.NON_NULL) TextAttachment textAttachment
+) {
+
+    static JsonStoryMessage from(MessageEnvelope.Story storyMessage) {
+        return new JsonStoryMessage(storyMessage.allowsReplies(),
+                storyMessage.groupId().map(GroupId::toBase64).orElse(null),
+                storyMessage.fileAttachment().map(JsonAttachment::from).orElse(null),
+                storyMessage.textAttachment().map(TextAttachment::from).orElse(null));
+    }
+
+    public record TextAttachment(
+            String text,
+            @JsonInclude(JsonInclude.Include.NON_NULL) String style,
+            @JsonInclude(JsonInclude.Include.NON_NULL) String textForegroundColor,
+            @JsonInclude(JsonInclude.Include.NON_NULL) String textBackgroundColor,
+            @JsonInclude(JsonInclude.Include.NON_NULL) JsonPreview preview,
+            @JsonInclude(JsonInclude.Include.NON_NULL) Gradient backgroundGradient,
+            @JsonInclude(JsonInclude.Include.NON_NULL) String backgroundColor
+    ) {
+
+        static TextAttachment from(MessageEnvelope.Story.TextAttachment textAttachment) {
+            return new TextAttachment(textAttachment.text().orElse(null),
+                    textAttachment.style().map(MessageEnvelope.Story.TextAttachment.Style::name).orElse(null),
+                    textAttachment.textForegroundColor().map(Color::toHexColor).orElse(null),
+                    textAttachment.textBackgroundColor().map(Color::toHexColor).orElse(null),
+                    textAttachment.preview().map(JsonPreview::from).orElse(null),
+                    textAttachment.backgroundGradient().map(Gradient::from).orElse(null),
+                    textAttachment.backgroundColor().map(Color::toHexColor).orElse(null));
+        }
+
+        public record Gradient(
+                String startColor, String endColor, List<String> colors, List<Float> positions, Integer angle
+        ) {
+
+            static Gradient from(MessageEnvelope.Story.TextAttachment.Gradient gradient) {
+                final var isLegacyGradient = gradient.colors().size() == 2
+                        && gradient.positions().size() == 2
+                        && gradient.positions().get(0) == 0f
+                        && gradient.positions().get(1) == 1f;
+
+                return new Gradient(isLegacyGradient ? gradient.colors().get(0).toHexColor() : null,
+                        isLegacyGradient ? gradient.colors().get(1).toHexColor() : null,
+                        gradient.colors().stream().map(Color::toHexColor).toList(),
+                        gradient.positions(),
+                        gradient.angle().orElse(null));
+            }
+        }
+    }
+}
diff --git a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
index fc84b088..4c2cd6ab 100644
--- a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
@@ -1,8 +1,11 @@
 package org.asamk.signal.json;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 
+import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.RecipientAddress;
 
 import java.util.UUID;
 
@@ -10,22 +13,17 @@ record JsonSyncDataMessage(
         @Deprecated String destination,
         String destinationNumber,
         String destinationUuid,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonEditMessage editMessage,
         @JsonUnwrapped JsonDataMessage dataMessage
 ) {
 
-    static JsonSyncDataMessage from(MessageEnvelope.Sync.Sent transcriptMessage) {
-        if (transcriptMessage.destination().isPresent()) {
-            final var address = transcriptMessage.destination().get();
-            return new JsonSyncDataMessage(address.getLegacyIdentifier(),
-                    address.number().orElse(null),
-                    address.uuid().map(UUID::toString).orElse(null),
-                    transcriptMessage.message().map(JsonDataMessage::from).orElse(null));
-
-        } else {
-            return new JsonSyncDataMessage(null,
-                    null,
-                    null,
-                    transcriptMessage.message().map(JsonDataMessage::from).orElse(null));
-        }
+    static JsonSyncDataMessage from(MessageEnvelope.Sync.Sent transcriptMessage, Manager m) {
+        return new JsonSyncDataMessage(transcriptMessage.destination()
+                .map(RecipientAddress::getLegacyIdentifier)
+                .orElse(null),
+                transcriptMessage.destination().flatMap(RecipientAddress::number).orElse(null),
+                transcriptMessage.destination().flatMap(address -> address.uuid().map(UUID::toString)).orElse(null),
+                transcriptMessage.editMessage().map(data -> JsonEditMessage.from(data, m)).orElse(null),
+                transcriptMessage.message().map(data -> JsonDataMessage.from(data, m)).orElse(null));
     }
 }
diff --git a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
index 6f512016..072b2e3b 100644
--- a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
@@ -2,9 +2,10 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.MessageEnvelope;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.asamk.signal.manager.api.RecipientAddress;
 
 import java.util.List;
 
@@ -16,29 +17,19 @@ enum JsonSyncMessageType {
 
 record JsonSyncMessage(
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncDataMessage sentMessage,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncStoryMessage sentStoryMessage,
         @JsonInclude(JsonInclude.Include.NON_NULL) List<String> blockedNumbers,
         @JsonInclude(JsonInclude.Include.NON_NULL) List<String> blockedGroupIds,
         @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonSyncReadMessage> readMessages,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncMessageType type
 ) {
 
-    JsonSyncMessage(
-            final JsonSyncDataMessage sentMessage,
-            final List<String> blockedNumbers,
-            final List<String> blockedGroupIds,
-            final List<JsonSyncReadMessage> readMessages,
-            final JsonSyncMessageType type
-    ) {
-        this.sentMessage = sentMessage;
-        this.blockedNumbers = blockedNumbers;
-        this.blockedGroupIds = blockedGroupIds;
-        this.readMessages = readMessages;
-        this.type = type;
-    }
-
-    static JsonSyncMessage from(MessageEnvelope.Sync syncMessage) {
-        final var sentMessage = syncMessage.sent().isPresent()
-                ? JsonSyncDataMessage.from(syncMessage.sent().get())
+    static JsonSyncMessage from(MessageEnvelope.Sync syncMessage, Manager m) {
+        final var sentMessage = syncMessage.sent().isPresent() && syncMessage.sent().get().story().isEmpty()
+                ? JsonSyncDataMessage.from(syncMessage.sent().get(), m)
+                : null;
+        final var sentStoryMessage = syncMessage.sent().isPresent() && syncMessage.sent().get().story().isPresent()
+                ? JsonSyncStoryMessage.from(syncMessage.sent().get())
                 : null;
         final List<String> blockedNumbers;
         final List<String> blockedGroupIds;
@@ -55,7 +46,7 @@ record JsonSyncMessage(
             blockedGroupIds = null;
         }
 
-        final var readMessages = syncMessage.read().size() > 0 ? syncMessage.read()
+        final var readMessages = !syncMessage.read().isEmpty() ? syncMessage.read()
                 .stream()
                 .map(JsonSyncReadMessage::from)
                 .toList() : null;
@@ -68,6 +59,6 @@ record JsonSyncMessage(
         } else {
             type = null;
         }
-        return new JsonSyncMessage(sentMessage, blockedNumbers, blockedGroupIds, readMessages, type);
+        return new JsonSyncMessage(sentMessage, sentStoryMessage, blockedNumbers, blockedGroupIds, readMessages, type);
     }
 }
diff --git a/src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java
new file mode 100644
index 00000000..6b435223
--- /dev/null
+++ b/src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java
@@ -0,0 +1,26 @@
+package org.asamk.signal.json;
+
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
+
+import org.asamk.signal.manager.api.MessageEnvelope;
+
+import java.util.UUID;
+
+record JsonSyncStoryMessage(
+        String destinationNumber, String destinationUuid, @JsonUnwrapped JsonStoryMessage dataMessage
+) {
+
+    static JsonSyncStoryMessage from(MessageEnvelope.Sync.Sent transcriptMessage) {
+        if (transcriptMessage.destination().isPresent()) {
+            final var address = transcriptMessage.destination().get();
+            return new JsonSyncStoryMessage(address.number().orElse(null),
+                    address.uuid().map(UUID::toString).orElse(null),
+                    transcriptMessage.story().map(JsonStoryMessage::from).orElse(null));
+
+        } else {
+            return new JsonSyncStoryMessage(null,
+                    null,
+                    transcriptMessage.story().map(JsonStoryMessage::from).orElse(null));
+        }
+    }
+}
diff --git a/src/main/java/org/asamk/signal/json/JsonTextStyle.java b/src/main/java/org/asamk/signal/json/JsonTextStyle.java
new file mode 100644
index 00000000..898e7db6
--- /dev/null
+++ b/src/main/java/org/asamk/signal/json/JsonTextStyle.java
@@ -0,0 +1,10 @@
+package org.asamk.signal.json;
+
+import org.asamk.signal.manager.api.TextStyle;
+
+public record JsonTextStyle(String style, int start, int length) {
+
+    static JsonTextStyle from(TextStyle textStyle) {
+        return new JsonTextStyle(textStyle.style().name(), textStyle.start(), textStyle.length());
+    }
+}
diff --git a/src/main/java/org/asamk/signal/json/JsonTypingMessage.java b/src/main/java/org/asamk/signal/json/JsonTypingMessage.java
index 0df82b1c..79a66d34 100644
--- a/src/main/java/org/asamk/signal/json/JsonTypingMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonTypingMessage.java
@@ -2,8 +2,8 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.MessageEnvelope;
-import org.asamk.signal.manager.groups.GroupId;
 
 record JsonTypingMessage(
         String action, long timestamp, @JsonInclude(JsonInclude.Include.NON_NULL) String groupId
diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcMessage.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcMessage.java
index 8d1fcbf7..e0acdcf1 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcMessage.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcMessage.java
@@ -2,8 +2,6 @@ package org.asamk.signal.jsonrpc;
 
 /**
  * Represents a JSON-RPC (batch) request or (batch) response.
- * https://www.jsonrpc.org/specification
+ * <a href="https://www.jsonrpc.org/specification">https://www.jsonrpc.org/specification</a>
  */
-public sealed abstract class JsonRpcMessage permits JsonRpcBatchMessage, JsonRpcRequest, JsonRpcResponse {
-
-}
+public sealed abstract class JsonRpcMessage permits JsonRpcBatchMessage, JsonRpcRequest, JsonRpcResponse {}
diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
index f3784a2c..327342a2 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
@@ -13,53 +13,118 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.util.Objects;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.concurrent.Executors;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 import java.util.stream.StreamSupport;
 
 public class JsonRpcReader {
 
-    private final static Logger logger = LoggerFactory.getLogger(JsonRpcReader.class);
+    private static final Logger logger = LoggerFactory.getLogger(JsonRpcReader.class);
 
     private final JsonRpcSender jsonRpcSender;
     private final ObjectMapper objectMapper;
+    private final InputStream input;
     private final Supplier<String> lineSupplier;
 
-    public JsonRpcReader(
-            final JsonRpcSender jsonRpcSender, final Supplier<String> lineSupplier
-    ) {
+    public JsonRpcReader(final JsonRpcSender jsonRpcSender, final Supplier<String> lineSupplier) {
         this.jsonRpcSender = jsonRpcSender;
+        this.input = null;
         this.lineSupplier = lineSupplier;
         this.objectMapper = Util.createJsonObjectMapper();
     }
 
-    public void readMessages(final RequestHandler requestHandler, final Consumer<JsonRpcResponse> responseHandler) {
-        while (!Thread.interrupted()) {
-            JsonRpcMessage message = readMessage();
-            if (message == null) break;
+    public JsonRpcReader(final JsonRpcSender jsonRpcSender, final InputStream input) {
+        this.jsonRpcSender = jsonRpcSender;
+        this.input = input;
+        this.lineSupplier = null;
+        this.objectMapper = Util.createJsonObjectMapper();
+    }
 
-            if (message instanceof final JsonRpcRequest jsonRpcRequest) {
+    public void readMessages(final RequestHandler requestHandler, final Consumer<JsonRpcResponse> responseHandler) {
+        if (input != null) {
+            JsonRpcMessage message = parseJsonRpcMessage(input);
+            if (message == null) {
+                return;
+            }
+
+            handleMessage(message, requestHandler, responseHandler);
+            return;
+        }
+
+        try (final var executor = Executors.newCachedThreadPool()) {
+            while (!Thread.interrupted()) {
+                final var input = lineSupplier.get();
+                if (input == null) {
+                    logger.trace("Reached end of JSON-RPC input stream.");
+                    break;
+                }
+
+                logger.trace("Incoming JSON-RPC message: {}", input);
+                final var message = parseJsonRpcMessage(input);
+                if (message == null) {
+                    continue;
+                }
+
+                executor.submit(() -> handleMessage(message, requestHandler, responseHandler));
+            }
+        }
+    }
+
+    private void handleMessage(
+            final JsonRpcMessage message,
+            final RequestHandler requestHandler,
+            final Consumer<JsonRpcResponse> responseHandler
+    ) {
+        switch (message) {
+            case JsonRpcRequest jsonRpcRequest -> {
                 logger.debug("Received json rpc request, method: " + jsonRpcRequest.getMethod());
                 final var response = handleRequest(requestHandler, jsonRpcRequest);
                 if (response != null) {
                     jsonRpcSender.sendResponse(response);
                 }
-            } else if (message instanceof JsonRpcResponse jsonRpcResponse) {
-                responseHandler.accept(jsonRpcResponse);
-            } else {
-                final var responseList = ((JsonRpcBatchMessage) message).getMessages().stream().map(jsonNode -> {
-                    final JsonRpcRequest request;
-                    try {
-                        request = parseJsonRpcRequest(jsonNode);
-                    } catch (JsonRpcException e) {
-                        return JsonRpcResponse.forError(e.getError(), getId(jsonNode));
-                    }
+            }
+            case JsonRpcResponse jsonRpcResponse -> responseHandler.accept(jsonRpcResponse);
+            case JsonRpcBatchMessage jsonRpcBatchMessage -> {
+                final var messages = jsonRpcBatchMessage.getMessages();
+                final var responseList = new ArrayList<JsonRpcResponse>(messages.size());
+                try (final var executor = Executors.newCachedThreadPool()) {
+                    final var lock = new ReentrantLock();
+                    messages.forEach(jsonNode -> {
+                        final JsonRpcRequest request;
+                        try {
+                            request = parseJsonRpcRequest(jsonNode);
+                        } catch (JsonRpcException e) {
+                            final var response = JsonRpcResponse.forError(e.getError(), getId(jsonNode));
+                            lock.lock();
+                            try {
+                                responseList.add(response);
+                            } finally {
+                                lock.unlock();
+                            }
+                            return;
+                        }
 
-                    return handleRequest(requestHandler, request);
-                }).filter(Objects::nonNull).toList();
+                        executor.submit(() -> {
+                            final var response = handleRequest(requestHandler, request);
+                            if (response != null) {
+                                lock.lock();
+                                try {
+                                    responseList.add(response);
+                                } finally {
+                                    lock.unlock();
+                                }
+                            }
+                        });
+                    });
+                }
 
-                jsonRpcSender.sendBatchResponses(responseList);
+                if (!responseList.isEmpty()) {
+                    jsonRpcSender.sendBatchResponses(responseList);
+                }
             }
         }
     }
@@ -85,26 +150,14 @@ public class JsonRpcReader {
         return null;
     }
 
-    private JsonRpcMessage readMessage() {
-        while (!Thread.interrupted()) {
-            String input = lineSupplier.get();
-
-            if (input == null) {
-                logger.trace("Reached end of JSON-RPC input stream.");
-                break;
-            }
-
-            logger.trace("Incoming JSON-RPC message: {}", input);
-            JsonRpcMessage message = parseJsonRpcMessage(input);
-            if (message == null) continue;
-
-            return message;
+    private JsonRpcMessage parseJsonRpcMessage(final String input) {
+        if (input.trim().isEmpty()) {
+            jsonRpcSender.sendResponse(JsonRpcResponse.forError(new JsonRpcResponse.Error(JsonRpcResponse.Error.PARSE_ERROR,
+                    "Empty input line",
+                    null), null));
+            return null;
         }
 
-        return null;
-    }
-
-    private JsonRpcMessage parseJsonRpcMessage(final String input) {
         final JsonNode jsonNode;
         try {
             jsonNode = objectMapper.readTree(input);
@@ -117,13 +170,33 @@ public class JsonRpcReader {
             throw new AssertionError(e);
         }
 
+        return parseJsonRpcMessage(jsonNode);
+    }
+
+    private JsonRpcMessage parseJsonRpcMessage(final InputStream input) {
+        final JsonNode jsonNode;
+        try {
+            jsonNode = objectMapper.readTree(input);
+        } catch (JsonParseException e) {
+            jsonRpcSender.sendResponse(JsonRpcResponse.forError(new JsonRpcResponse.Error(JsonRpcResponse.Error.PARSE_ERROR,
+                    e.getMessage(),
+                    null), null));
+            return null;
+        } catch (IOException e) {
+            throw new AssertionError(e);
+        }
+
+        return parseJsonRpcMessage(jsonNode);
+    }
+
+    private JsonRpcMessage parseJsonRpcMessage(final JsonNode jsonNode) {
         if (jsonNode == null) {
             jsonRpcSender.sendResponse(JsonRpcResponse.forError(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_REQUEST,
                     "invalid request",
                     null), null));
             return null;
         } else if (jsonNode.isArray()) {
-            if (jsonNode.size() == 0) {
+            if (jsonNode.isEmpty()) {
                 jsonRpcSender.sendResponse(JsonRpcResponse.forError(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_REQUEST,
                         "invalid request",
                         null), null));
@@ -151,7 +224,7 @@ public class JsonRpcReader {
 
     private ValueNode getId(JsonNode jsonNode) {
         final var id = jsonNode.get("id");
-        return id instanceof ValueNode ? (ValueNode) id : null;
+        return id instanceof ValueNode value ? value : null;
     }
 
     private JsonRpcRequest parseJsonRpcRequest(final JsonNode input) throws JsonRpcException {
diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java
index 8e7535ec..29866c1a 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.node.ValueNode;
 
 /**
  * Represents a JSON-RPC request.
- * https://www.jsonrpc.org/specification#request_object
+ * <a href="https://www.jsonrpc.org/specification#request_object">https://www.jsonrpc.org/specification#request_object</a>
  */
 public final class JsonRpcRequest extends JsonRpcMessage {
 
@@ -38,7 +38,9 @@ public final class JsonRpcRequest extends JsonRpcMessage {
     private ValueNode id;
 
     public static JsonRpcRequest forNotification(
-            final String method, final ContainerNode<?> params, final ValueNode id
+            final String method,
+            final ContainerNode<?> params,
+            final ValueNode id
     ) {
         return new JsonRpcRequest("2.0", method, params, id);
     }
@@ -47,7 +49,10 @@ public final class JsonRpcRequest extends JsonRpcMessage {
     }
 
     private JsonRpcRequest(
-            final String jsonrpc, final String method, final ContainerNode<?> params, final ValueNode id
+            final String jsonrpc,
+            final String method,
+            final ContainerNode<?> params,
+            final ValueNode id
     ) {
         this.jsonrpc = jsonrpc;
         this.method = method;
diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcResponse.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcResponse.java
index 406212d8..9cc2e965 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcResponse.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcResponse.java
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.node.ValueNode;
 
 /**
  * Represents a JSON-RPC response.
- * https://www.jsonrpc.org/specification#response_object
+ * <a href="https://www.jsonrpc.org/specification#response_object">https://www.jsonrpc.org/specification#response_object</a>
  */
 public final class JsonRpcResponse extends JsonRpcMessage {
 
diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
new file mode 100644
index 00000000..48eb4a45
--- /dev/null
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
@@ -0,0 +1,280 @@
+package org.asamk.signal.jsonrpc;
+
+import com.fasterxml.jackson.core.TreeNode;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ContainerNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import org.asamk.signal.commands.Command;
+import org.asamk.signal.commands.JsonRpcMultiCommand;
+import org.asamk.signal.commands.JsonRpcRegistrationCommand;
+import org.asamk.signal.commands.JsonRpcSingleCommand;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.RateLimitErrorException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
+import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.MultiAccountManager;
+import org.asamk.signal.manager.RegistrationManager;
+import org.asamk.signal.output.JsonWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.channels.OverlappingFileLockException;
+import java.util.Map;
+import java.util.function.Function;
+
+public class SignalJsonRpcCommandHandler {
+
+    private static final Logger logger = LoggerFactory.getLogger(SignalJsonRpcDispatcherHandler.class);
+
+    private static final int USER_ERROR = -1;
+    private static final int IO_ERROR = -3;
+    private static final int UNTRUSTED_KEY_ERROR = -4;
+    private static final int RATELIMIT_ERROR = -5;
+
+    private final Manager m;
+    private final MultiAccountManager c;
+    private final Function<String, Command> commandProvider;
+
+    public SignalJsonRpcCommandHandler(final Manager m, final Function<String, Command> commandProvider) {
+        this.c = null;
+        this.m = m;
+        this.commandProvider = commandProvider;
+    }
+
+    public SignalJsonRpcCommandHandler(final MultiAccountManager c, final Function<String, Command> commandProvider) {
+        this.c = c;
+        this.m = null;
+        this.commandProvider = commandProvider;
+    }
+
+    public JsonNode handleRequest(
+            final ObjectMapper objectMapper,
+            final String method,
+            ContainerNode<?> params
+    ) throws JsonRpcException {
+        var command = getCommand(method);
+        if (c != null) {
+            if (command instanceof JsonRpcSingleCommand<?> jsonRpcCommand) {
+                final var manager = getManagerFromParams(params);
+                if (manager != null) {
+                    return runCommand(objectMapper, params, new CommandRunnerImpl<>(manager, jsonRpcCommand));
+                }
+            }
+            if (command instanceof JsonRpcMultiCommand<?> jsonRpcCommand) {
+                return runCommand(objectMapper, params, new MultiCommandRunnerImpl<>(c, jsonRpcCommand));
+            }
+            if (command instanceof JsonRpcRegistrationCommand<?> jsonRpcCommand) {
+                try (var manager = getRegistrationManagerFromParams(params)) {
+                    if (manager != null) {
+                        return runCommand(objectMapper,
+                                params,
+                                new RegistrationCommandRunnerImpl<>(manager, c, jsonRpcCommand));
+                    } else {
+                        throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_PARAMS,
+                                "Method requires valid account parameter",
+                                null));
+                    }
+                } catch (IOException e) {
+                    logger.warn("Failed to close registration manager", e);
+                }
+            }
+        }
+        if (command instanceof JsonRpcSingleCommand<?> jsonRpcCommand) {
+            if (m != null) {
+                return runCommand(objectMapper, params, new CommandRunnerImpl<>(m, jsonRpcCommand));
+            }
+
+            var manager = getManagerFromParams(params);
+            if (manager == null) {
+                final var managers = c.getManagers();
+                if (managers.size() == 1) {
+                    manager = managers.getFirst();
+                }
+            }
+            if (manager != null) {
+                return runCommand(objectMapper, params, new CommandRunnerImpl<>(manager, jsonRpcCommand));
+            } else {
+                throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_PARAMS,
+                        "Method requires valid account parameter",
+                        null));
+            }
+        }
+
+        throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.METHOD_NOT_FOUND,
+                "Method not implemented",
+                null));
+    }
+
+    private Manager getManagerFromParams(final ContainerNode<?> params) throws JsonRpcException {
+        if (params != null && params.hasNonNull("account")) {
+            final var manager = c.getManager(params.get("account").asText());
+            ((ObjectNode) params).remove("account");
+            if (manager == null) {
+                throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_PARAMS,
+                        "Specified account does not exist",
+                        null));
+            }
+            return manager;
+        }
+        return null;
+    }
+
+    private RegistrationManager getRegistrationManagerFromParams(final ContainerNode<?> params) {
+        if (params != null && params.has("account")) {
+            try {
+                final var registrationManager = c.getNewRegistrationManager(params.get("account").asText());
+                ((ObjectNode) params).remove("account");
+                return registrationManager;
+            } catch (OverlappingFileLockException e) {
+                logger.warn("Account is already in use");
+                return null;
+            } catch (IOException | IllegalStateException e) {
+                logger.warn("Failed to load registration manager", e);
+                return null;
+            }
+        }
+        return null;
+    }
+
+    private Command getCommand(final String method) {
+        return commandProvider.apply(method);
+    }
+
+    private record CommandRunnerImpl<T>(Manager m, JsonRpcSingleCommand<T> command) implements CommandRunner<T> {
+
+        @Override
+        public void handleCommand(final T request, final JsonWriter jsonWriter) throws CommandException {
+            command.handleCommand(request, m, jsonWriter);
+        }
+
+        @Override
+        public TypeReference<T> getRequestType() {
+            return command.getRequestType();
+        }
+    }
+
+    private record RegistrationCommandRunnerImpl<T>(
+            RegistrationManager m, MultiAccountManager c, JsonRpcRegistrationCommand<T> command
+    ) implements CommandRunner<T> {
+
+        @Override
+        public void handleCommand(final T request, final JsonWriter jsonWriter) throws CommandException {
+            command.handleCommand(request, m, jsonWriter);
+        }
+
+        @Override
+        public TypeReference<T> getRequestType() {
+            return command.getRequestType();
+        }
+    }
+
+    private record MultiCommandRunnerImpl<T>(
+            MultiAccountManager c, JsonRpcMultiCommand<T> command
+    ) implements CommandRunner<T> {
+
+        @Override
+        public void handleCommand(final T request, final JsonWriter jsonWriter) throws CommandException {
+            command.handleCommand(request, c, jsonWriter);
+        }
+
+        @Override
+        public TypeReference<T> getRequestType() {
+            return command.getRequestType();
+        }
+    }
+
+    interface CommandRunner<T> {
+
+        void handleCommand(T request, JsonWriter jsonWriter) throws CommandException;
+
+        TypeReference<T> getRequestType();
+    }
+
+    private JsonNode runCommand(
+            final ObjectMapper objectMapper,
+            final ContainerNode<?> params,
+            final CommandRunner<?> command
+    ) throws JsonRpcException {
+        final Object[] result = {null};
+        final JsonWriter commandJsonWriter = s -> {
+            if (result[0] != null) {
+                throw new AssertionError("Command may only write one json result");
+            }
+
+            result[0] = s;
+        };
+
+        try {
+            parseParamsAndRunCommand(objectMapper, params, commandJsonWriter, command);
+        } catch (JsonMappingException e) {
+            throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_REQUEST,
+                    e.getMessage(),
+                    null));
+        } catch (CommandException ce) {
+            switch (ce) {
+                case UserErrorException e -> throw new JsonRpcException(new JsonRpcResponse.Error(USER_ERROR,
+                        e.getMessage(),
+                        getErrorDataNode(objectMapper, result)));
+                case IOErrorException e -> throw new JsonRpcException(new JsonRpcResponse.Error(IO_ERROR,
+                        e.getMessage(),
+                        getErrorDataNode(objectMapper, result)));
+                case UntrustedKeyErrorException e -> throw new JsonRpcException(new JsonRpcResponse.Error(
+                        UNTRUSTED_KEY_ERROR,
+                        e.getMessage(),
+                        getErrorDataNode(objectMapper, result)));
+                case RateLimitErrorException e -> throw new JsonRpcException(new JsonRpcResponse.Error(RATELIMIT_ERROR,
+                        e.getMessage(),
+                        getErrorDataNode(objectMapper, result)));
+                case UnexpectedErrorException e -> {
+                    logger.error("Command execution failed with unexpected error", e);
+                    throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR,
+                            e.getMessage() + " (" + e.getClass().getSimpleName() + ")",
+                            getErrorDataNode(objectMapper, result)));
+                }
+            }
+        } catch (Throwable e) {
+            logger.error("Command execution failed", e);
+            throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR,
+                    e.getMessage() + " (" + e.getClass().getSimpleName() + ")",
+                    getErrorDataNode(objectMapper, result)));
+        }
+
+        Object output = result[0] == null ? Map.of() : result[0];
+        return objectMapper.valueToTree(output);
+    }
+
+    private JsonNode getErrorDataNode(final ObjectMapper objectMapper, final Object[] result) {
+        if (result[0] == null) {
+            return null;
+        }
+        return objectMapper.valueToTree(Map.of("response", result[0]));
+    }
+
+    private <T> void parseParamsAndRunCommand(
+            final ObjectMapper objectMapper,
+            final TreeNode params,
+            final JsonWriter jsonWriter,
+            final CommandRunner<T> command
+    ) throws CommandException, JsonMappingException {
+        T requestParams = null;
+        final var requestType = command.getRequestType();
+        if (params != null && requestType != null) {
+            try {
+                requestParams = objectMapper.readValue(objectMapper.treeAsTokens(params), requestType);
+            } catch (JsonMappingException e) {
+                throw e;
+            } catch (IOException e) {
+                throw new AssertionError(e);
+            }
+        }
+        command.handleCommand(requestParams, jsonWriter);
+    }
+}
diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
index 086681f7..5d3fa261 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
@@ -1,8 +1,6 @@
 package org.asamk.signal.jsonrpc;
 
-import com.fasterxml.jackson.core.TreeNode;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -13,24 +11,19 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.asamk.signal.commands.Command;
 import org.asamk.signal.commands.Commands;
 import org.asamk.signal.commands.JsonRpcMultiCommand;
-import org.asamk.signal.commands.JsonRpcRegistrationCommand;
 import org.asamk.signal.commands.JsonRpcSingleCommand;
 import org.asamk.signal.commands.exceptions.CommandException;
-import org.asamk.signal.commands.exceptions.IOErrorException;
-import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.json.JsonReceiveMessageHandler;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.MultiAccountManager;
-import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.util.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.nio.channels.OverlappingFileLockException;
+import java.nio.channels.ClosedChannelException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -39,24 +32,20 @@ import java.util.function.Supplier;
 
 public class SignalJsonRpcDispatcherHandler {
 
-    private final static Logger logger = LoggerFactory.getLogger(SignalJsonRpcDispatcherHandler.class);
-
-    private static final int USER_ERROR = -1;
-    private static final int IO_ERROR = -3;
-    private static final int UNTRUSTED_KEY_ERROR = -4;
+    private static final Logger logger = LoggerFactory.getLogger(SignalJsonRpcDispatcherHandler.class);
 
     private final ObjectMapper objectMapper;
     private final JsonRpcSender jsonRpcSender;
     private final JsonRpcReader jsonRpcReader;
     private final boolean noReceiveOnStart;
 
-    private MultiAccountManager c;
     private final Map<Integer, List<Pair<Manager, Manager.ReceiveMessageHandler>>> receiveHandlers = new HashMap<>();
-
-    private Manager m;
+    private SignalJsonRpcCommandHandler commandHandler;
 
     public SignalJsonRpcDispatcherHandler(
-            final JsonWriter jsonWriter, final Supplier<String> lineSupplier, final boolean noReceiveOnStart
+            final JsonWriter jsonWriter,
+            final Supplier<String> lineSupplier,
+            final boolean noReceiveOnStart
     ) {
         this.noReceiveOnStart = noReceiveOnStart;
         this.objectMapper = Util.createJsonObjectMapper();
@@ -65,11 +54,11 @@ public class SignalJsonRpcDispatcherHandler {
     }
 
     public void handleConnection(final MultiAccountManager c) {
-        this.c = c;
+        this.commandHandler = new SignalJsonRpcCommandHandler(c, this::getCommand);
 
         if (!noReceiveOnStart) {
-            this.subscribeReceive(c.getManagers());
-            c.addOnManagerAddedHandler(this::subscribeReceive);
+            this.subscribeReceive(c.getManagers(), true);
+            c.addOnManagerAddedHandler(m -> subscribeReceive(m, true));
             c.addOnManagerRemovedHandler(this::unsubscribeReceive);
         }
 
@@ -77,10 +66,10 @@ public class SignalJsonRpcDispatcherHandler {
     }
 
     public void handleConnection(final Manager m) {
-        this.m = m;
+        this.commandHandler = new SignalJsonRpcCommandHandler(m, this::getCommand);
 
         if (!noReceiveOnStart) {
-            subscribeReceive(m);
+            subscribeReceive(m, true);
         }
 
         final var currentThread = Thread.currentThread();
@@ -91,17 +80,31 @@ public class SignalJsonRpcDispatcherHandler {
 
     private static final AtomicInteger nextSubscriptionId = new AtomicInteger(0);
 
-    private int subscribeReceive(final Manager manager) {
-        return subscribeReceive(List.of(manager));
+    private int subscribeReceive(final Manager manager, boolean internalSubscription) {
+        return subscribeReceive(List.of(manager), internalSubscription);
     }
 
-    private int subscribeReceive(final List<Manager> managers) {
+    private int subscribeReceive(final List<Manager> managers, boolean internalSubscription) {
         final var subscriptionId = nextSubscriptionId.getAndIncrement();
         final var handlers = managers.stream().map(m -> {
             final var receiveMessageHandler = new JsonReceiveMessageHandler(m, s -> {
-                final ContainerNode<?> params = objectMapper.valueToTree(s);
-                ((ObjectNode) params).set("subscription", IntNode.valueOf(subscriptionId));
-                jsonRpcSender.sendRequest(JsonRpcRequest.forNotification("receive", params, null));
+                ContainerNode<?> params;
+                if (internalSubscription) {
+                    params = objectMapper.valueToTree(s);
+                } else {
+                    final var paramsNode = new ObjectNode(objectMapper.getNodeFactory());
+                    paramsNode.set("subscription", IntNode.valueOf(subscriptionId));
+                    paramsNode.set("result", objectMapper.valueToTree(s));
+                    params = paramsNode;
+                }
+                final var jsonRpcRequest = JsonRpcRequest.forNotification("receive", params, null);
+                try {
+                    jsonRpcSender.sendRequest(jsonRpcRequest);
+                } catch (AssertionError e) {
+                    if (e.getCause() instanceof ClosedChannelException) {
+                        unsubscribeReceive(subscriptionId);
+                    }
+                }
             });
             m.addReceiveHandler(receiveMessageHandler);
             return new Pair<>(m, (Manager.ReceiveMessageHandler) receiveMessageHandler);
@@ -125,7 +128,7 @@ public class SignalJsonRpcDispatcherHandler {
     private void unsubscribeReceive(final Manager m) {
         final var subscriptionId = receiveHandlers.entrySet()
                 .stream()
-                .filter(e -> e.getValue().size() == 1 && e.getValue().get(0).first().equals(m))
+                .filter(e -> e.getValue().size() == 1 && e.getValue().getFirst().first().equals(m))
                 .map(Map.Entry::getKey)
                 .findFirst();
         subscriptionId.ifPresent(this::unsubscribeReceive);
@@ -133,7 +136,7 @@ public class SignalJsonRpcDispatcherHandler {
 
     private void handleConnection() {
         try {
-            jsonRpcReader.readMessages((method, params) -> handleRequest(objectMapper, method, params),
+            jsonRpcReader.readMessages((method, params) -> commandHandler.handleRequest(objectMapper, method, params),
                     response -> logger.debug("Received unexpected response for id {}", response.getId()));
         } finally {
             receiveHandlers.forEach((_subscriptionId, handlers) -> handlers.forEach(this::unsubscribeReceiveHandler));
@@ -147,87 +150,6 @@ public class SignalJsonRpcDispatcherHandler {
         m.removeReceiveHandler(handler);
     }
 
-    private JsonNode handleRequest(
-            final ObjectMapper objectMapper, final String method, ContainerNode<?> params
-    ) throws JsonRpcException {
-        var command = getCommand(method);
-        if (c != null) {
-            if (command instanceof JsonRpcSingleCommand<?> jsonRpcCommand) {
-                final var manager = getManagerFromParams(params);
-                if (manager != null) {
-                    return runCommand(objectMapper, params, new CommandRunnerImpl<>(manager, jsonRpcCommand));
-                }
-            }
-            if (command instanceof JsonRpcMultiCommand<?> jsonRpcCommand) {
-                return runCommand(objectMapper, params, new MultiCommandRunnerImpl<>(c, jsonRpcCommand));
-            }
-            if (command instanceof JsonRpcRegistrationCommand<?> jsonRpcCommand) {
-                try (var manager = getRegistrationManagerFromParams(params)) {
-                    if (manager != null) {
-                        return runCommand(objectMapper,
-                                params,
-                                new RegistrationCommandRunnerImpl<>(manager, c, jsonRpcCommand));
-                    } else {
-                        throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_PARAMS,
-                                "Method requires valid account parameter",
-                                null));
-                    }
-                } catch (IOException e) {
-                    logger.warn("Failed to close registration manager", e);
-                }
-            }
-        }
-        if (command instanceof JsonRpcSingleCommand<?> jsonRpcCommand) {
-            if (m != null) {
-                return runCommand(objectMapper, params, new CommandRunnerImpl<>(m, jsonRpcCommand));
-            }
-
-            final var manager = getManagerFromParams(params);
-            if (manager != null) {
-                return runCommand(objectMapper, params, new CommandRunnerImpl<>(manager, jsonRpcCommand));
-            } else {
-                throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_PARAMS,
-                        "Method requires valid account parameter",
-                        null));
-            }
-        }
-
-        throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.METHOD_NOT_FOUND,
-                "Method not implemented",
-                null));
-    }
-
-    private Manager getManagerFromParams(final ContainerNode<?> params) throws JsonRpcException {
-        if (params != null && params.hasNonNull("account")) {
-            final var manager = c.getManager(params.get("account").asText());
-            ((ObjectNode) params).remove("account");
-            if (manager == null) {
-                throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_PARAMS,
-                        "Specified account does not exist",
-                        null));
-            }
-            return manager;
-        }
-        return null;
-    }
-
-    private RegistrationManager getRegistrationManagerFromParams(final ContainerNode<?> params) {
-        if (params != null && params.has("account")) {
-            try {
-                final var registrationManager = c.getNewRegistrationManager(params.get("account").asText());
-                ((ObjectNode) params).remove("account");
-                return registrationManager;
-            } catch (OverlappingFileLockException e) {
-                logger.warn("Account is already in use");
-                return null;
-            } catch (IOException | IllegalStateException e) {
-                logger.warn("Failed to load registration manager", e);
-                return null;
-            }
-        }
-        return null;
-    }
-
     private Command getCommand(final String method) {
         if ("subscribeReceive".equals(method)) {
             return new SubscribeReceiveCommand();
@@ -238,124 +160,6 @@ public class SignalJsonRpcDispatcherHandler {
         return Commands.getCommand(method);
     }
 
-    private record CommandRunnerImpl<T>(Manager m, JsonRpcSingleCommand<T> command) implements CommandRunner<T> {
-
-        @Override
-        public void handleCommand(final T request, final JsonWriter jsonWriter) throws CommandException {
-            command.handleCommand(request, m, jsonWriter);
-        }
-
-        @Override
-        public TypeReference<T> getRequestType() {
-            return command.getRequestType();
-        }
-    }
-
-    private record RegistrationCommandRunnerImpl<T>(
-            RegistrationManager m, MultiAccountManager c, JsonRpcRegistrationCommand<T> command
-    ) implements CommandRunner<T> {
-
-        @Override
-        public void handleCommand(final T request, final JsonWriter jsonWriter) throws CommandException {
-            command.handleCommand(request, m, jsonWriter);
-        }
-
-        @Override
-        public TypeReference<T> getRequestType() {
-            return command.getRequestType();
-        }
-    }
-
-    private record MultiCommandRunnerImpl<T>(
-            MultiAccountManager c, JsonRpcMultiCommand<T> command
-    ) implements CommandRunner<T> {
-
-        @Override
-        public void handleCommand(final T request, final JsonWriter jsonWriter) throws CommandException {
-            command.handleCommand(request, c, jsonWriter);
-        }
-
-        @Override
-        public TypeReference<T> getRequestType() {
-            return command.getRequestType();
-        }
-    }
-
-    interface CommandRunner<T> {
-
-        void handleCommand(T request, JsonWriter jsonWriter) throws CommandException;
-
-        TypeReference<T> getRequestType();
-    }
-
-    private JsonNode runCommand(
-            final ObjectMapper objectMapper, final ContainerNode<?> params, final CommandRunner<?> command
-    ) throws JsonRpcException {
-        final Object[] result = {null};
-        final JsonWriter commandJsonWriter = s -> {
-            if (result[0] != null) {
-                throw new AssertionError("Command may only write one json result");
-            }
-
-            result[0] = s;
-        };
-
-        try {
-            parseParamsAndRunCommand(objectMapper, params, commandJsonWriter, command);
-        } catch (JsonMappingException e) {
-            throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_REQUEST,
-                    e.getMessage(),
-                    null));
-        } catch (UserErrorException e) {
-            throw new JsonRpcException(new JsonRpcResponse.Error(USER_ERROR,
-                    e.getMessage(),
-                    getErrorDataNode(objectMapper, result)));
-        } catch (IOErrorException e) {
-            throw new JsonRpcException(new JsonRpcResponse.Error(IO_ERROR,
-                    e.getMessage(),
-                    getErrorDataNode(objectMapper, result)));
-        } catch (UntrustedKeyErrorException e) {
-            throw new JsonRpcException(new JsonRpcResponse.Error(UNTRUSTED_KEY_ERROR,
-                    e.getMessage(),
-                    getErrorDataNode(objectMapper, result)));
-        } catch (Throwable e) {
-            logger.error("Command execution failed", e);
-            throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR,
-                    e.getMessage(),
-                    getErrorDataNode(objectMapper, result)));
-        }
-
-        Object output = result[0] == null ? Map.of() : result[0];
-        return objectMapper.valueToTree(output);
-    }
-
-    private JsonNode getErrorDataNode(final ObjectMapper objectMapper, final Object[] result) {
-        if (result[0] == null) {
-            return null;
-        }
-        return objectMapper.valueToTree(Map.of("response", result[0]));
-    }
-
-    private <T> void parseParamsAndRunCommand(
-            final ObjectMapper objectMapper,
-            final TreeNode params,
-            final JsonWriter jsonWriter,
-            final CommandRunner<T> command
-    ) throws CommandException, JsonMappingException {
-        T requestParams = null;
-        final var requestType = command.getRequestType();
-        if (params != null && requestType != null) {
-            try {
-                requestParams = objectMapper.readValue(objectMapper.treeAsTokens(params), requestType);
-            } catch (JsonMappingException e) {
-                throw e;
-            } catch (IOException e) {
-                throw new AssertionError(e);
-            }
-        }
-        command.handleCommand(requestParams, jsonWriter);
-    }
-
     private class SubscribeReceiveCommand implements JsonRpcSingleCommand<Void>, JsonRpcMultiCommand<Void> {
 
         @Override
@@ -365,17 +169,21 @@ public class SignalJsonRpcDispatcherHandler {
 
         @Override
         public void handleCommand(
-                final Void request, final Manager m, final JsonWriter jsonWriter
+                final Void request,
+                final Manager m,
+                final JsonWriter jsonWriter
         ) throws CommandException {
-            final var subscriptionId = subscribeReceive(m);
+            final var subscriptionId = subscribeReceive(m, false);
             jsonWriter.write(subscriptionId);
         }
 
         @Override
         public void handleCommand(
-                final Void request, final MultiAccountManager c, final JsonWriter jsonWriter
+                final Void request,
+                final MultiAccountManager c,
+                final JsonWriter jsonWriter
         ) throws CommandException {
-            final var subscriptionId = subscribeReceive(c.getManagers());
+            final var subscriptionId = subscribeReceive(c.getManagers(), false);
             jsonWriter.write(subscriptionId);
         }
     }
@@ -394,7 +202,9 @@ public class SignalJsonRpcDispatcherHandler {
 
         @Override
         public void handleCommand(
-                final JsonNode request, final Manager m, final JsonWriter jsonWriter
+                final JsonNode request,
+                final Manager m,
+                final JsonWriter jsonWriter
         ) throws CommandException {
             final var subscriptionId = getSubscriptionId(request);
             if (subscriptionId == null) {
@@ -408,7 +218,9 @@ public class SignalJsonRpcDispatcherHandler {
 
         @Override
         public void handleCommand(
-                final JsonNode request, final MultiAccountManager c, final JsonWriter jsonWriter
+                final JsonNode request,
+                final MultiAccountManager c,
+                final JsonWriter jsonWriter
         ) throws CommandException {
             final var subscriptionId = getSubscriptionId(request);
             if (subscriptionId == null) {
@@ -421,13 +233,11 @@ public class SignalJsonRpcDispatcherHandler {
         }
 
         private Integer getSubscriptionId(final JsonNode request) {
-            if (request instanceof ArrayNode req) {
-                return req.get(0).asInt();
-            } else if (request instanceof ObjectNode req) {
-                return req.get("subscription").asInt();
-            } else {
-                return null;
-            }
+            return switch (request) {
+                case ArrayNode req -> req.get(0).asInt();
+                case ObjectNode req -> req.get("subscription").asInt();
+                case null, default -> null;
+            };
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/jsonrpc/SocketHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SocketHandler.java
new file mode 100644
index 00000000..2e0d50e4
--- /dev/null
+++ b/src/main/java/org/asamk/signal/jsonrpc/SocketHandler.java
@@ -0,0 +1,120 @@
+package org.asamk.signal.jsonrpc;
+
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.MultiAccountManager;
+import org.asamk.signal.output.JsonWriterImpl;
+import org.asamk.signal.util.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.SocketAddress;
+import java.nio.channels.Channels;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+
+public class SocketHandler implements AutoCloseable {
+
+    private static final Logger logger = LoggerFactory.getLogger(SocketHandler.class);
+    private static final AtomicInteger threadNumber = new AtomicInteger(0);
+
+    private final ServerSocketChannel serverChannel;
+
+    private Thread listenerThread;
+    private final List<AutoCloseable> channels = new ArrayList<>();
+    private final Consumer<SocketChannel> socketHandler;
+    private final boolean noReceiveOnStart;
+
+    public SocketHandler(final ServerSocketChannel serverChannel, final Manager m, final boolean noReceiveOnStart) {
+        this.serverChannel = serverChannel;
+        this.socketHandler = channel -> getSignalJsonRpcDispatcherHandler(channel).handleConnection(m);
+        this.noReceiveOnStart = noReceiveOnStart;
+    }
+
+    public SocketHandler(
+            final ServerSocketChannel serverChannel,
+            final MultiAccountManager c,
+            final boolean noReceiveOnStart
+    ) {
+        this.serverChannel = serverChannel;
+        this.socketHandler = channel -> getSignalJsonRpcDispatcherHandler(channel).handleConnection(c);
+        this.noReceiveOnStart = noReceiveOnStart;
+    }
+
+    public void init() {
+        if (listenerThread != null) {
+            throw new AssertionError("SocketHandler already initialized");
+        }
+        SocketAddress socketAddress;
+        try {
+            socketAddress = serverChannel.getLocalAddress();
+        } catch (IOException e) {
+            logger.debug("Failed to get socket address: {}", e.getMessage());
+            socketAddress = null;
+        }
+        final var address = socketAddress == null ? "<Unknown socket address>" : socketAddress;
+        logger.debug("Starting JSON-RPC server on {}", address);
+
+        listenerThread = Thread.ofPlatform().name("daemon-listener").start(() -> {
+            try (final var executor = Executors.newCachedThreadPool()) {
+                logger.info("Started JSON-RPC server on {}", address);
+                while (true) {
+                    final var connectionId = threadNumber.getAndIncrement();
+                    final SocketChannel channel;
+                    final String clientString;
+                    try {
+                        channel = serverChannel.accept();
+                        clientString = channel.getRemoteAddress() + " " + IOUtils.getUnixDomainPrincipal(channel);
+                        logger.info("Accepted new client connection {}: {}", connectionId, clientString);
+                    } catch (ClosedChannelException ignored) {
+                        logger.trace("Listening socket has been closed");
+                        break;
+                    } catch (IOException e) {
+                        logger.error("Failed to accept new socket connection", e);
+                        break;
+                    }
+                    channels.add(channel);
+                    executor.submit(() -> {
+                        try (final var c = channel) {
+                            socketHandler.accept(c);
+                        } catch (IOException e) {
+                            logger.warn("Failed to close channel", e);
+                        } catch (Throwable e) {
+                            logger.warn("Connection handler failed, closing connection", e);
+                        }
+                        logger.info("Connection {} closed: {}", connectionId, clientString);
+                        channels.remove(channel);
+                    });
+                }
+            }
+        });
+    }
+
+    @Override
+    public void close() throws Exception {
+        if (listenerThread == null) {
+            return;
+        }
+        serverChannel.close();
+        for (final var c : new ArrayList<>(channels)) {
+            c.close();
+        }
+        listenerThread.join();
+        channels.clear();
+        listenerThread = null;
+    }
+
+    private SignalJsonRpcDispatcherHandler getSignalJsonRpcDispatcherHandler(final SocketChannel c) {
+        final var lineSupplier = IOUtils.getLineSupplier(Channels.newReader(c, StandardCharsets.UTF_8));
+        final var jsonOutputWriter = new JsonWriterImpl(Channels.newWriter(c, StandardCharsets.UTF_8));
+
+        return new SignalJsonRpcDispatcherHandler(jsonOutputWriter, lineSupplier, noReceiveOnStart);
+    }
+}
diff --git a/src/main/java/org/asamk/signal/LogConfigurator.java b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
similarity index 55%
rename from src/main/java/org/asamk/signal/LogConfigurator.java
rename to src/main/java/org/asamk/signal/logging/LogConfigurator.java
index 9271d6b7..2ee7b5f0 100644
--- a/src/main/java/org/asamk/signal/LogConfigurator.java
+++ b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
@@ -1,4 +1,4 @@
-package org.asamk.signal;
+package org.asamk.signal.logging;
 
 import java.io.File;
 
@@ -6,6 +6,7 @@ import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.PatternLayout;
+import ch.qos.logback.classic.jul.LevelChangePropagator;
 import ch.qos.logback.classic.spi.Configurator;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.ConsoleAppender;
@@ -20,6 +21,7 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
 
     private static int verboseLevel = 0;
     private static File logFile = null;
+    private static boolean scrubSensitiveInformation = false;
 
     public static void setVerboseLevel(int verboseLevel) {
         LogConfigurator.verboseLevel = verboseLevel;
@@ -29,10 +31,18 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
         LogConfigurator.logFile = logFile;
     }
 
-    public void configure(LoggerContext lc) {
+    public static void setScrubSensitiveInformation(final boolean scrubSensitiveInformation) {
+        LogConfigurator.scrubSensitiveInformation = scrubSensitiveInformation;
+    }
+
+    @Override
+    public ExecutionStatus configure(LoggerContext lc) {
+        lc.addListener(new LevelChangePropagator() {{
+            setContext(lc);
+        }});
         final var rootLogger = lc.getLogger(Logger.ROOT_LOGGER_NAME);
 
-        final var defaultLevel = verboseLevel > 1 ? Level.ALL : verboseLevel > 0 ? Level.DEBUG : Level.INFO;
+        final var defaultLevel = verboseLevel > 2 ? Level.TRACE : verboseLevel > 0 ? Level.INFO : Level.WARN;
         rootLogger.setLevel(defaultLevel);
 
         final var consoleLayout = verboseLevel == 0 || logFile != null
@@ -41,18 +51,24 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
         final var consoleAppender = createLoggingConsoleAppender(lc, createLayoutWrappingEncoder(consoleLayout));
         rootLogger.addAppender(consoleAppender);
 
-        lc.getLogger("com.zaxxer.hikari")
-                .setLevel(verboseLevel > 1 ? Level.ALL : verboseLevel > 0 ? Level.INFO : Level.WARN);
+        lc.getLogger("org.asamk")
+                .setLevel(verboseLevel > 1 ? Level.TRACE : verboseLevel > 0 ? Level.DEBUG : Level.INFO);
+        lc.getLogger("org.asamk.Signal")
+                .setLevel(verboseLevel > 2 ? Level.TRACE : verboseLevel > 1 ? Level.INFO : Level.WARN);
+        lc.getLogger("com.zaxxer.hikari.pool.PoolBase")
+                .setLevel(verboseLevel > 2 ? Level.TRACE : verboseLevel > 1 ? Level.INFO : Level.WARN);
+        lc.getLogger("org.sqlite.core.NativeDB")
+                .setLevel(verboseLevel > 3 ? Level.TRACE : verboseLevel > 1 ? Level.INFO : Level.WARN);
 
         if (logFile != null) {
             consoleAppender.addFilter(new Filter<>() {
                 @Override
                 public FilterReply decide(final ILoggingEvent event) {
-                    return event.getLevel().isGreaterOrEqual(Level.INFO)
-                            && !"LibSignal".equals(event.getLoggerName())
-                            && (
-                            event.getLevel().isGreaterOrEqual(Level.WARN) || !event.getLoggerName()
-                                    .startsWith("com.zaxxer.hikari")
+                    return !"LibSignal".equals(event.getLoggerName()) && (
+                            event.getLevel().isGreaterOrEqual(Level.WARN) || (
+                                    event.getLevel().isGreaterOrEqual(Level.INFO) && event.getLoggerName()
+                                            .startsWith("org.asamk")
+                            )
                     )
 
                             ? FilterReply.NEUTRAL : FilterReply.DENY;
@@ -63,10 +79,12 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
             final var fileAppender = createLoggingFileAppender(lc, createLayoutWrappingEncoder(fileLayout));
             rootLogger.addAppender(fileAppender);
         }
+        return ExecutionStatus.DO_NOT_INVOKE_NEXT_IF_ANY;
     }
 
     private ConsoleAppender<ILoggingEvent> createLoggingConsoleAppender(
-            final LoggerContext lc, final LayoutWrappingEncoder<ILoggingEvent> layoutEncoder
+            final LoggerContext lc,
+            final LayoutWrappingEncoder<ILoggingEvent> layoutEncoder
     ) {
         return new ConsoleAppender<>() {{
             setContext(lc);
@@ -78,7 +96,8 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
     }
 
     private FileAppender<ILoggingEvent> createLoggingFileAppender(
-            final LoggerContext lc, final LayoutWrappingEncoder<ILoggingEvent> layoutEncoder
+            final LoggerContext lc,
+            final LayoutWrappingEncoder<ILoggingEvent> layoutEncoder
     ) {
         return new FileAppender<>() {{
             setContext(lc);
@@ -97,18 +116,26 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
     }
 
     private PatternLayout createSimpleLoggingLayout(final LoggerContext lc) {
-        return new PatternLayout() {{
-            setPattern("%-5level %logger{0} - %msg%n");
-            setContext(lc);
-            start();
-        }};
+        final var patternLayout = getPatternLayout();
+        patternLayout.setPattern("%-5level %logger{0} - %msg%n");
+        patternLayout.setContext(lc);
+        patternLayout.start();
+        return patternLayout;
     }
 
     private PatternLayout createDetailedLoggingLayout(final LoggerContext lc) {
-        return new PatternLayout() {{
-            setPattern("%d{yyyy-MM-dd'T'HH:mm:ss.SSSXX} [%thread] %-5level %logger{36} - %msg%n");
-            setContext(lc);
-            start();
-        }};
+        final var patternLayout = getPatternLayout();
+        patternLayout.setPattern("%d{yyyy-MM-dd'T'HH:mm:ss.SSSXX} [%thread] %-5level %logger{36} - %msg%n");
+        patternLayout.setContext(lc);
+        patternLayout.start();
+        return patternLayout;
+    }
+
+    private PatternLayout getPatternLayout() {
+        if (scrubSensitiveInformation) {
+            return new ScrubberPatternLayout();
+        } else {
+            return new PatternLayout();
+        }
     }
 }
diff --git a/src/main/java/org/asamk/signal/logging/Scrubber.java b/src/main/java/org/asamk/signal/logging/Scrubber.java
new file mode 100644
index 00000000..9d796a64
--- /dev/null
+++ b/src/main/java/org/asamk/signal/logging/Scrubber.java
@@ -0,0 +1,280 @@
+/*
+ * Copyright (C) 2014 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.asamk.signal.logging;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Scrub data for possibly sensitive information.
+ */
+public final class Scrubber {
+
+    private Scrubber() {
+    }
+
+    /**
+     * The middle group will be censored.
+     * Supposedly, the shortest international phone numbers in use contain seven digits.
+     * Handles URL encoded +, %2B
+     */
+    private static final Pattern E164_PATTERN = Pattern.compile("(\\+|%2B|_)(\\d{5,13})(\\d{2})");
+    private static final String E164_CENSOR = "*************";
+
+    private static final Pattern GROUP_V1_ID_PATTERN = Pattern.compile(
+            "(/org/asamk/Signal/.*Groups/[a-zA-Z0-9/_+-]{2}|[a-zA-Z0-9/_+-]{2})([a-zA-Z0-9/_+-]{18})([a-zA-Z0-9/_+-]{2})(==|__)");
+    private static final String GROUP_V1_ID_CENSOR = "*".repeat(18);
+
+    private static final Pattern GROUP_V2_ID_PATTERN = Pattern.compile(
+            "(/org/asamk/Signal/.*Groups/[a-zA-Z0-9/_+-]{2}|[a-zA-Z0-9/_+-]{2})([a-zA-Z0-9/_+-]{39})([a-zA-Z0-9/_+-]{2})([=_])");
+    private static final String GROUP_V2_ID_CENSOR = "*".repeat(39);
+
+    /**
+     * The second group will be censored.
+     */
+    private static final Pattern CRUDE_EMAIL_PATTERN = Pattern.compile("\\b([^\\s/])([^\\s/]*@[^\\s]+)");
+    private static final String EMAIL_CENSOR = "...@...";
+
+    /**
+     * The middle group will be censored.
+     */
+    private static final Pattern UUID_PATTERN = Pattern.compile(
+            "(JOB::)?([0-9a-f]{8}[-_][0-9a-f]{4}[-_][0-9a-f]{4}[-_][0-9a-f]{4}[-_][0-9a-f]{10})([0-9a-f]{2})",
+            Pattern.CASE_INSENSITIVE);
+    private static final String UUID_CENSOR = "********-****-****-****-**********";
+
+    /**
+     * The entire string is censored.
+     */
+    private static final Pattern IPV4_PATTERN = Pattern.compile("\\b"
+            + "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\."
+            + "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\."
+            + "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\."
+            + "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
+            + "\\b");
+    private static final String IPV4_CENSOR = "...ipv4...";
+
+    /**
+     * The domain name except for TLD will be censored.
+     */
+    private static final Pattern DOMAIN_PATTERN = Pattern.compile("([a-z0-9]+\\.)+([a-z0-9\\-]*[a-z\\-][a-z0-9\\-]*)",
+            Pattern.CASE_INSENSITIVE);
+    private static final String DOMAIN_CENSOR = "***.";
+    private static final Set<String> TOP_100_TLDS = new HashSet<>(Arrays.asList("com",
+            "net",
+            "org",
+            "jp",
+            "de",
+            "uk",
+            "fr",
+            "br",
+            "it",
+            "ru",
+            "es",
+            "me",
+            "gov",
+            "pl",
+            "ca",
+            "au",
+            "cn",
+            "co",
+            "in",
+            "nl",
+            "edu",
+            "info",
+            "eu",
+            "ch",
+            "id",
+            "at",
+            "kr",
+            "cz",
+            "mx",
+            "be",
+            "tv",
+            "se",
+            "tr",
+            "tw",
+            "al",
+            "ua",
+            "ir",
+            "vn",
+            "cl",
+            "sk",
+            "ly",
+            "cc",
+            "to",
+            "no",
+            "fi",
+            "us",
+            "pt",
+            "dk",
+            "ar",
+            "hu",
+            "tk",
+            "gr",
+            "il",
+            "news",
+            "ro",
+            "my",
+            "biz",
+            "ie",
+            "za",
+            "nz",
+            "sg",
+            "ee",
+            "th",
+            "io",
+            "xyz",
+            "pe",
+            "bg",
+            "hk",
+            "lt",
+            "link",
+            "ph",
+            "club",
+            "si",
+            "site",
+            "mobi",
+            "by",
+            "cat",
+            "wiki",
+            "la",
+            "ga",
+            "xxx",
+            "cf",
+            "hr",
+            "ng",
+            "jobs",
+            "online",
+            "kz",
+            "ug",
+            "gq",
+            "ae",
+            "is",
+            "lv",
+            "pro",
+            "fm",
+            "tips",
+            "ms",
+            "sa",
+            "app"));
+
+    public static CharSequence scrub(CharSequence in) {
+
+        in = scrubUuids(in);
+        in = scrubE164(in);
+        in = scrubEmail(in);
+        in = scrubGroupV2Ids(in);
+        in = scrubGroupV1Ids(in);
+        in = scrubDomains(in);
+        in = scrubIpv4(in);
+
+        return in;
+    }
+
+    private static CharSequence scrubE164(CharSequence in) {
+        return scrub(in,
+                E164_PATTERN,
+                (matcher, output) -> output.append(matcher.group(1))
+                        .append(E164_CENSOR, 0, matcher.group(2).length())
+                        .append(matcher.group(3)));
+    }
+
+    private static CharSequence scrubGroupV1Ids(CharSequence in) {
+        return scrub(in,
+                GROUP_V1_ID_PATTERN,
+                (matcher, output) -> output.append(matcher.group(1))
+                        .append(GROUP_V1_ID_CENSOR, 0, matcher.group(2).length())
+                        .append(matcher.group(3)));
+    }
+
+    private static CharSequence scrubGroupV2Ids(CharSequence in) {
+        return scrub(in,
+                GROUP_V2_ID_PATTERN,
+                (matcher, output) -> output.append(matcher.group(1))
+                        .append(GROUP_V2_ID_CENSOR, 0, matcher.group(2).length())
+                        .append(matcher.group(3)));
+    }
+
+    private static CharSequence scrubEmail(CharSequence in) {
+        return scrub(in,
+                CRUDE_EMAIL_PATTERN,
+                (matcher, output) -> output.append(matcher.group(1)).append(EMAIL_CENSOR));
+    }
+
+    private static CharSequence scrubUuids(CharSequence in) {
+        return scrub(in, UUID_PATTERN, (matcher, output) -> {
+            if (matcher.group(1) != null && !matcher.group(1).isEmpty()) {
+                output.append(matcher.group(1)).append(matcher.group(2)).append(matcher.group(3));
+            } else {
+                output.append(UUID_CENSOR).append(matcher.group(3));
+            }
+        });
+    }
+
+    private static CharSequence scrubDomains(CharSequence in) {
+        return scrub(in, DOMAIN_PATTERN, (matcher, output) -> {
+            String match = matcher.group(0);
+            if (matcher.groupCount() == 2
+                    && TOP_100_TLDS.contains(matcher.group(2).toLowerCase(Locale.US))
+                    && !match.endsWith("whispersystems.org")
+                    && !match.endsWith("signal.org")) {
+                output.append(DOMAIN_CENSOR).append(matcher.group(2));
+            } else {
+                output.append(match);
+            }
+        });
+    }
+
+    private static CharSequence scrubIpv4(CharSequence in) {
+        return scrub(in, IPV4_PATTERN, (matcher, output) -> output.append(IPV4_CENSOR));
+    }
+
+    private static CharSequence scrub(CharSequence in, Pattern pattern, ProcessMatch processMatch) {
+        final StringBuilder output = new StringBuilder(in.length());
+        final Matcher matcher = pattern.matcher(in);
+
+        int lastEndingPos = 0;
+
+        while (matcher.find()) {
+            output.append(in, lastEndingPos, matcher.start());
+
+            processMatch.scrubMatch(matcher, output);
+
+            lastEndingPos = matcher.end();
+        }
+
+        if (lastEndingPos == 0) {
+            // there were no matches, save copying all the data
+            return in;
+        } else {
+            output.append(in, lastEndingPos, in.length());
+
+            return output;
+        }
+    }
+
+    private interface ProcessMatch {
+
+        void scrubMatch(Matcher matcher, StringBuilder output);
+    }
+}
diff --git a/src/main/java/org/asamk/signal/logging/ScrubberPatternLayout.java b/src/main/java/org/asamk/signal/logging/ScrubberPatternLayout.java
new file mode 100644
index 00000000..b15af5a2
--- /dev/null
+++ b/src/main/java/org/asamk/signal/logging/ScrubberPatternLayout.java
@@ -0,0 +1,12 @@
+package org.asamk.signal.logging;
+
+import ch.qos.logback.classic.PatternLayout;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+
+public class ScrubberPatternLayout extends PatternLayout {
+
+    @Override
+    public String doLayout(ILoggingEvent event) {
+        return Scrubber.scrub(super.doLayout(event)).toString();
+    }
+}
diff --git a/src/main/java/org/asamk/signal/output/JsonWriter.java b/src/main/java/org/asamk/signal/output/JsonWriter.java
index 034d2f9f..22c323a8 100644
--- a/src/main/java/org/asamk/signal/output/JsonWriter.java
+++ b/src/main/java/org/asamk/signal/output/JsonWriter.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.output;
 
-public interface JsonWriter extends OutputWriter {
+public non-sealed interface JsonWriter extends OutputWriter {
 
     void write(final Object object);
 }
diff --git a/src/main/java/org/asamk/signal/output/OutputWriter.java b/src/main/java/org/asamk/signal/output/OutputWriter.java
index a32e773d..0d84848e 100644
--- a/src/main/java/org/asamk/signal/output/OutputWriter.java
+++ b/src/main/java/org/asamk/signal/output/OutputWriter.java
@@ -1,5 +1,3 @@
 package org.asamk.signal.output;
 
-public interface OutputWriter {
-
-}
+public sealed interface OutputWriter permits JsonWriter, PlainTextWriter {}
diff --git a/src/main/java/org/asamk/signal/output/PlainTextWriter.java b/src/main/java/org/asamk/signal/output/PlainTextWriter.java
index 29ac87af..eb42bed1 100644
--- a/src/main/java/org/asamk/signal/output/PlainTextWriter.java
+++ b/src/main/java/org/asamk/signal/output/PlainTextWriter.java
@@ -2,7 +2,7 @@ package org.asamk.signal.output;
 
 import java.util.function.Consumer;
 
-public interface PlainTextWriter extends OutputWriter {
+public non-sealed interface PlainTextWriter extends OutputWriter {
 
     void println(String format, Object... args);
 
diff --git a/src/main/java/org/asamk/signal/output/PlainTextWriterImpl.java b/src/main/java/org/asamk/signal/output/PlainTextWriterImpl.java
index abf850a9..bfbb3f21 100644
--- a/src/main/java/org/asamk/signal/output/PlainTextWriterImpl.java
+++ b/src/main/java/org/asamk/signal/output/PlainTextWriterImpl.java
@@ -38,7 +38,7 @@ public final class PlainTextWriterImpl implements PlainTextWriter {
 
     private static final class IndentedPlainTextWriter implements PlainTextWriter {
 
-        private final static int INDENTATION = 2;
+        private static final int INDENTATION = 2;
 
         private final String spaces = " ".repeat(INDENTATION);
         private final PlainTextWriter plainTextWriter;
diff --git a/src/main/java/org/asamk/signal/util/CommandUtil.java b/src/main/java/org/asamk/signal/util/CommandUtil.java
index b86a9989..61f5013e 100644
--- a/src/main/java/org/asamk/signal/util/CommandUtil.java
+++ b/src/main/java/org/asamk/signal/util/CommandUtil.java
@@ -1,11 +1,16 @@
 package org.asamk.signal.util;
 
+import net.sourceforge.argparse4j.inf.Namespace;
+
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.CaptchaRequiredException;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupIdFormatException;
 import org.asamk.signal.manager.api.InvalidNumberException;
+import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.manager.api.RecipientIdentifier;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupIdFormatException;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -21,7 +26,8 @@ public class CommandUtil {
             final Manager m,
             final boolean isNoteToSelf,
             final List<String> recipientStrings,
-            final List<String> groupIdStrings
+            final List<String> groupIdStrings,
+            final List<String> usernameStrings
     ) throws UserErrorException {
         final var recipientIdentifiers = new HashSet<RecipientIdentifier>();
         if (isNoteToSelf) {
@@ -34,6 +40,9 @@ public class CommandUtil {
         if (groupIdStrings != null) {
             recipientIdentifiers.addAll(CommandUtil.getGroupIdentifiers(groupIdStrings));
         }
+        if (usernameStrings != null) {
+            recipientIdentifiers.addAll(CommandUtil.getUsernameIdentifiers(usernameStrings));
+        }
 
         if (recipientIdentifiers.isEmpty()) {
             throw new UserErrorException("No recipients given");
@@ -75,7 +84,8 @@ public class CommandUtil {
     }
 
     public static Set<RecipientIdentifier.Single> getSingleRecipientIdentifiers(
-            final Collection<String> recipientStrings, final String localNumber
+            final Collection<String> recipientStrings,
+            final String localNumber
     ) throws UserErrorException {
         if (recipientStrings == null) {
             return Set.of();
@@ -88,7 +98,8 @@ public class CommandUtil {
     }
 
     public static RecipientIdentifier.Single getSingleRecipientIdentifier(
-            final String recipientString, final String localNumber
+            final String recipientString,
+            final String localNumber
     ) throws UserErrorException {
         try {
             return RecipientIdentifier.Single.fromString(recipientString, localNumber);
@@ -96,4 +107,47 @@ public class CommandUtil {
             throw new UserErrorException("Invalid phone number '" + recipientString + "': " + e.getMessage(), e);
         }
     }
+
+    public static Set<RecipientIdentifier.Username> getUsernameIdentifiers(Collection<String> usernameIdStrings) {
+        if (usernameIdStrings == null) {
+            return Set.of();
+        }
+        final var usernameIds = new HashSet<RecipientIdentifier.Username>();
+        for (final var usernameIdString : usernameIdStrings) {
+            usernameIds.add(new RecipientIdentifier.Username(usernameIdString));
+        }
+        return usernameIds;
+    }
+
+    public static String getCaptchaRequiredMessage(final CaptchaRequiredException e, final boolean captchaProvided) {
+        String message;
+        if (!captchaProvided) {
+            message = """
+                      Captcha required for verification, use --captcha CAPTCHA
+                      To get the token, go to https://signalcaptchas.org/registration/generate.html
+                      After solving the captcha, right-click on the "Open Signal" link and copy the link.""";
+        } else {
+            message = "Invalid captcha given.";
+        }
+        if (e.getNextAttemptTimestamp() > 0) {
+            message += "\nNext Captcha may be provided at " + DateUtils.formatTimestamp(e.getNextAttemptTimestamp());
+        }
+        return message;
+    }
+
+    public static String getRateLimitMessage(final RateLimitException e) {
+        String message = "Rate limit reached";
+        if (e.getNextAttemptTimestamp() > 0) {
+            message += "\nNext attempt may be tried at " + DateUtils.formatTimestamp(e.getNextAttemptTimestamp());
+        }
+        return message;
+    }
+
+    public static ReceiveConfig getReceiveConfig(final Namespace ns) {
+        final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
+        final var ignoreStories = Boolean.TRUE.equals(ns.getBoolean("ignore-stories"));
+        final var sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
+
+        return new ReceiveConfig(ignoreAttachments, ignoreStories, sendReadReceipts);
+    }
 }
diff --git a/src/main/java/org/asamk/signal/util/Hex.java b/src/main/java/org/asamk/signal/util/Hex.java
index 596f23a9..d87f8ec9 100644
--- a/src/main/java/org/asamk/signal/util/Hex.java
+++ b/src/main/java/org/asamk/signal/util/Hex.java
@@ -2,7 +2,9 @@ package org.asamk.signal.util;
 
 public class Hex {
 
-    private final static char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+    private static final char[] HEX_DIGITS = {
+            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
+    };
 
     private Hex() {
     }
diff --git a/src/main/java/org/asamk/signal/util/IOUtils.java b/src/main/java/org/asamk/signal/util/IOUtils.java
index 9f220946..7f93417f 100644
--- a/src/main/java/org/asamk/signal/util/IOUtils.java
+++ b/src/main/java/org/asamk/signal/util/IOUtils.java
@@ -15,6 +15,7 @@ import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.net.StandardProtocolFamily;
 import java.net.UnixDomainSocketAddress;
+import java.nio.channels.ClosedChannelException;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 import java.nio.charset.Charset;
@@ -34,7 +35,7 @@ import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;
 
 public class IOUtils {
 
-    private final static Logger logger = LoggerFactory.getLogger(IOUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(IOUtils.class);
 
     private IOUtils() {
     }
@@ -93,6 +94,9 @@ public class IOUtils {
         return () -> {
             try {
                 return bufferedReader.readLine();
+            } catch (ClosedChannelException ignored) {
+                logger.trace("Line supplier has been interrupted.");
+                return null;
             } catch (IOException e) {
                 logger.error("Error occurred while reading line", e);
                 return null;
@@ -121,13 +125,13 @@ public class IOUtils {
         return socketAddress;
     }
 
-    public static UnixDomainPrincipal getUnixDomainPrincipal(final SocketChannel channel) throws IOException {
+    public static String getUnixDomainPrincipal(final SocketChannel channel) throws IOException {
         UnixDomainPrincipal principal = null;
         try {
             principal = channel.getOption(ExtendedSocketOptions.SO_PEERCRED);
-        } catch (UnsupportedOperationException ignored) {
+        } catch (UnsupportedOperationException | NoClassDefFoundError ignored) {
         }
-        return principal;
+        return principal == null ? null : principal.toString();
     }
 
     public static ServerSocketChannel bindSocket(final SocketAddress address) throws IOErrorException {
@@ -138,7 +142,7 @@ public class IOUtils {
                     ? ServerSocketChannel.open(StandardProtocolFamily.UNIX)
                     : ServerSocketChannel.open();
             serverChannel.bind(address);
-            logger.info("Listening on socket: " + address);
+            logger.debug("Listening on socket: " + address);
             postBind(address);
         } catch (IOException e) {
             throw new IOErrorException("Failed to bind socket " + address + ": " + e.getMessage(), e);
diff --git a/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java b/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
index cf2b282f..a23e3c54 100644
--- a/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
+++ b/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
@@ -1,10 +1,12 @@
 package org.asamk.signal.util;
 
 import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.RateLimitErrorException;
 import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.json.JsonSendMessageResult;
 import org.asamk.signal.manager.api.ProofRequiredException;
+import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendGroupMessageResults;
 import org.asamk.signal.manager.api.SendMessageResult;
@@ -25,32 +27,40 @@ public class SendMessageResultUtils {
     }
 
     public static void outputResult(final OutputWriter outputWriter, final SendGroupMessageResults sendMessageResults) {
-        if (outputWriter instanceof PlainTextWriter writer) {
-            var errors = getErrorMessagesFromSendMessageResults(sendMessageResults.results());
-            printSendMessageResultErrors(writer, errors);
-            writer.println("{}", sendMessageResults.timestamp());
-        } else {
-            final var writer = (JsonWriter) outputWriter;
-            var results = getJsonSendMessageResults(sendMessageResults.results());
-            writer.write(Map.of("timestamp", sendMessageResults.timestamp(), "results", results));
+        switch (outputWriter) {
+            case PlainTextWriter writer -> {
+                var errors = getErrorMessagesFromSendMessageResults(sendMessageResults.results());
+                printSendMessageResultErrors(writer, errors);
+                writer.println("{}", sendMessageResults.timestamp());
+            }
+            case JsonWriter writer -> {
+                var results = getJsonSendMessageResults(sendMessageResults.results());
+                writer.write(Map.of("timestamp", sendMessageResults.timestamp(), "results", results));
+            }
         }
     }
 
     public static void outputResult(
-            final OutputWriter outputWriter, final SendMessageResults sendMessageResults
+            final OutputWriter outputWriter,
+            final SendMessageResults sendMessageResults
     ) throws CommandException {
-        if (outputWriter instanceof PlainTextWriter writer) {
-            var errors = getErrorMessagesFromSendMessageResults(sendMessageResults.results());
-            printSendMessageResultErrors(writer, errors);
-            writer.println("{}", sendMessageResults.timestamp());
-        } else {
-            final var writer = (JsonWriter) outputWriter;
-            var results = getJsonSendMessageResults(sendMessageResults.results());
-            writer.write(Map.of("timestamp", sendMessageResults.timestamp(), "results", results));
+        switch (outputWriter) {
+            case PlainTextWriter writer -> {
+                var errors = getErrorMessagesFromSendMessageResults(sendMessageResults.results());
+                printSendMessageResultErrors(writer, errors);
+                writer.println("{}", sendMessageResults.timestamp());
+            }
+            case JsonWriter writer -> {
+                var results = getJsonSendMessageResults(sendMessageResults.results());
+                writer.write(Map.of("timestamp", sendMessageResults.timestamp(), "results", results));
+            }
         }
         if (!sendMessageResults.hasSuccess()) {
             if (sendMessageResults.hasOnlyUntrustedIdentity()) {
                 throw new UntrustedKeyErrorException("Failed to send message due to untrusted identities");
+            } else if (sendMessageResults.hasOnlyRateLimitFailure()) {
+                throw new RateLimitErrorException("Failed to send message due to rate limiting",
+                        new RateLimitException(0));
             } else {
                 throw new UserErrorException("Failed to send message");
             }
@@ -82,11 +92,10 @@ public class SendMessageResultUtils {
             return String.format(
                     "CAPTCHA proof required for sending to \"%s\", available options \"%s\" with challenge token \"%s\", or wait \"%d\" seconds.\n"
                             + (
-                            failure.getOptions().contains(ProofRequiredException.Option.RECAPTCHA)
+                            failure.getOptions().contains(ProofRequiredException.Option.CAPTCHA)
                                     ? """
                                       To get the captcha token, go to https://signalcaptchas.org/challenge/generate.html
-                                      Check the developer tools (F12) console for a failed redirect to signalcaptcha://
-                                      Everything after signalcaptcha:// is the captcha token.
+                                      After solving the captcha, right-click on the "Open Signal" link and copy the link.
                                       Use the following command to submit the captcha token:
                                       signal-cli submitRateLimitChallenge --challenge CHALLENGE_TOKEN --captcha CAPTCHA_TOKEN"""
                                     : ""
@@ -111,7 +120,7 @@ public class SendMessageResultUtils {
     }
 
     public static void printSendMessageResultErrors(PlainTextWriter writer, List<String> errors) {
-        if (errors.size() == 0) {
+        if (errors.isEmpty()) {
             return;
         }
         writer.println("Failed to send (some) messages:");
diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java
index c844e2ea..94996ee3 100644
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -5,14 +5,23 @@ import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
 public class Util {
 
+    private static final Logger logger = LoggerFactory.getLogger(Util.class);
+
     private Util() {
     }
 
@@ -30,12 +39,12 @@ public class Util {
     }
 
     private static String toCamelCaseString(List<String> strings) {
-        if (strings.size() == 0) {
+        if (strings.isEmpty()) {
             return "";
         }
-        return strings.get(0) + strings.stream()
+        return strings.getFirst() + strings.stream()
                 .skip(1)
-                .filter(s -> s.length() > 0)
+                .filter(s -> !s.isEmpty())
                 .map(s -> Character.toUpperCase(s.charAt(0)) + s.substring(1).toLowerCase(Locale.ROOT))
                 .collect(Collectors.joining());
     }
@@ -63,4 +72,16 @@ public class Util {
         objectMapper.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
         return objectMapper;
     }
+
+    public static Map<String, String> getQueryMap(String query) {
+        var params = query.split("&");
+        var map = new HashMap<String, String>();
+        for (var param : params) {
+            final var paramParts = param.split("=");
+            var name = URLDecoder.decode(paramParts[0], StandardCharsets.UTF_8);
+            var value = paramParts.length == 1 ? null : URLDecoder.decode(paramParts[1], StandardCharsets.UTF_8);
+            map.put(name, value);
+        }
+        return map;
+    }
 }
diff --git a/src/main/resources/META-INF/services/ch.qos.logback.classic.spi.Configurator b/src/main/resources/META-INF/services/ch.qos.logback.classic.spi.Configurator
index 354cf5bd..6e92cd39 100644
--- a/src/main/resources/META-INF/services/ch.qos.logback.classic.spi.Configurator
+++ b/src/main/resources/META-INF/services/ch.qos.logback.classic.spi.Configurator
@@ -1 +1 @@
-org.asamk.signal.LogConfigurator
+org.asamk.signal.logging.LogConfigurator