diff --git a/.env b/.env
new file mode 100644
index 0000000..b6e15c4
--- /dev/null
+++ b/.env
@@ -0,0 +1,36 @@
+# Socialbox Configuration
+LOG_LEVEL=debug
+SB_MODE=automated
+SB_DOMAIN=localhost
+SB_INSTANCE_NAME=Socialbox
+SB_RPC_ENDPOINT=http://127.0.0.0:8085/
+SB_LOGGING_CONSOLE_ENABLED=true
+SB_LOGGING_CONSOLE_LEVEL=info
+SB_SECURITY_DISPLAY_INTERNAL_EXCEPTIONS=true
+SB_CRYPTO_KEYPAIR_EXPIRES=<duration>
+SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM=xchacha20
+SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM=chacha20
+SB_CACHE_ENABLED=true
+SB_CACHE_PORT=6379
+SB_CACHE_USERNAME=root
+SB_CACHE_PASSWORD=root
+SB_CACHE_DATABASE=0
+
+# MariaDB Configuration
+MYSQL_ROOT_PASSWORD=sb_root
+MYSQL_DATABASE=socialbox
+MYSQL_USER=socialbox
+MYSQL_PASSWORD=socialbox
+
+# Redis Configuration
+REDIS_PASSWORD=root
+
+# Test Configuration, can be ignored. Used for docker-compose-test.yml
+SB_COFFEE_NAME=coffee
+SB_COFFEE_DOMAIN=coffee.com
+SB_COFFEE_RPC_ENDPOINT=http://coffee_socialbox:8085/
+SB_INSTANCE_DNS_MOCK_COFFEE="coffee.com v=socialbox;sb-rpc=http://coffee_socialbox:8085/;sb-key=sig:g59Cf8j1wmQmRg1MkveYbpdiZ-1-_hFU9eRRJmQAwmc;sb-exp=0"
+
+SB_TEAPOT_DOMAIN=teapot.com
+SB_TEAPOT_RPC_ENDPOINT=http://teapot_socialbox:8085/
+SB_INSTANCE_DNS_MOCK_TEAPOT="teapot.com v=socialbox;sb-rpc=http://teapot_socialbox:8085/;sb-key=sig:MDXUuripAo_IAv-EZTEoFhpIdhsXxfMLNunSnQzxYiY;sb-exp=0"
\ No newline at end of file
diff --git a/.github/workflows/ncc_workflow.yml b/.github/workflows/ncc_workflow.yml
index afa2f41..1b5e4e4 100644
--- a/.github/workflows/ncc_workflow.yml
+++ b/.github/workflows/ncc_workflow.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  release:
     runs-on: ubuntu-latest
     container:
       image: php:8.3
@@ -51,14 +51,163 @@ jobs:
 
       - name: Build project
         run: |
-          ncc build --config release --log-level debug
+          ncc build --config release --build-source --log-level debug
 
-      - name: Upload build artifacts
+      - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: Socialbox_build
+          name: release
           path: build/release/net.nosial.socialbox.ncc
+  debug:
+    runs-on: ubuntu-latest
+    container:
+      image: php:8.3
 
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          apt update -yqq
+          apt install git libpq-dev libzip-dev zip make wget gnupg -yqq
+
+      - name: Install phive
+        run: |
+          wget -O phive.phar https://phar.io/releases/phive.phar
+          wget -O phive.phar.asc https://phar.io/releases/phive.phar.asc
+          gpg --keyserver hkps://keys.openpgp.org --recv-keys 0x9D8A98B29B2D5D79
+          gpg --verify phive.phar.asc phive.phar
+          chmod +x phive.phar
+          mv phive.phar /usr/local/bin/phive
+
+      - name: Install phab
+        run: |
+          phive install phpab --global --trust-gpg-keys 0x2A8299CE842DD38C
+
+      - name: Install latest version of NCC
+        run: |
+          git clone https://git.n64.cc/nosial/ncc.git
+          cd ncc
+          make redist
+          NCC_DIR=$(find build/ -type d -name "ncc_*" | head -n 1)
+          if [ -z "$NCC_DIR" ]; then
+            echo "NCC build directory not found"
+            exit 1
+          fi
+          php "$NCC_DIR/INSTALL" --auto
+          cd .. && rm -rf ncc
+
+      - name: Build project
+        run: |
+          ncc build --config debug --build-source --log-level debug
+
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: debug
+          path: build/debug/net.nosial.socialbox.ncc
+  release_executable:
+    runs-on: ubuntu-latest
+    container:
+      image: php:8.3
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          apt update -yqq
+          apt install git libpq-dev libzip-dev zip make wget gnupg -yqq
+
+      - name: Install phive
+        run: |
+          wget -O phive.phar https://phar.io/releases/phive.phar
+          wget -O phive.phar.asc https://phar.io/releases/phive.phar.asc
+          gpg --keyserver hkps://keys.openpgp.org --recv-keys 0x9D8A98B29B2D5D79
+          gpg --verify phive.phar.asc phive.phar
+          chmod +x phive.phar
+          mv phive.phar /usr/local/bin/phive
+
+      - name: Install phab
+        run: |
+          phive install phpab --global --trust-gpg-keys 0x2A8299CE842DD38C
+
+      - name: Install latest version of NCC
+        run: |
+          git clone https://git.n64.cc/nosial/ncc.git
+          cd ncc
+          make redist
+          NCC_DIR=$(find build/ -type d -name "ncc_*" | head -n 1)
+          if [ -z "$NCC_DIR" ]; then
+            echo "NCC build directory not found"
+            exit 1
+          fi
+          php "$NCC_DIR/INSTALL" --auto
+          cd .. && rm -rf ncc
+
+      - name: Build project
+        run: |
+          ncc build --config release_executable --build-source --log-level debug
+
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: release_executable
+          path: build/release/Socialbox
+  debug_executable:
+    runs-on: ubuntu-latest
+    container:
+      image: php:8.3
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          apt update -yqq
+          apt install git libpq-dev libzip-dev zip make wget gnupg -yqq
+
+      - name: Install phive
+        run: |
+          wget -O phive.phar https://phar.io/releases/phive.phar
+          wget -O phive.phar.asc https://phar.io/releases/phive.phar.asc
+          gpg --keyserver hkps://keys.openpgp.org --recv-keys 0x9D8A98B29B2D5D79
+          gpg --verify phive.phar.asc phive.phar
+          chmod +x phive.phar
+          mv phive.phar /usr/local/bin/phive
+
+      - name: Install phab
+        run: |
+          phive install phpab --global --trust-gpg-keys 0x2A8299CE842DD38C
+
+      - name: Install latest version of NCC
+        run: |
+          git clone https://git.n64.cc/nosial/ncc.git
+          cd ncc
+          make redist
+          NCC_DIR=$(find build/ -type d -name "ncc_*" | head -n 1)
+          if [ -z "$NCC_DIR" ]; then
+            echo "NCC build directory not found"
+            exit 1
+          fi
+          php "$NCC_DIR/INSTALL" --auto
+          cd .. && rm -rf ncc
+
+      - name: Build project
+        run: |
+          ncc build --config debug_executable --build-source --log-level debug
+
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: debug_executable
+          path: build/debug/Socialbox
+
+
+  # Checking for phpunit.xml
   check-phpunit:
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +223,59 @@ jobs:
           else
             echo "phpunit-exists=false" >> $GITHUB_OUTPUT
           fi
+  # Checking for phpdoc.dist.xml
+  check-phpdoc:
+    runs-on: ubuntu-latest
+    outputs:
+      phpdoc-exists: ${{ steps.check.outputs.phpdoc-exists }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Check for phpdoc.dist.xml
+        id: check
+        run: |
+          if [ -f phpdoc.dist.xml ]; then
+            echo "phpdoc-exists=true" >> $GITHUB_OUTPUT
+          else
+            echo "phpdoc-exists=false" >> $GITHUB_OUTPUT
+          fi
+  generate-phpdoc:
+    needs: [release, check-phpdoc]
+    runs-on: ubuntu-latest
+    container:
+      image: php:8.3
+    if: needs.check-phpdoc.outputs.phpdoc-exists == 'true'
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          apt update -yqq
+          apt install git libpq-dev libzip-dev zip make wget gnupg -yqq
+
+      - name: Download PHPDocumentor
+        run: |
+          wget https://phpdoc.org/phpDocumentor.phar
+          chmod +x phpDocumentor.phar
+
+      - name: Generate PHPDoc
+        run: |
+          php phpDocumentor.phar -d src -t docs
+
+      - name: Archive PHPDoc
+        run: |
+          zip -r docs.zip docs
+
+      - name: Upload PHPDoc
+        uses: actions/upload-artifact@v4
+        with:
+          name: documentation
+          path: docs.zip
 
   test:
-    needs: [build, check-phpunit]
+    needs: [release, debug, release_executable, debug_executable, check-phpunit]
     runs-on: ubuntu-latest
     container:
       image: php:8.3
@@ -89,8 +288,8 @@ jobs:
       - name: Download build artifacts
         uses: actions/download-artifact@v4
         with:
-          name: Socialbox_build
-          path: Socialbox_build  # Adjust this to download the artifact directly under 'Socialbox_build'
+          name: release
+          path: release
 
       - name: Install dependencies
         run: |
@@ -98,7 +297,7 @@ jobs:
           apt install git libpq-dev libzip-dev zip make wget gnupg -yqq
           curl -sSLf -o /usr/local/bin/install-php-extensions https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions
           chmod +x /usr/local/bin/install-php-extensions
-          install-php-extensions zip pdo_mysql mysqli mcrypt
+          install-php-extensions zip
 
       - name: Install phive
         run: |
@@ -128,15 +327,22 @@ jobs:
 
       - name: Install NCC packages
         run: |
-          ncc package install --package="Socialbox_build/net.nosial.socialbox.ncc" --build-source --reinstall -y --log-level debug
+          ncc package install --package="release/net.nosial.socialbox.ncc" --build-source --reinstall -y --log-level debug
 
       - name: Run PHPUnit tests
         run: |
           wget https://phar.phpunit.de/phpunit-11.3.phar
-          php phpunit-11.3.phar --configuration phpunit.xml
+          php phpunit-11.3.phar --configuration phpunit.xml --log-junit reports/junit.xml --log-teamcity reports/teamcity --testdox-html reports/testdox.html --testdox-text reports/testdox.txt
 
-  release:
-    needs: [build, test]
+      - name: Upload test reports
+        uses: actions/upload-artifact@v4
+        with:
+          name: reports
+          path: reports
+
+
+  release-documentation:
+    needs: generate-phpdoc
     permissions: write-all
     runs-on: ubuntu-latest
     container:
@@ -147,16 +353,78 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Download build artifacts
+      - name: Download documentation artifact
         uses: actions/download-artifact@v4
         with:
-          name: Socialbox_build
-          path: Socialbox_build
+          name: documentation
+          path: documentation
 
-      - name: Upload to GitHub Release
+      - name: Upload documentation artifact
         uses: softprops/action-gh-release@v1
         with:
-          files: |
-            Socialbox_build/net.nosial.socialbox.ncc
+            files: |
+                documentation/*
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+
+  release-artifacts:
+    needs: [release, debug, release_executable, debug_executable]
+    permissions: write-all
+    runs-on: ubuntu-latest
+    container:
+      image: php:8.3
+    if: github.event_name == 'release'
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Download release artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: release
+          path: release
+      - name: Upload release artifact to release
+        uses: softprops/action-gh-release@v1
+        with:
+            files: |
+                release/*
+        env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Download debug artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: debug
+          path: debug
+      - name: Upload debug artifact to release
+        uses: softprops/action-gh-release@v1
+        with:
+            files: |
+                debug/*
+        env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Download release_executable artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: release_executable
+          path: release_executable
+      - name: Upload release_executable artifact to release
+        uses: softprops/action-gh-release@v1
+        with:
+            files: |
+                release_executable/*
+        env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Download debug_executable artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: debug_executable
+          path: debug_executable
+      - name: Upload debug_executable artifact to release
+        uses: softprops/action-gh-release@v1
+        with:
+            files: |
+                debug_executable/*
+        env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 33a3681..9daf5a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,11 @@
 /build
+/.vscode
 /.idea/gbrowser_project.xml
-.phpunit.result.cache
\ No newline at end of file
+.phpunit.result.cache
+/socialbox
+/bob_socialbox
+/alice_socialbox
+/coffee_socialbox/data/
+/coffee_socialbox/logs/
+/teapot_socialbox/data/
+/teapot_socialbox/logs/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52ab115..185dca3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,46 +1,170 @@
-image: php:8.1
+# Global config
+default:
+  image: php:8.3
 
-before_script:
-  # Install some stuff that the image doesn't come with
-  - apt update -yqq
-  - apt install git libpq-dev libzip-dev zip make wget gnupg -yqq
+variables:
+  GIT_STRATEGY: clone
 
-  # Install phive
-  - wget -O phive.phar https://phar.io/releases/phive.phar
-  - wget -O phive.phar.asc https://phar.io/releases/phive.phar.asc
-  - gpg --keyserver hkps://keys.openpgp.org --recv-keys 0x9D8A98B29B2D5D79
-  - gpg --verify phive.phar.asc phive.phar
-  - chmod +x phive.phar
-  - mv phive.phar /usr/local/bin/phive
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "push"
+    - if: $CI_PIPELINE_SOURCE == "web"
+    - if: $CI_COMMIT_TAG
 
-  # Install phab
-  - phive install phpab --global --trust-gpg-keys 0x2A8299CE842DD38C
+# Reusable template for installing common dependencies
+.setup_template: &setup_definition
+  before_script:
+    - apt update -yqq
+    - apt install git libpq-dev libzip-dev zip make wget gnupg -yqq
+    # Install phive
+    - wget -O phive.phar https://phar.io/releases/phive.phar
+    - wget -O phive.phar.asc https://phar.io/releases/phive.phar.asc
+    - gpg --keyserver hkps://keys.openpgp.org --recv-keys 0x9D8A98B29B2D5D79
+    - gpg --verify phive.phar.asc phive.phar
+    - chmod +x phive.phar
+    - mv phive.phar /usr/local/bin/phive
+    # Install phab
+    - phive install phpab --global --trust-gpg-keys 0x2A8299CE842DD38C
+    # Install NCC
+    - git clone https://git.n64.cc/nosial/ncc.git
+    - cd ncc
+    - make redist
+    - NCC_DIR=$(find build/ -type d -name "ncc_*" | head -n 1)
+    - if [ -z "$NCC_DIR" ]; then echo "NCC build directory not found"; exit 1; fi
+    - php "$NCC_DIR/INSTALL" --auto
+    - cd ..
+    - rm -rf ncc
 
-  # Install the latest version of ncc (Nosial Code Compiler)
-  - git clone https://git.n64.cc/nosial/ncc.git
-  - cd ncc
-  - make redist
-  - php build/src/INSTALL --auto --install-composer
-  - cd .. && rm -rf ncc
-
-build:
+# Build jobs
+release:
+  <<: *setup_definition
   stage: build
   script:
-    - ncc build --config release --log-level debug
+    - ncc build --config release --build-source --log-level debug
   artifacts:
     paths:
-      - build/
-  rules:
-    - if: $CI_COMMIT_BRANCH
+      - build/release/net.nosial.socialbox.ncc
+    expire_in: 1 week
 
-release:
-  stage: deploy
+debug:
+  <<: *setup_definition
+  stage: build
   script:
-    - ncc build --config release --log-level debug
-    - >
-      curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/release/net.nosial.socialbox.ncc "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/net.nosial.socialbox/$CI_COMMIT_REF_NAME/net.nosial.socialbox.ncc"
+    - ncc build --config debug --build-source --log-level debug
   artifacts:
     paths:
-      - build/
+      - build/debug/net.nosial.socialbox.ncc
+    expire_in: 1 week
+
+release_executable:
+  <<: *setup_definition
+  stage: build
+  script:
+    - ncc build --config release_executable --build-source --log-level debug
+  artifacts:
+    paths:
+      - build/release/Socialbox
+    expire_in: 1 week
+
+debug_executable:
+  <<: *setup_definition
+  stage: build
+  script:
+    - ncc build --config debug_executable --build-source --log-level debug
+  artifacts:
+    paths:
+      - build/debug/Socialbox
+    expire_in: 1 week
+
+# Check for configuration files
+check_configs:
+  stage: .pre
+  script:
+    - |
+      if [ -f phpunit.xml ]; then
+        echo "PHPUNIT_EXISTS=true" >> build.env
+      else
+        echo "PHPUNIT_EXISTS=false" >> build.env
+      fi
+      if [ -f phpdoc.dist.xml ]; then
+        echo "PHPDOC_EXISTS=true" >> build.env
+      else
+        echo "PHPDOC_EXISTS=false" >> build.env
+      fi
+  artifacts:
+    reports:
+      dotenv: build.env
+
+# Documentation generation
+generate-phpdoc:
+  <<: *setup_definition
+  stage: build
+  needs: ["check_configs"]
+  rules:
+    - if: $PHPDOC_EXISTS == "true"
+  script:
+    - wget https://phpdoc.org/phpDocumentor.phar
+    - chmod +x phpDocumentor.phar
+    - php phpDocumentor.phar -d src -t docs
+    - zip -r docs.zip docs
+  artifacts:
+    paths:
+      - docs.zip
+    expire_in: 1 week
+
+# Testing
+test:
+  <<: *setup_definition
+  stage: test
+  needs:
+    - job: release
+    - job: check_configs
+  rules:
+    - if: $PHPUNIT_EXISTS == "true"
+  script:
+    - curl -sSLf -o /usr/local/bin/install-php-extensions https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions
+    - chmod +x /usr/local/bin/install-php-extensions
+    - install-php-extensions zip
+    - ncc package install --package="build/release/net.nosial.socialbox.ncc" --build-source --reinstall -y --log-level debug
+    - wget https://phar.phpunit.de/phpunit-11.3.phar
+    - php phpunit-11.3.phar --configuration phpunit.xml --log-junit reports/junit.xml --log-teamcity reports/teamcity --testdox-html reports/testdox.html --testdox-text reports/testdox.txt
+  artifacts:
+    reports:
+      junit: reports/junit.xml
+    paths:
+      - reports/
+    expire_in: 1 week
+
+# Release jobs
+release_upload:
+  stage: deploy
   rules:
     - if: $CI_COMMIT_TAG
+  needs:
+    - job: release
+    - job: debug
+    - job: release_executable
+    - job: debug_executable
+    - job: generate-phpdoc
+      optional: true
+  script:
+    - |
+      if [ -f "docs.zip" ]; then
+        echo "Releasing documentation..."
+        curl --request POST \
+          --header "PRIVATE-TOKEN: ${GITLAB_TOKEN}" \
+          --form "file=@docs.zip" \
+          "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/uploads"
+      fi
+      
+      # Upload release artifacts
+      for artifact in build/release/net.nosial.socialbox.ncc build/debug/net.nosial.socialbox.ncc build/release/Socialbox build/debug/Socialbox; do
+        if [ -f "$artifact" ]; then
+          echo "Uploading $artifact..."
+          curl --request POST \
+            --header "PRIVATE-TOKEN: ${GITLAB_TOKEN}" \
+            --form "file=@${artifact}" \
+            "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/uploads"
+        fi
+      done
+  environment: production
\ No newline at end of file
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index eb6fe11..222744a 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -8,5 +8,25 @@
       <jdbc-url>jdbc:mariadb://127.0.0.1:3306/socialbox</jdbc-url>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
+    <data-source source="LOCAL" name="Coffee Database" uuid="d114bae4-44f5-49c3-849a-149881b09342">
+      <driver-ref>mariadb</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mariadb://127.0.0.1:3308/socialbox</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="database.introspection.mysql.dbe5060" value="true" />
+      </jdbc-additional-properties>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+    <data-source source="LOCAL" name="Teapot Database" uuid="64dd3c41-0f4f-4f65-b186-d42813467391">
+      <driver-ref>mariadb</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mariadb://127.0.0.1:3307/socialbox</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="database.introspection.mysql.dbe5060" value="true" />
+      </jdbc-additional-properties>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/php-test-framework.xml b/.idea/php-test-framework.xml
new file mode 100644
index 0000000..ea6eea8
--- /dev/null
+++ b/.idea/php-test-framework.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpTestFrameworkVersionCache">
+    <tools_cache>
+      <tool tool_name="PHPUnit">
+        <cache>
+          <versions>
+            <info id="Local/home/netkas/phpunit.phar" version="11.3.5" />
+          </versions>
+        </cache>
+      </tool>
+    </tools_cache>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/php.xml b/.idea/php.xml
index 6e91387..93636e7 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -10,18 +10,27 @@
     <option name="highlightLevel" value="WARNING" />
     <option name="transferred" value="true" />
   </component>
+  <component name="PhpCodeSniffer">
+    <phpcs_settings>
+      <phpcs_by_interpreter asDefaultInterpreter="true" interpreter_id="347c1ee9-eeae-4334-9e17-b7e47c2bca71" timeout="30000" />
+    </phpcs_settings>
+  </component>
   <component name="PhpIncludePathManager">
     <include_path>
-      <path value="$USER_HOME$/phar" />
-      <path value="/var/ncc/packages/com.symfony.uid=v7.1.5" />
-      <path value="/var/ncc/packages/com.symfony.filesystem=v7.1.2" />
+      <path value="/var/ncc/packages/net.nosial.loglib2=1.0.0" />
+      <path value="/var/ncc/packages/net.nosial.loglib=2.0.0" />
+      <path value="/var/ncc/packages/com.symfony.finder=2.0.7" />
+      <path value="/var/ncc/packages/com.gregwar.captcha=v1.2.1" />
+      <path value="/var/ncc/packages/com.symfony.filesystem=v7.1.5" />
       <path value="/var/ncc/packages/com.symfony.polyfill_ctype=v1.31.0" />
       <path value="/var/ncc/packages/com.symfony.polyfill_mbstring=v1.31.0" />
-      <path value="/var/ncc/packages/com.symfony.process=v7.1.3" />
-      <path value="/var/ncc/packages/com.symfony.yaml=v7.1.4" />
+      <path value="/var/ncc/packages/com.symfony.polyfill_uuid=v1.31.0" />
+      <path value="/var/ncc/packages/com.symfony.process=v7.1.5" />
+      <path value="/var/ncc/packages/com.symfony.uid=v7.1.5" />
+      <path value="/var/ncc/packages/com.symfony.yaml=v7.1.5" />
       <path value="/var/ncc/packages/net.nosial.configlib=1.1.0" />
-      <path value="/var/ncc/packages/net.nosial.loglib=1.1.0" />
-      <path value="/var/ncc/packages/net.nosial.optslib=1.1.0" />
+      <path value="/var/ncc/packages/net.nosial.optslib=1.1.2" />
+      <path value="$USER_HOME$/phar" />
       <path value="/usr/share/ncc" />
     </include_path>
   </component>
@@ -50,7 +59,7 @@
       <extension name="enchant" enabled="false" />
       <extension name="fann" enabled="false" />
       <extension name="ffmpeg" enabled="false" />
-      <extension name="gd" enabled="false" />
+      <extension name="frankenphp" enabled="false" />
       <extension name="gearman" enabled="false" />
       <extension name="geoip" enabled="false" />
       <extension name="geos" enabled="false" />
@@ -69,7 +78,7 @@
       <extension name="libevent" enabled="false" />
       <extension name="libsodium" enabled="false" />
       <extension name="mailparse" enabled="false" />
-      <extension name="memcache" enabled="false" />
+      <extension name="memcached" enabled="false" />
       <extension name="ming" enabled="false" />
       <extension name="mongo" enabled="false" />
       <extension name="mongodb" enabled="false" />
@@ -86,9 +95,6 @@
       <extension name="odbc" enabled="false" />
       <extension name="opentelemetry" enabled="false" />
       <extension name="pdflib" enabled="false" />
-      <extension name="pdo_ibm" enabled="false" />
-      <extension name="pdo_pgsql" enabled="false" />
-      <extension name="pdo_sqlite" enabled="false" />
       <extension name="pgsql" enabled="false" />
       <extension name="pspell" enabled="false" />
       <extension name="pthreads" enabled="false" />
@@ -118,14 +124,24 @@
       <extension name="zmq" enabled="false" />
     </extensions>
   </component>
+  <component name="PhpStan">
+    <PhpStan_settings>
+      <phpstan_by_interpreter asDefaultInterpreter="true" interpreter_id="347c1ee9-eeae-4334-9e17-b7e47c2bca71" timeout="60000" />
+    </PhpStan_settings>
+  </component>
   <component name="PhpStanOptionsConfiguration">
     <option name="transferred" value="true" />
   </component>
   <component name="PhpUnit">
     <phpunit_settings>
-      <PhpUnitSettings load_method="PHPUNIT_PHAR" bootstrap_file_path="$PROJECT_DIR$/phpunit.xml" custom_loader_path="" phpunit_phar_path="$USER_HOME$/phpunit.phar" />
+      <PhpUnitSettings load_method="PHPUNIT_PHAR" bootstrap_file_path="$PROJECT_DIR$/bootstrap.php" custom_loader_path="" phpunit_phar_path="$USER_HOME$/phpunit.phar" use_bootstrap_file="true" />
     </phpunit_settings>
   </component>
+  <component name="Psalm">
+    <Psalm_settings>
+      <psalm_fixer_by_interpreter asDefaultInterpreter="true" interpreter_id="347c1ee9-eeae-4334-9e17-b7e47c2bca71" timeout="60000" />
+    </Psalm_settings>
+  </component>
   <component name="PsalmOptionsConfiguration">
     <option name="transferred" value="true" />
   </component>
diff --git a/.idea/runConfigurations/Build.xml b/.idea/runConfigurations/Build_Release.xml
similarity index 57%
rename from .idea/runConfigurations/Build.xml
rename to .idea/runConfigurations/Build_Release.xml
index a601571..cc2ede7 100644
--- a/.idea/runConfigurations/Build.xml
+++ b/.idea/runConfigurations/Build_Release.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Build" type="MAKEFILE_TARGET_RUN_CONFIGURATION" factoryName="Makefile">
-    <makefile filename="$PROJECT_DIR$/Makefile" target="build" workingDirectory="" arguments="">
+  <configuration default="false" name="Build Release" type="MAKEFILE_TARGET_RUN_CONFIGURATION" factoryName="Makefile">
+    <makefile filename="$PROJECT_DIR$/Makefile" target="release" workingDirectory="" arguments="">
       <envs />
     </makefile>
     <method v="2">
diff --git a/.idea/runConfigurations/Install__sudo_.xml b/.idea/runConfigurations/Install__sudo_.xml
index 5063fe6..a07b24a 100644
--- a/.idea/runConfigurations/Install__sudo_.xml
+++ b/.idea/runConfigurations/Install__sudo_.xml
@@ -12,8 +12,6 @@
     <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="false" />
     <envs />
-    <method v="2">
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Build" run_configuration_type="MAKEFILE_TARGET_RUN_CONFIGURATION" />
-    </method>
+    <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
index 12d6855..68ae0fe 100644
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -1,12 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="SqlDialectMappings">
-    <file url="file://$PROJECT_DIR$/src/Socialbox/Classes/Resources/database/password_authentication.sql" dialect="MariaDB" />
-    <file url="file://$PROJECT_DIR$/src/Socialbox/Classes/Resources/database/registered_peers.sql" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Classes/Resources/database/authentication_otp.sql" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Classes/Resources/database/authentication_passwords.sql" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Classes/Resources/database/captcha_images.sql" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Classes/Resources/database/channel_com.sql" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Classes/Resources/database/contact_known_keys.sql" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Classes/Resources/database/contacts.sql" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Classes/Resources/database/encryption_channels.sql" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Classes/Resources/database/encryption_channels_com.sql" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Classes/Resources/database/external_sessions.sql" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Classes/Resources/database/peer_information.sql" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Classes/Resources/database/peers.sql" dialect="MariaDB" />
     <file url="file://$PROJECT_DIR$/src/Socialbox/Classes/Resources/database/sessions.sql" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Classes/Resources/database/signing_keys.sql" dialect="MariaDB" />
     <file url="file://$PROJECT_DIR$/src/Socialbox/Classes/Resources/database/variables.sql" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Managers/CaptchaManager.php" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Managers/ContactManager.php" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Managers/EncryptionChannelManager.php" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Managers/ExternalSessionManager.php" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Managers/OneTimePasswordManager.php" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Managers/PasswordManager.php" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Managers/PeerInformationManager.php" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Managers/RegisteredPeerManager.php" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Managers/ResolvedDnsRecordsManager.php" dialect="MariaDB" />
     <file url="file://$PROJECT_DIR$/src/Socialbox/Managers/SessionManager.php" dialect="MariaDB" />
+    <file url="file://$PROJECT_DIR$/src/Socialbox/Managers/SigningKeysManager.php" dialect="MariaDB" />
     <file url="file://$PROJECT_DIR$/src/Socialbox/Managers/VariableManager.php" dialect="MariaDB" />
-    <file url="file:///var/ncc/packages/net.nosial.socialbox=1.0.0/bin/src/Socialbox/Managers/VariableManager.php" dialect="MariaDB" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/webResources.xml b/.idea/webResources.xml
index 38d7e3c..10ead0c 100644
--- a/.idea/webResources.xml
+++ b/.idea/webResources.xml
@@ -7,6 +7,8 @@
           <resourceRoots>
             <path value="file://$PROJECT_DIR$/examples" />
             <path value="file://$PROJECT_DIR$/src/Socialbox/Classes/Resources" />
+            <path value="file://$PROJECT_DIR$/public" />
+            <path value="file://$PROJECT_DIR$/docker" />
           </resourceRoots>
         </entryData>
       </entry>
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..18bc6ee
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,132 @@
+# -----------------------------------------------------------------------------
+# Dockerfile for PHP 8.3 + FPM with Cron support and Supervisor
+# -----------------------------------------------------------------------------
+
+# Base image: Official PHP 8.3 with FPM
+FROM php:8.3-fpm AS base
+
+# ----------------------------- Metadata labels ------------------------------
+LABEL maintainer="Netkas <netkas@n64.cc>" \
+      version="1.0" \
+      description="Socialbox Docker image based off PHP 8.3 FPM and NCC" \
+      application="SocialBox" \
+      base_image="php:8.3-fpm"
+
+# Environment variable for non-interactive installations
+ENV DEBIAN_FRONTEND=noninteractive
+
+# ----------------------------- System Dependencies --------------------------
+# Update system packages and install required dependencies in one step
+RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \
+    git \
+    libpq-dev \
+    libzip-dev \
+    zip \
+    make \
+    wget \
+    gnupg \
+    cron \
+    supervisor \
+    mariadb-client \
+    libcurl4-openssl-dev \
+    libmemcached-dev \
+    redis \
+    libgd-dev \
+    nginx \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# ----------------------------- PHP Extensions -------------------------------
+# Install PHP extensions and enable additional ones
+RUN docker-php-ext-install -j$(nproc) \
+    pdo \
+    pdo_mysql \
+    mysqli \
+    gd \
+    curl \
+    opcache \
+    zip \
+    sockets \
+    pcntl && \
+    pecl install redis memcached && \
+    docker-php-ext-enable redis memcached
+
+# ----------------------------- Additional Tools -----------------------------
+# Install Phive (Package Manager for PHAR libraries) and global tools in one step
+RUN wget -O /usr/local/bin/phive https://phar.io/releases/phive.phar && \
+    wget -O /usr/local/bin/phive.asc https://phar.io/releases/phive.phar.asc && \
+    gpg --keyserver hkps://keys.openpgp.org --recv-keys 0x9D8A98B29B2D5D79 && \
+    gpg --verify /usr/local/bin/phive.asc /usr/local/bin/phive && \
+    chmod +x /usr/local/bin/phive && \
+    phive install phpab --global --trust-gpg-keys 0x2A8299CE842DD38C
+
+# ----------------------------- Clone and Build NCC --------------------------
+# Clone the NCC repository, build the project, and install it
+RUN git clone https://git.n64.cc/nosial/ncc.git && \
+    cd ncc && \
+    make redist && \
+    NCC_DIR=$(find build/ -type d -name "ncc_*" | head -n 1) && \
+    if [ -z "$NCC_DIR" ]; then \
+      echo "NCC build directory not found"; \
+      exit 1; \
+    fi && \
+    php "$NCC_DIR/INSTALL" --auto && \
+    cd .. && rm -rf ncc
+
+# ----------------------------- Project Build ---------------------------------
+# Set build directory and copy pre-needed project files
+WORKDIR /tmp/build
+COPY . .
+
+RUN ncc build --config release --build-source --log-level debug && \
+    ncc package install --package=build/release/net.nosial.socialbox.ncc --build-source -y --log-level=debug
+
+# Clean up
+RUN rm -rf /tmp/build && rm -rf /var/www/html/*
+
+# Copy over the required files
+COPY docker/nginx.conf /etc/nginx/nginx.conf
+COPY public/index.php /var/www/html/index.php
+RUN chown -R www-data:www-data /var/www/html && chmod -R 755 /var/www/html
+
+# ----------------------------- Environment Configuration ---------------------------
+# Configure Cron
+RUN echo "*/1 * * * * root for i in {1..12}; do /usr/bin/socialbox process-outgoing; sleep 5; done" > /etc/cron.d/socialbox-process-outgoing && \
+    echo "*/1 * * * * root /usr/bin/socialbox session-cleanup" > /etc/cron.d/socialbox-session-cleanup && \
+    echo "*/5 * * * * root /usr/bin/socialbox peer-cleanup" > /etc/cron.d/socialbox-peer-cleanup && \
+    \
+    chmod 0644 /etc/cron.d/socialbox-process-outgoing && \
+    chmod 0644 /etc/cron.d/socialbox-session-cleanup && \
+    chmod 0644 /etc/cron.d/socialbox-peer-cleanup && \
+    \
+    crontab /etc/cron.d/socialbox-process-outgoing && \
+    crontab /etc/cron.d/socialbox-session-cleanup && \
+    crontab /etc/cron.d/socialbox-peer-cleanup
+
+# Copy Supervisor configuration
+COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+# Copy docker.conf & zz-docker.conf for PHP-FPM
+COPY docker/docker.conf /usr/local/etc/php-fpm.d/docker.conf
+COPY docker/zz-docker.conf /usr/local/etc/php-fpm.d/zz-docker.conf
+
+# Configure php.ini and enable error and log it to /var/log rather than stdout
+RUN cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini && \
+    sed -i 's/^;error_log = php_errors.log/error_log = \/var\/log\/php_errors.log/' /usr/local/etc/php/php.ini && \
+    sed -i 's/^;log_errors = On/log_errors = On/' /usr/local/etc/php/php.ini && \
+    sed -i 's/^;error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT/error_reporting = E_ALL/' /usr/local/etc/php/php.ini && \
+    sed -i 's/^;display_errors = Off/display_errors = On/' /usr/local/etc/php/php.ini && \
+    sed -i 's/^;date.timezone =/date.timezone = UTC/' /usr/local/etc/php/php.ini
+
+
+# ----------------------------- Cleanup ---------------------
+WORKDIR /
+
+# ----------------------------- Port Exposing ---------------------------------
+EXPOSE 8085
+
+# ----------------------------- Container Startup ----------------------------
+# Copy over entrypoint script and set it as executable
+COPY docker/entrypoint.sh /usr/local/bin/entrypoint.sh
+RUN chmod +x /usr/local/bin/entrypoint.sh
+
+# Set the entrypoint
+ENTRYPOINT ["/usr/bin/bash", "/usr/local/bin/entrypoint.sh"]
diff --git a/Makefile b/Makefile
index 424ebce..ce5da5d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,29 @@
 # Variables
-CONFIG ?= release
+DEFAULT_CONFIGURATION ?= release
 LOG_LEVEL = debug
-OUTDIR = build/$(CONFIG)
-PACKAGE = $(OUTDIR)/net.nosial.socialbox.ncc
 
 # Default Target
-all: build
+all: release debug release_executable debug_executable
 
 # Build Steps
-build:
-	ncc build --config=$(CONFIG) --log-level $(LOG_LEVEL)
+release:
+	ncc build --config=release --log-level $(LOG_LEVEL)
+debug:
+	ncc build --config=debug --log-level $(LOG_LEVEL)
+release_executable:
+	ncc build --config=release_executable --log-level $(LOG_LEVEL)
+debug_executable:
+	ncc build --config=debug_executable --log-level $(LOG_LEVEL)
 
-install: build
-	ncc package install --package=$(PACKAGE) --skip-dependencies --build-source --reinstall -y --log-level $(LOG_LEVEL)
 
-test: build
+install: release
+	ncc package install --package=build/release/net.nosial.socialbox.ncc --skip-dependencies --build-source --reinstall -y --log-level $(LOG_LEVEL)
+
+test: release
+	[ -f phpunit.xml ] || { echo "phpunit.xml not found"; exit 1; }
 	phpunit
 
 clean:
 	rm -rf build
 
-.PHONY: all build install test clean
\ No newline at end of file
+.PHONY: all install test clean release debug release_executable debug_executable
\ No newline at end of file
diff --git a/coffee_socialbox/config/socialbox.conf b/coffee_socialbox/config/socialbox.conf
new file mode 100755
index 0000000..0d01283
--- /dev/null
+++ b/coffee_socialbox/config/socialbox.conf
@@ -0,0 +1,117 @@
+{
+    "instance": {
+        "enabled": true,
+        "name": "coffee",
+        "domain": "coffee.com",
+        "rpc_endpoint": "http://coffee_socialbox:8085/",
+        "dns_mocks": {
+            "teapot.com": "v=socialbox;sb-rpc=http://teapot_socialbox:8085/;sb-key=sig:MDXUuripAo_IAv-EZTEoFhpIdhsXxfMLNunSnQzxYiY;sb-exp=0",
+            "coffee.com": "v=socialbox;sb-rpc=http://coffee_socialbox:8085/;sb-key=sig:g59Cf8j1wmQmRg1MkveYbpdiZ-1-_hFU9eRRJmQAwmc;sb-exp=0"
+        }
+    },
+    "security": {
+        "display_internal_exceptions": true,
+        "resolved_servers_ttl": 600,
+        "captcha_ttl": 200,
+        "otp_secret_key_length": 32,
+        "otp_time_step": 30,
+        "otp_digits": 6,
+        "otp_hash_algorithm": "sha512",
+        "otp_window": 1
+    },
+    "cryptography": {
+        "host_keypair_expires": 0,
+        "host_public_key": "sig:g59Cf8j1wmQmRg1MkveYbpdiZ-1-_hFU9eRRJmQAwmc",
+        "host_private_key": "sig:tTVe59Ko5XuwgS8PneR92FAOqbgSHTKYn8U-lQRB9KODn0J_yPXCZCZGDUyS95hul2Jn7X7-EVT15FEmZADCZw",
+        "internal_encryption_keys": [
+            "c2cpdTkYqIWI93cJPpAuCsoQJcHi9l37lYHA2TpUo9A",
+            "XUuWyWcKmtCUNVZ7Y0ZDbCE72klHZIniRihIIo78Vbs",
+            "SGg4GM_0-hO95Q6hBq2UjzGrp9mhVHyklNTHo-OZSNw",
+            "43WrkV6rDyc04S41E4uwJ1nQFhlll_CflsPW_hMOiqE",
+            "QDh9KecIdU-6be5ScPagL_WrWp8hQAersLQvLv9YtNQ",
+            "z4SnLU9Xw9F3yjPH_TmV4HuvZrpaVE0bqxzUGHyXQ-k",
+            "vg7lWOzkL_59u3o2RKcdrdwc7KVh07NrZRQzBPoJXEU",
+            "UW6X3XGGLj_e8xYd1bUwX9KYPTczHFtYTmy4FfiqfG0",
+            "sh-sRIQ3lWgkqR87wcTtZkDrgDKY2FOLuzdtpAvi9Wg",
+            "SDweTV1kNH0s5Ah1pwbfDo3ThAXAVKo9qJ4V9-hsHIs"
+        ],
+        "encryption_keys_count": 10,
+        "encryption_keys_algorithm": "xchacha20",
+        "transport_encryption_algorithm": "chacha20"
+    },
+    "database": {
+        "host": "coffee_mariadb",
+        "port": 0,
+        "username": "socialbox",
+        "password": "socialbox",
+        "name": "socialbox"
+    },
+    "logging": {
+        "console_logging_enabled": true,
+        "console_logging_level": "info",
+        "file_logging_enabled": true,
+        "file_logging_level": "debug"
+    },
+    "cache": {
+        "enabled": true,
+        "engine": "redis",
+        "host": "coffee_redis",
+        "port": 6379,
+        "username": "root",
+        "password": "root",
+        "database": "0",
+        "sessions": {
+            "enabled": true,
+            "ttl": 3600,
+            "max": 1000
+        }
+    },
+    "registration": {
+        "enabled": true,
+        "privacy_policy_document": null,
+        "privacy_policy_date": 1734985525,
+        "accept_privacy_policy": false,
+        "terms_of_service_document": null,
+        "terms_of_service_date": 1734985525,
+        "accept_terms_of_service": false,
+        "community_guidelines_document": null,
+        "community_guidelines_date": 1734985525,
+        "accept_community_guidelines": false,
+        "password_required": true,
+        "otp_required": false,
+        "display_name_required": true,
+        "display_picture_required": false,
+        "email_address_required": false,
+        "phone_number_required": false,
+        "birthday_required": false,
+        "image_captcha_verification_required": false,
+        "first_name_required": false,
+        "middle_name_required": false,
+        "last_name_required": false,
+        "url_required": false
+    },
+    "authentication": {
+        "enabled": true,
+        "image_captcha_verification_required": true
+    },
+    "policies": {
+        "max_signing_keys": 20,
+        "session_inactivity_expires": 43200,
+        "image_captcha_expires": 300,
+        "peer_sync_interval": 3600,
+        "get_contacts_limit": 100,
+        "default_display_picture_privacy": "PUBLIC",
+        "default_first_name_privacy": "CONTACTS",
+        "default_middle_name_privacy": "PRIVATE",
+        "default_last_name_privacy": "PRIVATE",
+        "default_email_address_privacy": "CONTACTS",
+        "default_phone_number_privacy": "CONTACTS",
+        "default_birthday_privacy": "PRIVATE",
+        "default_url_privacy": "PUBLIC"
+    },
+    "storage": {
+        "path": "/etc/socialbox",
+        "user_display_images_path": "user_profiles",
+        "user_display_images_max_size": 3145728
+    }
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
deleted file mode 100644
index c76565e..0000000
--- a/composer.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "vendor_name/socialbox-php",
-  "description": "description",
-  "minimum-stability": "stable",
-  "license": "proprietary",
-  "authors": [
-    {
-      "name": "Netkas",
-      "email": "netkas@nosial.net"
-    }
-  ],
-  "require": {
-    "ext-pdo": "*",
-    "ext-openssl": "*",
-    "ext-redis": "*",
-    "ext-memcached": "*"
-  }
-}
\ No newline at end of file
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
new file mode 100644
index 0000000..3f339e8
--- /dev/null
+++ b/docker-compose.test.yml
@@ -0,0 +1,245 @@
+# Test docker-compose file for SocialBox service to setup two instances of the service:
+# 1. Teapot Service (teapot.com)
+# 2. Coffee Service (coffee.com)
+
+services:
+
+  # Coffee Service (coffee.com test)
+  coffee_socialbox:
+    container_name: coffee_socialbox
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "8086:8085"
+    depends_on:
+      coffee_mariadb:
+        condition: service_healthy
+      coffee_redis:
+        condition: service_healthy
+    networks:
+      - coffee_network
+      - shared_network
+    restart: unless-stopped
+    volumes:
+      - ./coffee_socialbox/config:/etc/config
+      - ./coffee_socialbox/data:/etc/socialbox
+    environment:
+      # No need to change these values
+      LOG_LEVEL: ${LOG_LEVEL:-debug}
+      CONFIGLIB_PATH: /etc/config
+      LOGGING_DIRECTORY: /var/log
+      SB_MODE: automated
+      SB_STORAGE_PATH: /etc/socialbox
+      # Change these values to match your environment or update the .env file
+      SB_INSTANCE_NAME: ${SB_COFFEE_NAME:-coffee} # Instance name SB_COFFEE_NAME
+      SB_INSTANCE_DOMAIN: ${SB_COFFEE_DOMAIN:-coffee.com} # Instance domain SB_COFFEE_DOMAIN
+      SB_INSTANCE_RPC_ENDPOINT: ${SB_COFFEE_RPC_ENDPOINT:-http://coffee_socialbox:8085/}  # Instance RPC endpoint SB_COFFEE_RPC_ENDPOINT
+      SB_LOGGING_CONSOLE_ENABLED: ${SB_LOGGING_CONSOLE_ENABLED:-true}
+      SB_LOGGING_CONSOLE_LEVEL: ${SB_LOGGING_CONSOLE_LEVEL:-debug}
+      SB_LOGGING_FILE_ENABLED: ${SB_LOGGING_FILE_ENABLED:-true}
+      SB_LOGGING_FILE_LEVEL: ${SB_LOGGING_FILE_LEVEL:-debug}
+      SB_SECURITY_DISPLAY_INTERNAL_EXCEPTIONS: true
+      SB_CRYPTO_KEYPAIR_EXPIRES: ${SB_CRYPTO_KEYPAIR_EXPIRES}
+      SB_CRYPTO_ENCRYPTION_KEYS_COUNT: ${SB_CRYPTO_ENCRYPTION_KEYS_COUNT:-10}
+      SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM: ${SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM:-xchacha20}
+      SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM: ${SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM:-chacha20}
+      SB_DATABASE_HOST: coffee_mariadb
+      SB_DATABASE_USERNAME: ${MYSQL_USER:-socialbox}
+      SB_DATABASE_PASSWORD: ${MYSQL_PASSWORD:-socialbox}
+      SB_DATABASE_NAME: ${MYSQL_DATABASE:-socialbox}
+      SB_CACHE_ENABLED: ${SB_CACHE_ENABLED:-true}
+      SB_CACHE_ENGINE: redis
+      SB_CACHE_HOST: coffee_redis
+      SB_CACHE_PORT: ${SB_CACHE_PORT:-6379}
+      SB_CACHE_USERNAME: ${SB_CACHE_USERNAME:-root}
+      SB_CACHE_PASSWORD: ${SB_CACHE_PASSWORD:-root}
+      SB_CACHE_DATABASE: ${SB_CACHE_DATABASE:-0}
+      # Mocking, required for testing without the need for configuring actual DNS records
+      # Usage: SB_INSTANCE_DNS_MOCK_<INSTANCE_NAME>: <DOMAIN> <TXT_RECORD>
+      # Environment Variable name is ignored, only the value is used with the prefix being used to detect
+      # the instance name and the suffix being used to detect the TXT record
+      SB_INSTANCE_DNS_MOCK_COFFEE: ${SB_INSTANCE_DNS_MOCK_COFFEE:-"coffee.com v=socialbox;sb-rpc=http://coffee_socialbox:8085/;sb-key=sig:g59Cf8j1wmQmRg1MkveYbpdiZ-1-_hFU9eRRJmQAwmc;sb-exp=0"}
+      SB_INSTANCE_DNS_MOCK_TEAPOT: ${SB_INSTANCE_DNS_MOCK_TEAPOT:-"teapot.com v=socialbox;sb-rpc=http://teapot_socialbox:8085/;sb-key=sig:MDXUuripAo_IAv-EZTEoFhpIdhsXxfMLNunSnQzxYiY;sb-exp=0"}
+      # UDP Logging, won't cause issues if the server is not available
+      # See https://github.com/nosial/LogLib2/blob/master/server.py for more information
+      LOGLIB_UDP_ENABLED: true
+      LOGLIB_UDP_HOST: 172.17.0.1
+      LOGLIB_UDP_PORT: 5131
+    healthcheck:
+      test: ["CMD", "curl", "-f", "-H", "Request-Type: ping", "${SB_INSTANCE_RPC_ENDPOINT-http://coffee_socialbox:8085/}"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
+  coffee_mariadb:
+    container_name: coffee_socialbox_mariadb
+    image: mariadb:10.5
+    restart: unless-stopped
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-sb_root}
+      MYSQL_DATABASE: ${MYSQL_DATABASE:-socialbox}
+      MYSQL_USER: ${MYSQL_USER:-socialbox}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD:-socialbox}
+    volumes:
+      - coffee_mariadb_data:/var/lib/mysql
+    networks:
+      - coffee_network
+    ports:
+      - "3308:3306"
+    expose:
+      - "3306"
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "coffee_mariadb", "-u", "${MYSQL_USER:-socialbox}", "-p${MYSQL_PASSWORD:-socialbox}"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 30s
+  coffee_redis:
+    container_name: coffee_socialbox_redis
+    image: redis:alpine
+    restart: unless-stopped
+    command: redis-server /usr/local/etc/redis/redis.conf --appendonly yes
+    volumes:
+      - coffee_redis_data:/data
+      - ./docker/redis.conf:/usr/local/etc/redis/redis.conf
+    networks:
+      - coffee_network
+    expose:
+      - "6379"
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 5s
+
+  # Teapot Service (teapot.com test)
+  teapot_socialbox:
+    container_name: teapot_socialbox
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "8087:8085" # Unique port for Teapot instance
+    depends_on:
+      teapot_mariadb:
+        condition: service_healthy
+      teapot_redis:
+        condition: service_healthy
+    networks:
+      - teapot_network
+      - shared_network
+    restart: unless-stopped
+    volumes:
+      - ./teapot_socialbox/config:/etc/config
+      - ./teapot_socialbox/data:/etc/socialbox
+    environment:
+      # No need to change these values
+      LOG_LEVEL: ${LOG_LEVEL:-debug}
+      CONFIGLIB_PATH: /etc/config
+      LOGGING_DIRECTORY: /var/log
+      SB_MODE: automated
+      SB_STORAGE_PATH: /etc/socialbox
+      # Change these values to match your environment or update the .env file
+      SB_INSTANCE_NAME: ${SB_TEAPOT_NAME:-teapot} # Instance name SB_TEAPOT_NAME
+      SB_INSTANCE_DOMAIN: ${SB_TEAPOT_DOMAIN:-teapot.com} # Instance domain SB_TEAPOT_DOMAIN
+      SB_INSTANCE_RPC_ENDPOINT: ${SB_TEAPOT_RPC_ENDPOINT:-http://teapot_socialbox:8085/} # Instance RPC endpoint SB_TEAPOT_RPC_ENDPOINT
+      SB_LOGGING_CONSOLE_ENABLED: ${SB_LOGGING_CONSOLE_ENABLED:-true}
+      SB_LOGGING_CONSOLE_LEVEL: ${SB_LOGGING_CONSOLE_LEVEL:-debug}
+      SB_LOGGING_FILE_ENABLED: ${SB_LOGGING_FILE_ENABLED:-true}
+      SB_LOGGING_FILE_LEVEL: ${SB_LOGGING_FILE_LEVEL:-debug}
+      SB_SECURITY_DISPLAY_INTERNAL_EXCEPTIONS: true
+      SB_CRYPTO_KEYPAIR_EXPIRES: ${SB_CRYPTO_KEYPAIR_EXPIRES}
+      SB_CRYPTO_ENCRYPTION_KEYS_COUNT: ${SB_CRYPTO_ENCRYPTION_KEYS_COUNT:-10}
+      SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM: ${SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM:-xchacha20}
+      SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM: ${SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM:-chacha20}
+      SB_DATABASE_HOST: teapot_mariadb
+      SB_DATABASE_USERNAME: ${MYSQL_USER:-socialbox}
+      SB_DATABASE_PASSWORD: ${MYSQL_PASSWORD:-socialbox}
+      SB_DATABASE_NAME: ${MYSQL_DATABASE:-socialbox}
+      SB_CACHE_ENABLED: ${SB_CACHE_ENABLED:-true}
+      SB_CACHE_ENGINE: redis
+      SB_CACHE_HOST: teapot_redis
+      SB_CACHE_PORT: ${SB_CACHE_PORT:-6379}
+      SB_CACHE_USERNAME: ${SB_CACHE_USERNAME:-root}
+      SB_CACHE_PASSWORD: ${SB_CACHE_PASSWORD:-root}
+      SB_CACHE_DATABASE: ${SB_CACHE_DATABASE:-0}
+      # Mocking, required for testing without the need for configuring actual DNS records
+      # Usage: SB_INSTANCE_DNS_MOCK_<INSTANCE_NAME>: <DOMAIN> <TXT_RECORD>
+      # Environment Variable name is ignored, only the value is used with the prefix being used to detect
+      # the instance name and the suffix being used to detect the TXT record
+      SB_INSTANCE_DNS_MOCK_COFFEE: ${SB_INSTANCE_DNS_MOCK_COFFEE:-"coffee.com v=socialbox;sb-rpc=http://coffee_socialbox:8085/;sb-key=sig:g59Cf8j1wmQmRg1MkveYbpdiZ-1-_hFU9eRRJmQAwmc;sb-exp=0"}
+      SB_INSTANCE_DNS_MOCK_TEAPOT: ${SB_INSTANCE_DNS_MOCK_TEAPOT:-"teapot.com v=socialbox;sb-rpc=http://teapot_socialbox:8085/;sb-key=sig:MDXUuripAo_IAv-EZTEoFhpIdhsXxfMLNunSnQzxYiY;sb-exp=0"}
+      # UDP Logging, won't cause issues if the server is not available
+      # See https://github.com/nosial/LogLib2/blob/master/server.py for more information
+      LOGLIB_UDP_ENABLED: true
+      LOGLIB_UDP_HOST: 172.17.0.1
+      LOGLIB_UDP_PORT: 5131
+    healthcheck:
+      test: ["CMD", "curl", "-f", "-H", "Request-Type: ping", "${SB_INSTANCE_RPC_ENDPOINT-http://teapot_socialbox:8085/}"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
+  teapot_mariadb:
+    container_name: teapot_socialbox_mariadb
+    image: mariadb:10.5
+    restart: unless-stopped
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-sb_root}
+      MYSQL_DATABASE: ${MYSQL_DATABASE:-socialbox}
+      MYSQL_USER: ${MYSQL_USER:-socialbox}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD:-socialbox}
+    volumes:
+      - teapot_mariadb_data:/var/lib/mysql
+    networks:
+      - teapot_network
+    ports:
+      - "3307:3306" # Unique port for Teapot instance
+    expose:
+      - "3306"
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "teapot_mariadb", "-u", "${MYSQL_USER:-socialbox}", "-p${MYSQL_PASSWORD:-socialbox}"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 30s
+  teapot_redis:
+    container_name: teapot_socialbox_redis
+    image: redis:alpine
+    restart: unless-stopped
+    command: redis-server /usr/local/etc/redis/redis.conf --appendonly yes
+    volumes:
+      - teapot_redis_data:/data
+      - ./docker/redis.conf:/usr/local/etc/redis/redis.conf
+    networks:
+      - teapot_network
+    expose:
+      - "6379"
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 5s
+
+volumes:
+  teapot_mariadb_data:
+    driver: local
+  teapot_redis_data:
+    driver: local
+  coffee_redis_data:
+    driver: local
+  coffee_mariadb_data:
+    driver: local
+
+networks:
+  teapot_network:
+    driver: bridge
+    name: teapot_network
+  coffee_network:
+    driver: bridge
+    name: coffee_network
+  shared_network:
+    driver: bridge
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..e409af1
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,109 @@
+services:
+  socialbox:
+    container_name: socialbox
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "8085:8085"
+    depends_on:
+      mariadb:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    networks:
+      - internal_network
+    restart: unless-stopped
+    volumes:
+      - ./socialbox/config:/etc/config
+      - ./socialbox/logs:/var/log
+      - ./socialbox/data:/etc/socialbox
+    environment:
+      # No need to change these values
+      LOG_LEVEL: ${LOG_LEVEL:-debug}
+      CONFIGLIB_PATH: /etc/config
+      LOGGING_DIRECTORY: /var/log
+      SB_MODE: automated
+      SB_STORAGE_PATH: /etc/socialbox
+      # Change these values to match your environment or update the .env file
+      SB_INSTANCE_NAME: ${SB_INSTANCE_NAME:-socialbox}
+      SB_INSTANCE_DOMAIN: ${SB_DOMAIN:-localhost}
+      SB_INSTANCE_RPC_ENDPOINT: ${SB_RPC_ENDPOINT:-http://127.0.0.0:8085/}
+      SB_LOGGING_CONSOLE_ENABLED: ${SB_LOGGING_CONSOLE_ENABLED:-true}
+      SB_LOGGING_CONSOLE_LEVEL: ${SB_LOGGING_CONSOLE_LEVEL:-info}
+      SB_LOGGING_FILE_ENABLED: ${SB_LOGGING_FILE_ENABLED:-true}
+      SB_LOGGING_FILE_LEVEL: ${SB_LOGGING_FILE_LEVEL:-error}
+      SB_SECURITY_DISPLAY_INTERNAL_EXCEPTIONS: ${SB_SECURITY_DISPLAY_INTERNAL_EXCEPTIONS:-false}
+      SB_CRYPTO_KEYPAIR_EXPIRES: ${SB_CRYPTO_KEYPAIR_EXPIRES}
+      SB_CRYPTO_ENCRYPTION_KEYS_COUNT: ${SB_CRYPTO_ENCRYPTION_KEYS_COUNT:-10}
+      SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM: ${SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM:-xchacha20}
+      SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM: ${SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM:-chacha20}
+      SB_DATABASE_HOST: mariadb
+      SB_DATABASE_USERNAME: ${MYSQL_USER:-socialbox}
+      SB_DATABASE_PASSWORD: ${MYSQL_PASSWORD:-socialbox}
+      SB_DATABASE_NAME: ${MYSQL_DATABASE:-socialbox}
+      SB_CACHE_ENABLED: ${SB_CACHE_ENABLED:-true}
+      SB_CACHE_ENGINE: redis
+      SB_CACHE_HOST: redis
+      SB_CACHE_PORT: ${SB_CACHE_PORT:-6379}
+      SB_CACHE_USERNAME: ${SB_CACHE_USERNAME:-root}
+      SB_CACHE_PASSWORD: ${SB_CACHE_PASSWORD:-root}
+      SB_CACHE_DATABASE: ${SB_CACHE_DATABASE:-0}
+    healthcheck:
+      test: ["CMD", "curl", "-f", "-H", "Request-Type: ping", "${SB_INSTANCE_RPC_ENDPOINT-http://127.0.0.0:8085/}"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
+
+  mariadb:
+    container_name: socialbox_mariadb
+    image: mariadb:10.5
+    restart: unless-stopped
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-sb_root}
+      MYSQL_DATABASE: ${MYSQL_DATABASE:-socialbox}
+      MYSQL_USER: ${MYSQL_USER:-socialbox}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD:-socialbox}
+    volumes:
+      - mariadb_data:/var/lib/mysql
+    networks:
+      - internal_network
+    expose:
+      - "3306"
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "mariadb", "-u", "${MYSQL_USER:-socialbox}", "-p${MYSQL_PASSWORD:-socialbox}"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 30s
+
+  redis:
+    container_name: socialbox_redis
+    image: redis:alpine
+    restart: unless-stopped
+    command: redis-server /usr/local/etc/redis/redis.conf --appendonly yes
+    volumes:
+      - redis_data:/data
+      - ./docker/redis.conf:/usr/local/etc/redis/redis.conf
+    networks:
+      - internal_network
+    expose:
+      - "6379"
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 5s
+
+volumes:
+  mariadb_data:
+    driver: local
+  redis_data:
+    driver: local
+
+networks:
+  internal_network:
+    driver: bridge
+    name: socialbox_network
\ No newline at end of file
diff --git a/docker/docker.conf b/docker/docker.conf
new file mode 100644
index 0000000..40d2614
--- /dev/null
+++ b/docker/docker.conf
@@ -0,0 +1,2 @@
+[www]
+clear_env = no
\ No newline at end of file
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
new file mode 100644
index 0000000..6eaf44b
--- /dev/null
+++ b/docker/entrypoint.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Banner with cool ASCII art
+echo "███████╗ ██████╗  ██████╗██╗ █████╗ ██╗     ██████╗  ██████╗ ██╗  ██╗"
+echo "██╔════╝██╔═══██╗██╔════╝██║██╔══██╗██║     ██╔══██╗██╔═══██╗╚██╗██╔╝"
+echo "███████╗██║   ██║██║     ██║███████║██║     ██████╔╝██║   ██║ ╚███╔╝ "
+echo "╚════██║██║   ██║██║     ██║██╔══██║██║     ██╔══██╗██║   ██║ ██╔██╗ "
+echo "███████║╚██████╔╝╚██████╗██║██║  ██║███████╗██████╔╝╚██████╔╝██╔╝ ██╗"
+echo "╚══════╝ ╚═════╝  ╚═════╝╚═╝╚═╝  ╚═╝╚══════╝╚═════╝  ╚═════╝ ╚═╝  ╚═╝"
+
+# Check if the environment variable SB_MODE is set to "automated", if not exit.
+if [ "$SB_MODE" != "automated" ]; then
+    echo "SB_MODE is not set to 'automated', exiting..."
+    exit 1
+fi
+
+# Initialize Socialbox
+echo "Initializing Socialbox..."
+/usr/bin/socialbox init --log-level=${LOG_LEVEL-INFO}
+
+# Run supervisord, final command
+/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
\ No newline at end of file
diff --git a/docker/nginx.conf b/docker/nginx.conf
new file mode 100644
index 0000000..9909244
--- /dev/null
+++ b/docker/nginx.conf
@@ -0,0 +1,37 @@
+http {
+    include mime.types;
+    default_type application/octet-stream;
+
+    server {
+        listen 8085;
+        server_name localhost;
+
+        access_log /var/log/access.log;
+        error_log /var/log/error.log;
+
+        root /var/www/html;
+        index index.php;
+
+        # Handle all requests
+        location / {
+            try_files $uri $uri/ /index.php?$query_string =503;
+            autoindex off;
+        }
+
+        location ~ \.php$ {
+            include fastcgi_params;
+            fastcgi_pass 127.0.0.1:9000;
+            fastcgi_index index.php;
+            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        }
+
+        # Block any .ht* files
+        location ~ /\.ht {
+            deny all;
+        }
+    }
+}
+
+events {
+    worker_connections 1024;
+}
\ No newline at end of file
diff --git a/docker/redis.conf b/docker/redis.conf
new file mode 100644
index 0000000..dc6be78
--- /dev/null
+++ b/docker/redis.conf
@@ -0,0 +1,5 @@
+bind 0.0.0.0
+protected-mode yes
+port 6379
+appendonly yes
+requirepass root
\ No newline at end of file
diff --git a/docker/supervisord.conf b/docker/supervisord.conf
new file mode 100644
index 0000000..f723f44
--- /dev/null
+++ b/docker/supervisord.conf
@@ -0,0 +1,52 @@
+[supervisord]
+logfile=/var/logd.log
+logfile_maxbytes=50MB
+logfile_backups=10
+loglevel=info
+user=root
+pidfile=/var/run/supervisord.pid
+umask=022
+nodaemon=true
+minfds=1024
+minprocs=200
+
+[program:php-fpm]
+command=/usr/local/sbin/php-fpm --nodaemonize
+autostart=true
+autorestart=true
+priority=20
+stdout_logfile=/var/log/fpm.log
+stderr_logfile=/var/log/fpm_error.log
+stdout_logfile_maxbytes=0
+stdout_logfile_backups=5
+stderr_logfile_maxbytes=0
+stderr_logfile_backups=5
+
+[program:php-fpm-log]
+command=tail -f /var/log/fpm.log /var/log/fpm_error.log
+stdout_events_enabled=true
+stderr_events_enabled=true
+
+[program:nginx]
+command=/usr/sbin/nginx -g "daemon off;" -c /etc/nginx/nginx.conf
+autostart=true
+autorestart=true
+priority=10
+stdout_logfile=/var/log/nginx.log
+stderr_logfile=/var/log/nginx_error.log
+stdout_logfile_maxbytes=20MB
+stdout_logfile_backups=5
+stderr_logfile_maxbytes=20MB
+stderr_logfile_backups=5
+
+[program:cron]
+command=cron -f -L 15
+autostart=true
+autorestart=true
+priority=30
+stdout_logfile=/var/log/cron.log
+stderr_logfile=/var/log/cron_error.log
+stdout_logfile_maxbytes=20MB
+stdout_logfile_backups=5
+stderr_logfile_maxbytes=20MB
+stderr_logfile_backups=5
\ No newline at end of file
diff --git a/docker/zz-docker.conf b/docker/zz-docker.conf
new file mode 100644
index 0000000..c8e8e2b
--- /dev/null
+++ b/docker/zz-docker.conf
@@ -0,0 +1,10 @@
+[global]
+daemonize=no
+error_log = /var/log/php_fpm_error.log
+log_limit = 1048576
+log_level = notice
+
+[www]
+listen = 9000
+catch_workers_output = yes
+decorate_workers_output = no
\ No newline at end of file
diff --git a/examples/index.php b/examples/index.php
deleted file mode 100644
index 52926d0..0000000
--- a/examples/index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-    require 'ncc';
-    import('net.nosial.socialbox');
-
-    \Socialbox\Socialbox::handleRpc();
\ No newline at end of file
diff --git a/project.json b/project.json
index ac332be..06b6fd0 100644
--- a/project.json
+++ b/project.json
@@ -36,14 +36,19 @@
                 "source": "nosial/libs.config=latest@n64"
             },
             {
-                "name": "net.nosial.loglib",
+                "name": "net.nosial.loglib2",
                 "version": "latest",
-                "source": "nosial/libs.log=latest@n64"
+                "source": "nosial/loglib2=latest@github"
             },
             {
                 "name": "net.nosial.optslib",
                 "version": "latest",
                 "source": "nosial/libs.opts=latest@n64"
+            },
+            {
+                "name": "com.gregwar.captcha",
+                "version": "latest",
+                "source": "gregwar/captcha=latest@packagist"
             }
         ],
         "configurations": [
@@ -88,7 +93,7 @@
             "execute": {
                 "working_directory": "%CWD%",
                 "silent": false,
-                "tty": true,
+                "tty": false,
                 "timeout": null,
                 "idle_timeout": null,
                 "target": "main"
diff --git a/public/index.php b/public/index.php
new file mode 100644
index 0000000..fc2b206
--- /dev/null
+++ b/public/index.php
@@ -0,0 +1,21 @@
+<?php
+
+    require 'ncc';
+    import('net.nosial.socialbox');
+
+    try
+    {
+        \Socialbox\Socialbox::handleRequest();
+    }
+    catch(Exception $e)
+    {
+        http_response_code(500);
+
+        if(\Socialbox\Classes\Configuration::getSecurityConfiguration()->isDisplayInternalExceptions())
+        {
+            print_r($e);
+            return;
+        }
+
+        print('An internal error occurred');
+    }
diff --git a/src/Socialbox/Abstracts/CacheLayer.php b/src/Socialbox/Abstracts/CacheLayer.php
index e825def..3e1f7af 100644
--- a/src/Socialbox/Abstracts/CacheLayer.php
+++ b/src/Socialbox/Abstracts/CacheLayer.php
@@ -1,90 +1,90 @@
 <?php
 
-namespace Socialbox\Abstracts;
+    namespace Socialbox\Abstracts;
 
-use RuntimeException;
-use Socialbox\Classes\CacheLayer\MemcachedCacheLayer;
-use Socialbox\Classes\CacheLayer\RedisCacheLayer;
-use Socialbox\Classes\Configuration;
+    use RuntimeException;
+    use Socialbox\Classes\CacheLayer\MemcachedCacheLayer;
+    use Socialbox\Classes\CacheLayer\RedisCacheLayer;
+    use Socialbox\Classes\Configuration;
 
-abstract class CacheLayer
-{
-    private static ?CacheLayer $instance = null;
-
-    /**
-     * Stores a value in the cache with an associated key and an optional time-to-live (TTL).
-     *
-     * @param string $key The key under which the value is stored.
-     * @param mixed $value The value to be stored.
-     * @param int $ttl Optional. The time-to-live for the cache entry in seconds. A value of 0 indicates no expiration.
-     * @return bool Returns true if the value was successfully set, false otherwise.
-     */
-    public abstract function set(string $key, mixed $value, int $ttl=0): bool;
-
-    /**
-     * Retrieves a value from the cache with the specified key.
-     *
-     * @param string $key The key of the value to retrieve.
-     * @return mixed The value associated with the key, or null if the key does not exist.
-     */
-    public abstract function get(string $key): mixed;
-
-    /**
-     * Deletes a value from the cache with the specified key.
-     *
-     * @param string $key The key of the value to delete.
-     * @return bool Returns true if the value was successfully deleted, false otherwise.
-     */
-    public abstract function delete(string $key): bool;
-
-    /**
-     * Checks if a value exists in the cache with the specified key.
-     *
-     * @param string $key The key to check.
-     * @return bool Returns true if the key exists, false otherwise.
-     */
-    public abstract function exists(string $key): bool;
-
-    /**
-     * Counts the number of items that start with the given prefix.
-     *
-     * @param string $prefix The prefix to search for.
-     * @return int The count of items starting with the provided prefix.
-     */
-    public abstract function getPrefixCount(string $prefix): int;
-
-    /**
-     * Clears all values from the cache.
-     *
-     * @return bool Returns true if the cache was successfully cleared, false otherwise.
-     */
-    public abstract function clear(): bool;
-
-    /**
-     * Retrieves the singleton instance of the cache layer.
-     *
-     * @return CacheLayer The singleton instance of the cache layer.
-     */
-    public static function getInstance(): CacheLayer
+    abstract class CacheLayer
     {
-        if (self::$instance === null)
+        private static ?CacheLayer $instance = null;
+
+        /**
+         * Stores a value in the cache with an associated key and an optional time-to-live (TTL).
+         *
+         * @param string $key The key under which the value is stored.
+         * @param mixed $value The value to be stored.
+         * @param int $ttl Optional. The time-to-live for the cache entry in seconds. A value of 0 indicates no expiration.
+         * @return bool Returns true if the value was successfully set, false otherwise.
+         */
+        public abstract function set(string $key, mixed $value, int $ttl=0): bool;
+
+        /**
+         * Retrieves a value from the cache with the specified key.
+         *
+         * @param string $key The key of the value to retrieve.
+         * @return mixed The value associated with the key, or null if the key does not exist.
+         */
+        public abstract function get(string $key): mixed;
+
+        /**
+         * Deletes a value from the cache with the specified key.
+         *
+         * @param string $key The key of the value to delete.
+         * @return bool Returns true if the value was successfully deleted, false otherwise.
+         */
+        public abstract function delete(string $key): bool;
+
+        /**
+         * Checks if a value exists in the cache with the specified key.
+         *
+         * @param string $key The key to check.
+         * @return bool Returns true if the key exists, false otherwise.
+         */
+        public abstract function exists(string $key): bool;
+
+        /**
+         * Counts the number of items that start with the given prefix.
+         *
+         * @param string $prefix The prefix to search for.
+         * @return int The count of items starting with the provided prefix.
+         */
+        public abstract function getPrefixCount(string $prefix): int;
+
+        /**
+         * Clears all values from the cache.
+         *
+         * @return bool Returns true if the cache was successfully cleared, false otherwise.
+         */
+        public abstract function clear(): bool;
+
+        /**
+         * Retrieves the singleton instance of the cache layer.
+         *
+         * @return CacheLayer The singleton instance of the cache layer.
+         */
+        public static function getInstance(): CacheLayer
         {
-            $engine = Configuration::getConfiguration()['cache']['engine'];
+            if (self::$instance === null)
+            {
+                $engine = Configuration::getCacheConfiguration()->getEngine();
 
-            if ($engine === 'redis')
-            {
-                self::$instance = new RedisCacheLayer();
-            }
-            else if ($engine === 'memcached')
-            {
-                self::$instance = new MemcachedCacheLayer();
-            }
-            else
-            {
-                throw new RuntimeException('Invalid cache engine specified in the configuration, must be either "redis" or "memcached".');
+                if ($engine === 'redis')
+                {
+                    self::$instance = new RedisCacheLayer();
+                }
+                else if ($engine === 'memcached')
+                {
+                    self::$instance = new MemcachedCacheLayer();
+                }
+                else
+                {
+                    throw new RuntimeException('Invalid cache engine specified in the configuration, must be either "redis" or "memcached".');
+                }
             }
+
+            return self::$instance;
         }
-
-        return self::$instance;
-    }
-}
\ No newline at end of file
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Abstracts/Method.php b/src/Socialbox/Abstracts/Method.php
index 3dbb855..748f076 100644
--- a/src/Socialbox/Abstracts/Method.php
+++ b/src/Socialbox/Abstracts/Method.php
@@ -1,48 +1,21 @@
 <?php
 
-namespace Socialbox\Abstracts;
+    namespace Socialbox\Abstracts;
 
-use Socialbox\Enums\StandardError;
-use Socialbox\Exceptions\DatabaseOperationException;
-use Socialbox\Exceptions\StandardException;
-use Socialbox\Interfaces\SerializableInterface;
-use Socialbox\Managers\SessionManager;
-use Socialbox\Objects\ClientRequest;
-use Socialbox\Objects\RpcRequest;
-use Socialbox\Objects\SessionRecord;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
 
-abstract class Method
-{
-    /**
-     * Executes the method and returns RpcResponse/RpcError which implements SerializableInterface
-     *
-     * @param ClientRequest $request The full client request object, used to identify the client & it's requests
-     * @param RpcRequest $rpcRequest The selected RPC request for the method to handle
-     * @return SerializableInterface|null Returns RpcResponse/RpcError on success, null if the request is a notification
-     * @throws StandardException If a standard exception is thrown, it will be handled by the engine.
-     */
-    public static abstract function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface;
-
-    /**
-     * @param ClientRequest $request The client request object
-     * @return SessionRecord|null Returns null if the client has not provided a Session UUID
-     * @throws StandardException Thrown if standard exceptions are to be thrown regarding this
-     */
-    protected static function getSession(ClientRequest $request): ?SessionRecord
+    abstract class Method
     {
-        if($request->getSessionUuid() === null)
-        {
-            return null;
-        }
-
-        try
-        {
-            // NOTE: If the session UUID was provided, it has already been validated up until this point
-            return SessionManager::getSession($request->getSessionUuid());
-        }
-        catch(DatabaseOperationException $e)
-        {
-            throw new StandardException("There was an error while retrieving the session from the server", StandardError::INTERNAL_SERVER_ERROR);
-        }
-    }
-}
\ No newline at end of file
+        /**
+         * Executes the method and returns RpcResponse/RpcError which implements SerializableInterface
+         *
+         * @param ClientRequest $request The full client request object, used to identify the client & it's requests
+         * @param RpcRequest $rpcRequest The selected RPC request for the method to handle
+         * @return SerializableInterface|null Returns RpcResponse/RpcError on success, null if the request is a notification
+         * @throws StandardRpcException If a standard exception is thrown, it will be handled by the engine.
+         */
+        public static abstract function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface;
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Base32.php b/src/Socialbox/Classes/Base32.php
deleted file mode 100644
index 38b59a9..0000000
--- a/src/Socialbox/Classes/Base32.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-namespace Socialbox\Classes;
-
-use InvalidArgumentException;
-
-class Base32
-{
-    /**
-     * Array with all 32 characters for decoding from/encoding to base32.
-     */
-    private const LOOKUP_TABLE = [
-        'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', //  7
-        'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', // 15
-        'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', // 23
-        'Y', 'Z', '2', '3', '4', '5', '6', '7', // 31
-        '='  // padding char
-    ];
-
-    /**
-     * Allowed padding lengths for base32 data.
-     */
-    private const ALLOWED_PADDING = [6, 4, 3, 1, 0];
-
-    /**
-     * Decodes base32 data.
-     *
-     * @param string $data
-     * @return string
-     * @throws InvalidArgumentException
-     */
-    public static function decode(string $data): string
-    {
-        if (empty($data))
-        {
-            throw new InvalidArgumentException('No data provided to decode');
-        }
-
-        $chars = self::LOOKUP_TABLE;
-        $chars_flipped = array_flip($chars);
-        $char_count = substr_count($data, $chars[32]);
-
-        if (!in_array($char_count, self::ALLOWED_PADDING, true))
-        {
-            throw new InvalidArgumentException(sprintf('Invalid padding in the base32 data: %s', $data));
-        }
-
-        for ($i = 0; $i < 4; ++$i)
-        {
-            if ($char_count === self::ALLOWED_PADDING[$i] &&
-                substr($data, -self::ALLOWED_PADDING[$i]) !== str_repeat($chars[32], self::ALLOWED_PADDING[$i]))
-            {
-                throw new InvalidArgumentException(sprintf('Invalid padding in the base32 data: %s', $data));
-            }
-        }
-
-        // Remove padding characters
-        $data = str_replace('=', (string)null, $data);
-        $data = str_split($data);
-        $binary_string = (string)null;
-
-        for ($i = 0, $data_count = count($data); $i < $data_count; $i += 8)
-        {
-            $x = (string)null;
-            for ($j = 0; $j < 8; ++$j)
-            {
-                $char = $data[$i + $j] ?? null;
-                if ($char === null || !isset($chars_flipped[$char]))
-                {
-                    throw new InvalidArgumentException(sprintf('Invalid character in the base32 data: %s', $char));
-                }
-
-                $x .= str_pad(base_convert((string)$chars_flipped[$char], 10, 2), 5, '0', STR_PAD_LEFT);
-            }
-
-            $eight_bits = str_split($x, 8);
-
-            foreach ($eight_bits as $bits)
-            {
-                $binary_string .= ($y = chr((int)base_convert($bits, 2, 10))) !== false ? $y : (string)null;
-            }
-        }
-
-        return $binary_string;
-    }
-
-    public static function encode(string $data): string
-    {
-        $binaryLength = strlen($data);
-        $base32String = '';
-
-        $buffer = 0;
-        $bitsLeft = 0;
-
-        for ($i = 0; $i < $binaryLength; $i++)
-        {
-            $buffer = ($buffer << 8) | (ord($data[$i]) & 0xFF);
-            $bitsLeft += 8;
-
-            while ($bitsLeft >= 5)
-            {
-                $base32String .= self::LOOKUP_TABLE[($buffer >> ($bitsLeft - 5)) & 0x1F];
-                $bitsLeft -= 5;
-            }
-        }
-
-        if ($bitsLeft > 0)
-        {
-            $base32String .= self::LOOKUP_TABLE[($buffer << (5 - $bitsLeft)) & 0x1F];
-        }
-
-        return $base32String;
-    }
-}
diff --git a/src/Socialbox/Classes/CacheLayer/MemcachedCacheLayer.php b/src/Socialbox/Classes/CacheLayer/MemcachedCacheLayer.php
index 8095ae1..d1edcad 100644
--- a/src/Socialbox/Classes/CacheLayer/MemcachedCacheLayer.php
+++ b/src/Socialbox/Classes/CacheLayer/MemcachedCacheLayer.php
@@ -22,10 +22,10 @@ class MemcachedCacheLayer extends CacheLayer
         }
 
         $this->memcached = new Memcached();
-        $this->memcached->addServer(Configuration::getConfiguration()['cache']['host'], (int)Configuration::getConfiguration()['cache']['port']);
-        if(Configuration::getConfiguration()['cache']['username'] !== null || Configuration::getConfiguration()['cache']['password'] !== null)
+        $this->memcached->addServer(Configuration::getCacheConfiguration()->getHost(), Configuration::getCacheConfiguration()->getPort());
+        if(Configuration::getCacheConfiguration()->getUsername() !== null || Configuration::getCacheConfiguration()->getPassword() !== null)
         {
-            $this->memcached->setSaslAuthData(Configuration::getConfiguration()['cache']['username'], Configuration::getConfiguration()['cache']['password']);
+            $this->memcached->setSaslAuthData(Configuration::getCacheConfiguration()->getUsername(), Configuration::getCacheConfiguration()->getPassword());
         }
     }
 
diff --git a/src/Socialbox/Classes/CacheLayer/RedisCacheLayer.php b/src/Socialbox/Classes/CacheLayer/RedisCacheLayer.php
index 1715e51..f836d92 100644
--- a/src/Socialbox/Classes/CacheLayer/RedisCacheLayer.php
+++ b/src/Socialbox/Classes/CacheLayer/RedisCacheLayer.php
@@ -26,15 +26,15 @@ class RedisCacheLayer extends CacheLayer
 
         try
         {
-            $this->redis->connect(Configuration::getConfiguration()['cache']['host'], (int)Configuration::getConfiguration()['cache']['port']);
-            if (Configuration::getConfiguration()['cache']['password'] !== null)
+            $this->redis->connect(Configuration::getCacheConfiguration()->getHost(), Configuration::getCacheConfiguration()->getPort());
+            if (Configuration::getCacheConfiguration()->getPassword() !== null)
             {
-                $this->redis->auth(Configuration::getConfiguration()['cache']['password']);
+                $this->redis->auth(Configuration::getCacheConfiguration()->getPassword());
             }
 
-            if (Configuration::getConfiguration()['cache']['database'] !== 0)
+            if (Configuration::getCacheConfiguration()->getDatabase() !== null)
             {
-                $this->redis->select((int)Configuration::getConfiguration()['cache']['database']);
+                $this->redis->select(Configuration::getCacheConfiguration()->getDatabase());
             }
         }
         catch (RedisException $e)
diff --git a/src/Socialbox/Classes/CliCommands/DnsRecordCommand.php b/src/Socialbox/Classes/CliCommands/DnsRecordCommand.php
new file mode 100644
index 0000000..4f56180
--- /dev/null
+++ b/src/Socialbox/Classes/CliCommands/DnsRecordCommand.php
@@ -0,0 +1,41 @@
+<?php
+
+    namespace Socialbox\Classes\CliCommands;
+
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Classes\Logger;
+    use Socialbox\Interfaces\CliCommandInterface;
+    use Socialbox\Socialbox;
+
+    class DnsRecordCommand implements CliCommandInterface
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(array $args): int
+        {
+            Logger::getLogger()->info('Please set the following DNS TXT record for the domain:');
+            Logger::getLogger()->info(sprintf('  %s', Socialbox::getDnsRecord()));
+            return 0;
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function getHelpMessage(): string
+        {
+            return <<<HELP
+Usage: socialbox dns-record
+
+Displays the DNS TXT record that should be set for the domain.
+HELP;
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function getShortHelpMessage(): string
+        {
+            return 'Displays the DNS TXT record that should be set for the domain.';
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/CliCommands/InitializeCommand.php b/src/Socialbox/Classes/CliCommands/InitializeCommand.php
index 9cf5b64..89de809 100644
--- a/src/Socialbox/Classes/CliCommands/InitializeCommand.php
+++ b/src/Socialbox/Classes/CliCommands/InitializeCommand.php
@@ -1,111 +1,472 @@
 <?php
 
-namespace Socialbox\Classes\CliCommands;
+    namespace Socialbox\Classes\CliCommands;
 
-use Exception;
-use LogLib\Log;
-use PDOException;
-use Socialbox\Abstracts\CacheLayer;
-use Socialbox\Classes\Configuration;
-use Socialbox\Classes\Cryptography;
-use Socialbox\Classes\Database;
-use Socialbox\Classes\Resources;
-use Socialbox\Enums\DatabaseObjects;
-use Socialbox\Exceptions\DatabaseOperationException;
-use Socialbox\Interfaces\CliCommandInterface;
-use Socialbox\Managers\VariableManager;
+    use Exception;
+    use ncc\CLI\Main;
+    use ncc\ThirdParty\Symfony\Process\Exception\InvalidArgumentException;
+    use PDOException;
+    use Socialbox\Abstracts\CacheLayer;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Classes\Cryptography;
+    use Socialbox\Classes\Database;
+    use Socialbox\Classes\Logger;
+    use Socialbox\Classes\Resources;
+    use Socialbox\Enums\DatabaseObjects;
+    use Socialbox\Exceptions\CryptographyException;
+    use Socialbox\Interfaces\CliCommandInterface;
+    use Socialbox\Program;
+    use Socialbox\Socialbox;
 
-class InitializeCommand implements CliCommandInterface
-{
-    /**
-     * @inheritDoc
-     */
-    public static function execute(array $args): int
+    class InitializeCommand implements CliCommandInterface
     {
-        if(Configuration::getConfiguration()['instance']['enabled'] === false && !isset($args['force']))
+        /**
+         * @inheritDoc
+         */
+        public static function execute(array $args): int
         {
-            Log::info('net.nosial.socialbox', 'Socialbox is disabled. Use --force to initialize the instance or set `instance.enabled` to True in the configuration');
-            return 1;
-        }
-
-        Log::info('net.nosial.socialbox', 'Initializing Socialbox...');
-
-        if(Configuration::getConfiguration()['cache']['enabled'])
-        {
-            Log::verbose('net.nosial.socialbox', 'Clearing cache layer...');
-            CacheLayer::getInstance()->clear();
-        }
-
-        foreach(DatabaseObjects::casesOrdered() as $object)
-        {
-            Log::verbose('net.nosial.socialbox', "Initializing database object {$object->value}");
-
-            try
+            if(Configuration::getInstanceConfiguration()->isEnabled() === false && !isset($args['force']) && getenv('SB_MODE') !== 'automated')
             {
-                Database::getConnection()->exec(file_get_contents(Resources::getDatabaseResource($object)));
-            }
-            catch (PDOException $e)
-            {
-                // Check if the error code is for "table already exists"
-                if ($e->getCode() === '42S01')
+                $required_configurations = [
+                    'database.host', 'database.port', 'database.username', 'database.password', 'database.name',
+                    'instance.enabled', 'instance.domain', 'registration.*'
+                ];
+
+                Program::getLogger()->error('Socialbox is disabled. Use --force to initialize the instance or set `instance.enabled` to True in the configuration');
+                Program::getLogger()->info('The reason you are required to do this is to allow you to configure the instance before enabling it');
+                Program::getLogger()->info('The following configurations are required to be set before enabling the instance:');
+                foreach($required_configurations as $config)
                 {
-                    Log::warning('net.nosial.socialbox', "Database object {$object->value} already exists, skipping...");
-                    continue;
+                    Program::getLogger()->info(sprintf('  - %s', $config));
+                }
+
+                Program::getLogger()->info('instance.private_key & instance.public_key are automatically generated if not set');
+                Program::getLogger()->info('instance.domain is required to be set to the domain name of the instance');
+                Program::getLogger()->info('instance.rpc_endpoint is required to be set to the publicly accessible http rpc endpoint of this server');
+                Program::getLogger()->info('registration.* are required to be set to allow users to register to the instance');
+                Program::getLogger()->info('You will be given a DNS TXT record to set for the public key after the initialization process');
+                Program::getLogger()->info('The configuration file can be edited using ConfigLib:');
+                Program::getLogger()->info('  configlib --conf socialbox -e nano');
+                Program::getLogger()->info('Or manually at:');
+                Program::getLogger()->info(sprintf('  %s', Configuration::getConfigurationLib()->getPath()));
+
+                if(getenv('SB_MODE') === 'automated')
+                {
+                    // Wait & Reload the configuration
+                    while(!Configuration::getInstanceConfiguration()->isEnabled())
+                    {
+                        Program::getLogger()->info('Waiting for configuration, retrying in 5 seconds...');
+                        sleep(5);
+                        Configuration::reload();
+                    }
                 }
                 else
                 {
-                    Log::error('net.nosial.socialbox', "Failed to initialize database object {$object->value}: {$e->getMessage()}", $e);
+                    return 1;
+                }
+
+                return 1;
+            }
+
+            // Overwrite the configuration if the automated setup procedure is detected
+            // This is useful for CI/CD pipelines & Docker
+            if(getenv('SB_MODE') === 'automated')
+            {
+                Program::getLogger()->info('Automated Setup Procedure is detected');
+                self::applyEnvironmentVariables();
+            }
+
+            if(Configuration::getInstanceConfiguration()->getDomain() === null)
+            {
+                Program::getLogger()->error('instance.domain is required but was not set');
+                return 1;
+            }
+
+            if(Configuration::getInstanceConfiguration()->getRpcEndpoint() === null)
+            {
+                Program::getLogger()->error('instance.rpc_endpoint is required but was not set');
+                return 1;
+            }
+
+            Program::getLogger()->info('Initializing Socialbox...');
+            if(Configuration::getCacheConfiguration()->isEnabled())
+            {
+                Program::getLogger()->verbose('Clearing cache layer...');
+                CacheLayer::getInstance()->clear();
+            }
+
+            foreach(DatabaseObjects::casesOrdered() as $object)
+            {
+                Program::getLogger()->verbose("Initializing database object {$object->value}");
+
+                try
+                {
+                    Database::getConnection()->exec(file_get_contents(Resources::getDatabaseResource($object)));
+                }
+                catch (PDOException $e)
+                {
+                    // Check if the error code is for "table already exists"
+                    if ($e->getCode() === '42S01')
+                    {
+                        Program::getLogger()->warning("Database object {$object->value} already exists, skipping...");
+                        continue;
+                    }
+                    else
+                    {
+                        Program::getLogger()->error("Failed to initialize database object {$object->value}: {$e->getMessage()}", $e);
+                        return 1;
+                    }
+                }
+                catch(Exception $e)
+                {
+                    Program::getLogger()->error("Failed to initialize database object {$object->value}: {$e->getMessage()}", $e);
                     return 1;
                 }
             }
-            catch(Exception $e)
+
+            if(
+                !Configuration::getCryptographyConfiguration()->getHostPublicKey() ||
+                !Configuration::getCryptographyConfiguration()->getHostPrivateKey() ||
+                !Configuration::getCryptographyConfiguration()->getHostPublicKey()
+            )
             {
-                Log::error('net.nosial.socialbox', "Failed to initialize database object {$object->value}: {$e->getMessage()}", $e);
-                return 1;
+                $expires = time() + 31536000;
+
+                try
+                {
+                    Program::getLogger()->info('Generating new key pair (expires ' . date('Y-m-d H:i:s', $expires) . ')...');
+                    $signingKeyPair = Cryptography::generateSigningKeyPair();
+                }
+                catch (CryptographyException $e)
+                {
+                    Program::getLogger()->error('Failed to generate cryptography values', $e);
+                    return 1;
+                }
+
+                Configuration::getConfigurationLib()->set('cryptography.host_keypair_expires', $expires);
+                Configuration::getConfigurationLib()->set('cryptography.host_private_key', $signingKeyPair->getPrivateKey());
+                Configuration::getConfigurationLib()->set('cryptography.host_public_key', $signingKeyPair->getPublicKey());
             }
-        }
 
-        try
-        {
-
-            if(!VariableManager::variableExists('PUBLIC_KEY') || !VariableManager::variableExists('PRIVATE_KEY'))
+            // If Internal Encryption keys are null or has less keys than configured, populate the configuration
+            // property with encryption keys.
+            if(
+                Configuration::getCryptographyConfiguration()->getInternalEncryptionKeys() === null ||
+                count(Configuration::getCryptographyConfiguration()->getInternalEncryptionKeys()) < Configuration::getCryptographyConfiguration()->getEncryptionKeysCount())
             {
-                Log::info('net.nosial.socialbox', 'Generating new key pair...');
+                Program::getLogger()->info('Generating internal encryption keys...');
+                $encryptionKeys = Configuration::getCryptographyConfiguration()->getInternalEncryptionKeys() ?? [];
+                while(count($encryptionKeys) < Configuration::getCryptographyConfiguration()->getEncryptionKeysCount())
+                {
+                    $encryptionKeys[] = Cryptography::generateEncryptionKey(Configuration::getCryptographyConfiguration()->getEncryptionKeysAlgorithm());
+                }
 
-                $keyPair = Cryptography::generateKeyPair();
-                VariableManager::setVariable('PUBLIC_KEY', $keyPair->getPublicKey());
-                VariableManager::setVariable('PRIVATE_KEY', $keyPair->getPrivateKey());
-
-                Log::info('net.nosial.socialbox', 'Set the DNS TXT record for the public key to the following value:');
-                Log::info('net.nosial.socialbox', "socialbox-key={$keyPair->getPublicKey()}");
+                Configuration::getConfigurationLib()->set('cryptography.internal_encryption_keys', $encryptionKeys);
             }
+
+            Program::getLogger()->info('Updating configuration...');
+            Configuration::getConfigurationLib()->save();
+            Configuration::reload();
+
+            Program::getLogger()->info('Socialbox has been initialized successfully');
+            Program::getLogger()->info(sprintf('Set the DNS TXT record for the domain %s to the following value:', Configuration::getInstanceConfiguration()->getDomain()));
+            Program::getLogger()->info(Socialbox::getDnsRecord());
+
+            return 0;
         }
-        catch(DatabaseOperationException $e)
+
+        /**
+         * Applies environment variables to the application's configuration system.
+         * This method maps predefined environment variables to their corresponding
+         * configuration keys, validates their values, and updates the configuration
+         * library accordingly. If expected environment variables are missing and
+         * critical for certain components, warning logs are generated.
+         * Additionally, the configuration changes are saved and reloaded after being applied.
+         *
+         * @return void
+         */
+        private static function applyEnvironmentVariables(): void
         {
-            Log::error('net.nosial.socialbox', "Failed to generate key pair: {$e->getMessage()}", $e);
-            return 1;
+            // Always set the 'instance.enabled' to true if the automated setup procedure is detected
+            Configuration::getConfigurationLib()->set('instance.enabled', true);
+            $configurationMap = [
+                // Instance Configuration
+                'SB_INSTANCE_NAME' => 'instance.name',
+                'SB_INSTANCE_DOMAIN' => 'instance.domain',
+                'SB_INSTANCE_RPC_ENDPOINT' => 'instance.rpc_endpoint',
+                'SB_STORAGE_PATH' => 'storage.path',
+
+                // Logging Configuration
+                'SB_LOGGING_CONSOLE_ENABLED' => 'logging.console_logging_enabled',
+                'SB_LOGGING_CONSOLE_LEVEL' => 'logging.console_logging_level',
+                'SB_LOGGING_FILE_ENABLED' => 'logging.file_logging_enabled',
+                'SB_LOGGING_FILE_LEVEL' => 'logging.file_logging_level',
+
+                // Security & Cryptography Configuration
+                'SB_SECURITY_DISPLAY_INTERNAL_EXCEPTIONS' => 'security.display_internal_exceptions',
+                'SB_CRYPTO_KEYPAIR_EXPIRES' => 'cryptography.host_keypair_expires',
+                'SB_CRYPTO_ENCRYPTION_KEYS_COUNT' => 'cryptography.encryption_keys_count',
+                'SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM' => 'cryptography.encryption_keys_algorithm',
+                'SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM' => 'cryptography.transport_encryption_algorithm',
+
+                // Database Configuration
+                'SB_DATABASE_HOST' => 'database.host',
+                'SB_DATABASE_PORT' => 'database.port',
+                'SB_DATABASE_USERNAME' => 'database.username',
+                'SB_DATABASE_PASSWORD' => 'database.password',
+                'SB_DATABASE_NAME' => 'database.name',
+
+                'SB_CACHE_ENABLED' => 'cache.enabled',
+                'SB_CACHE_ENGINE' => 'cache.engine',
+                'SB_CACHE_HOST' => 'cache.host',
+                'SB_CACHE_PORT' => 'cache.port',
+                'SB_CACHE_USERNAME' => 'cache.username',
+                'SB_CACHE_PASSWORD' => 'cache.password',
+                'SB_CACHE_DATABASE' => 'cache.database',
+            ];
+
+            foreach($configurationMap as $env => $config)
+            {
+                $variable = getenv($env);
+                Program::getLogger()->info(sprintf('Checking environment variable %s...', $env));
+
+                switch($env)
+                {
+                    case 'SB_STORAGE_PATH':
+                    case 'SB_LOGGING_FILE_LEVEL':
+                    case 'SB_LOGGING_CONSOLE_LEVEL':
+                    case 'SB_INSTANCE_NAME':
+                    case 'SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM':
+                    case 'SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM':
+                    case 'SB_CACHE_ENGINE':
+                    case 'SB_CACHE_HOST':
+                    case 'SB_CACHE_USERNAME':
+                    case 'SB_CACHE_PASSWORD':
+                    case 'SB_CACHE_DATABASE':
+                        if($variable !== false)
+                        {
+                            Configuration::getConfigurationLib()->set($config, $variable);
+                            Program::getLogger()->info(sprintf('Set %s to %s', $config, $variable));
+                        }
+                        break;
+
+                    case 'SB_INSTANCE_DOMAIN':
+                        if($variable === false && Configuration::getInstanceConfiguration()->getDomain() === null)
+                        {
+                            Program::getLogger()->warning(sprintf('%s is not set, expected %s environment variable', $config, $env));
+                        }
+                        else
+                        {
+                            Configuration::getConfigurationLib()->set($config, $variable);
+                            Program::getLogger()->info(sprintf('Set %s to %s', $config, $variable));
+                        }
+                        break;
+
+                    case 'SB_DATABASE_HOST':
+                        if($variable === false && Configuration::getDatabaseConfiguration()->getHost() === null)
+                        {
+                            Program::getLogger()->warning(sprintf('%s is not set, expected %s environment variable', $config, $env));
+                        }
+                        else
+                        {
+                            Configuration::getConfigurationLib()->set($config, $variable);
+                            Program::getLogger()->info(sprintf('Set %s to %s', $config, $variable));
+                        }
+                        break;
+
+                    case 'SB_DATABASE_PORT':
+                        if($variable === false && Configuration::getDatabaseConfiguration()->getPort() === null)
+                        {
+                            Program::getLogger()->warning(sprintf('%s is not set, expected %s environment variable', $config, $env));
+                        }
+                        else
+                        {
+                            Configuration::getConfigurationLib()->set($config, (int) $variable);
+                            Program::getLogger()->info(sprintf('Set %s to %s', $config, $variable));
+                        }
+                        break;
+
+                    case 'SB_DATABASE_USERNAME':
+                        if($variable === false && Configuration::getDatabaseConfiguration()->getUsername() === null)
+                        {
+                            Program::getLogger()->warning(sprintf('%s is not set, expected %s environment variable', $config, $env));
+                        }
+                        else
+                        {
+                            Configuration::getConfigurationLib()->set($config, $variable);
+                            Program::getLogger()->info(sprintf('Set %s to %s', $config, $variable));
+                        }
+                        break;
+
+                    case 'SB_DATABASE_PASSWORD':
+                        if($variable === false && Configuration::getDatabaseConfiguration()->getPassword() === null)
+                        {
+                            Program::getLogger()->warning(sprintf('%s is not set, expected %s environment variable', $config, $env));
+                        }
+                        else
+                        {
+                            Configuration::getConfigurationLib()->set($config, $variable);
+                            Program::getLogger()->info(sprintf('Set %s to %s', $config, $variable));
+                        }
+                        break;
+
+                    case 'SB_DATABASE_NAME':
+                        if($variable === false && Configuration::getDatabaseConfiguration()->getName() === null)
+                        {
+                            Program::getLogger()->warning(sprintf('%s is not set, expected %s environment variable', $config, $env));
+                        }
+                        else
+                        {
+                            Configuration::getConfigurationLib()->set($config, $variable);
+                            Program::getLogger()->info(sprintf('Set %s to %s', $config, $variable));
+                        }
+                        break;
+
+                    case 'SB_INSTANCE_RPC_ENDPOINT':
+                        if($variable === false && Configuration::getInstanceConfiguration()->getRpcEndpoint() === null)
+                        {
+                            Program::getLogger()->warning(sprintf('%s is not set, expected %s environment variable', $config, $env));
+                        }
+                        else
+                        {
+                            Configuration::getConfigurationLib()->set($config, $variable);
+                            Program::getLogger()->info(sprintf('Set %s to %s', $config, $variable));
+                        }
+                        break;
+
+                    case 'SB_LOGGING_CONSOLE_ENABLED':
+                    case 'SB_SECURITY_DISPLAY_INTERNAL_EXCEPTIONS':
+                    case 'SB_LOGGING_FILE_ENABLED':
+                    case 'SB_CACHE_ENABLED':
+                        if($variable !== false)
+                        {
+                            Configuration::getConfigurationLib()->set($config, filter_var($variable, FILTER_VALIDATE_BOOLEAN));
+                            Program::getLogger()->info(sprintf('Set %s to %s', $config, $variable));
+                        }
+                        break;
+
+                    case 'SB_CRYPTO_KEYPAIR_EXPIRES':
+                    case 'SB_CRYPTO_ENCRYPTION_KEYS_COUNT':
+                    case 'SB_CACHE_PORT':
+                        if($variable !== false)
+                        {
+                            Configuration::getConfigurationLib()->set($config, (int) $variable);
+                            Program::getLogger()->info(sprintf('Set %s to %s', $config, $variable));
+                        }
+                        break;
+
+                    default:
+                        Program::getLogger()->warning("Environment variable $env is not supported");
+                        break;
+                }
+            }
+
+            // Handle Mock Servers environment variables (SB_INSTANCE_DNS_MOCK_*)
+            $mockServers = [];
+            foreach(self::getMockServerValues() as $mockServer)
+            {
+                $mockServer = explode(' ', $mockServer);
+                if(count($mockServer) !== 2)
+                {
+                    Program::getLogger()->warning(sprintf('Invalid DNS Mock Server format: %s', implode(' ', $mockServer)));
+                    continue;
+                }
+
+                $domain = $mockServer[0] ?? null;
+                $txt = $mockServer[1] ?? null;
+                if($domain === null || $txt === null)
+                {
+                    Program::getLogger()->warning(sprintf('Invalid DNS Mock Server format, domain or txt missing: %s', implode(' ', $mockServer)));
+                    continue;
+                }
+
+                try
+                {
+                    $mockServers[$domain] = $txt;
+                    Program::getLogger()->info(sprintf('Added Mock Server %s: %s', $domain, $txt));
+                }
+                catch(InvalidArgumentException $e)
+                {
+                    Program::getLogger()->error(sprintf('Invalid TXT record format for %s', $domain), $e);
+                    continue;
+                }
+            }
+
+            if(count($mockServers) > 0)
+            {
+                Program::getLogger()->info('Setting Mock Servers...');
+                Configuration::getConfigurationLib()->set('instance.dns_mocks', $mockServers);
+            }
+
+            // Apply changes & reload the configuration
+            Program::getLogger()->info('Updating configuration...');
+            Configuration::getConfigurationLib()->save(); // Save
+            Configuration::reload(); // Reload
         }
 
-        Log::info('net.nosial.socialbox', 'Socialbox has been initialized successfully');
-        return 0;
-    }
+        /**
+         * Retrieves all environment variable values that start with the prefix 'SB_INSTANCE_DNS_MOCK_'.
+         *
+         * @return array An array of environment variable values filtered by the specified prefix.
+         */
+        private static function getMockServerValues(): array
+        {
+            // Fetch all environment variables
+            $envVars = getenv();
 
-    /**
-     * @inheritDoc
-     */
-    public static function getHelpMessage(): string
-    {
-        return "Initialize Command - Initializes Socialbox for first-runs\n" .
-               "Usage: socialbox init [arguments]\n\n" .
-               "Arguments:\n" .
-               "  --force - Forces the initialization process to run even the instance is disabled\n";
-    }
+            // Filter variables that start with the specified prefix
+            $filtered = array_filter($envVars, function ($key)
+            {
+                return str_starts_with($key, 'SB_INSTANCE_DNS_MOCK_');
+            }, ARRAY_FILTER_USE_KEY);
 
-    /**
-     * @inheritDoc
-     */
-    public static function getShortHelpMessage(): string
-    {
-        return "Initializes Socialbox for first-runs";
-    }
-}
\ No newline at end of file
+            // Return only the values as an array
+            return array_values($filtered);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function getHelpMessage(): string
+        {
+            return  "Initialize Command - Initializes Socialbox for first-runs\n" .
+                    "Usage: socialbox init [arguments]\n\n" .
+                    "Arguments:\n" .
+                    "  --force - Forces the initialization process to run even the instance is disabled\n\n" .
+                    "Environment Variables:\n"  .
+                    "  SB_MODE - Set to 'automated' to enable automated setup procedure (Must be set to enable environment variables)\n" .
+                    "  SB_INSTANCE_DOMAIN - The domain name of the instance (eg; Socialbox)\n" .
+                    "  SB_INSTANCE_RPC_ENDPOINT - The public RPC endpoint of the instance (eg; https://rpc.teapot.com/)\n" .
+                    "  SB_STORAGE_PATH - The path to store files (default: /etc/socialbox)\n" .
+                    "  SB_LOGGING_CONSOLE_ENABLED - Enable console logging (default: true)\n" .
+                    "  SB_LOGGING_CONSOLE_LEVEL - Console logging level (default: info)\n" .
+                    "  SB_LOGGING_FILE_ENABLED - Enable file logging (default: true)\n" .
+                    "  SB_LOGGING_FILE_LEVEL - File logging level (default: error)\n" .
+                    "  SB_SECURITY_DISPLAY_INTERNAL_EXCEPTIONS - Display internal exceptions (default: false)\n" .
+                    "  SB_CRYPTO_KEYPAIR_EXPIRES - The expiration date of the key pair in Unix timestamp (default: current time + 1 year)\n" .
+                    "  SB_CRYPTO_ENCRYPTION_KEYS_COUNT - The number of internal encryption keys to generate (default: 5)\n" .
+                    "  SB_CRYPTO_ENCRYPTION_KEYS_ALGORITHM - The algorithm to use for encryption keys (default: xchacha20)\n" .
+                    "  SB_CRYPTO_TRANSPORT_ENCRYPTION_ALGORITHM - The algorithm to use for transport encryption (default: chacha20)\n" .
+                    "  SB_DATABASE_HOST - The database host (default: localhost)\n" .
+                    "  SB_DATABASE_PORT - The database port (default: 3306)\n" .
+                    "  SB_DATABASE_USERNAME - The database username (default: root)\n" .
+                    "  SB_DATABASE_PASSWORD - The database password (default: null)\n" .
+                    "  SB_DATABASE_NAME - The database name (default: socialbox)\n" .
+                    "  SB_CACHE_ENABLED - Enable cache layer (default: false)\n" .
+                    "  SB_CACHE_ENGINE - The cache engine to use (default: redis)\n" .
+                    "  SB_CACHE_HOST - The cache host (default: localhost)\n" .
+                    "  SB_CACHE_PORT - The cache port (default: 6379)\n" .
+                    "  SB_CACHE_USERNAME - The cache username (default: null)\n" .
+                    "  SB_CACHE_PASSWORD - The cache password (default: null)\n" .
+                    "  SB_CACHE_DATABASE - The cache database (default: 0)\n" .
+                    "  SB_INSTANCE_DNS_MOCK_* - Mock server environment variables, format: (<domain> <txt>), eg; SB_INSTANCE_DNS_MOCK_N64: teapot.com <txt>\n";
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function getShortHelpMessage(): string
+        {
+            return "Initializes Socialbox for first-runs";
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Configuration.php b/src/Socialbox/Classes/Configuration.php
index 648e439..411a8dc 100644
--- a/src/Socialbox/Classes/Configuration.php
+++ b/src/Socialbox/Classes/Configuration.php
@@ -1,28 +1,113 @@
 <?php
 
-namespace Socialbox\Classes;
+    namespace Socialbox\Classes;
 
-class Configuration
-{
-    private static ?array $configuration = null;
+    use Socialbox\Classes\Configuration\AuthenticationConfiguration;
+    use Socialbox\Classes\Configuration\CacheConfiguration;
+    use Socialbox\Classes\Configuration\CryptographyConfiguration;
+    use Socialbox\Classes\Configuration\DatabaseConfiguration;
+    use Socialbox\Classes\Configuration\InstanceConfiguration;
+    use Socialbox\Classes\Configuration\LoggingConfiguration;
+    use Socialbox\Classes\Configuration\PoliciesConfiguration;
+    use Socialbox\Classes\Configuration\RegistrationConfiguration;
+    use Socialbox\Classes\Configuration\SecurityConfiguration;
+    use Socialbox\Classes\Configuration\StorageConfiguration;
 
-    public static function getConfiguration(): array
+    class Configuration
     {
-        if(self::$configuration === null)
+        private static ?\ConfigLib\Configuration $configuration = null;
+        private static ?InstanceConfiguration $instanceConfiguration = null;
+        private static ?SecurityConfiguration $securityConfiguration = null;
+        private static ?CryptographyConfiguration $cryptographyConfiguration = null;
+        private static ?DatabaseConfiguration $databaseConfiguration = null;
+        private static ?LoggingConfiguration $loggingConfiguration = null;
+        private static ?CacheConfiguration $cacheConfiguration = null;
+        private static ?RegistrationConfiguration $registrationConfiguration = null;
+        private static ?AuthenticationConfiguration $authenticationConfiguration = null;
+        private static ?PoliciesConfiguration $policiesConfiguration = null;
+        private static ?StorageConfiguration $storageConfiguration = null;
+
+        /**
+         * Initializes the configuration settings for the application. This includes
+         * settings for the instance, security, database, cache layer, and registration.
+         *
+         * @return void
+         */
+        private static function initializeConfiguration(): void
         {
             $config = new \ConfigLib\Configuration('socialbox');
 
-            // False by default, requires the user to enable it.
-            $config->setDefault('instance.enabled', false);
+            // Instance configuration
+            $config->setDefault('instance.enabled', false); // False by default, requires the user to enable it.
+            $config->setDefault('instance.name', "Socialbox Server");
+            $config->setDefault('instance.domain', null);
+            $config->setDefault('instance.rpc_endpoint', null);
+            // DNS Mocking Configuration, usually used for testing purposes
+            // Allows the user to mock a domain to use a specific TXT record
+            $config->setDefault('instance.dns_mocks', []);
 
+            // Security Configuration
             $config->setDefault('security.display_internal_exceptions', false);
+            $config->setDefault('security.resolved_servers_ttl', 600);
+            $config->setDefault('security.captcha_ttl', 200);
+            // Server-side OTP Security options
+            // The time step in seconds for the OTP generation
+            // Default: 30 seconds
+            $config->setDefault('security.otp_secret_key_length', 32);
+            $config->setDefault('security.otp_time_step', 30);
+            // The number of digits in the OTP
+            $config->setDefault('security.otp_digits', 6);
+            // The hash algorithm to use for the OTP generation (sha1, sha256, sha512)
+            $config->setDefault('security.otp_hash_algorithm', 'sha512');
+            // The window of time steps to allow for OTP verification
+            $config->setDefault('security.otp_window', 1);
 
+            // Cryptography Configuration
+            // The Unix Timestamp for when the host's keypair should expire
+            // Setting this value to 0 means the keypair never expires
+            // Setting this value to null will automatically set the current unix timestamp + 1 year as the value
+            // This means at initialization, the key is automatically set to expire in a year.
+            $config->setDefault('cryptography.host_keypair_expires', null);
+            // The host's public/private keypair in base64 encoding, when null; the initialization process
+            // will automatically generate a new keypair
+            $config->setDefault('cryptography.host_public_key', null);
+            $config->setDefault('cryptography.host_private_key', null);
+
+            // The internal encryption keys used for encrypting data in the database when needed.
+            // When null, the initialization process will automatically generate a set of keys
+            // based on the `encryption_keys_count` and `encryption_keys_algorithm` configuration.
+            // This is an array of base64 encoded keys.
+            $config->setDefault('cryptography.internal_encryption_keys', null);
+
+            // The number of encryption keys to generate and set to `instance.encryption_keys` this will be used
+            // to randomly encrypt/decrypt sensitive data in the database, this includes hashes.
+            // The higher the number the higher performance impact it will have on the server
+            $config->setDefault('cryptography.encryption_keys_count', 10);
+            // The host's encryption algorithm, this will be used to generate a set of encryption keys
+            // This is for internal encryption, these keys are never shared outside this configuration.
+            // Recommendation: Higher security over performance
+            $config->setDefault('cryptography.encryption_keys_algorithm', 'xchacha20');
+
+            // The encryption algorithm to use for encrypted message transport between the client aand the server
+            // This is the encryption the server tells the client to use and the client must support it.
+            // Recommendation: Good balance between security and performance
+            // For universal support & performance, use aes256gcm for best performance or for best security use xchacha20
+            $config->setDefault('cryptography.transport_encryption_algorithm', 'chacha20');
+
+            // Database configuration
             $config->setDefault('database.host', '127.0.0.1');
             $config->setDefault('database.port', 3306);
             $config->setDefault('database.username', 'root');
             $config->setDefault('database.password', 'root');
             $config->setDefault('database.name', 'test');
 
+            // Logging configuration
+            $config->setDefault('logging.console_logging_enabled', true);
+            $config->setDefault('logging.console_logging_level', 'info');
+            $config->setDefault('logging.file_logging_enabled', true);
+            $config->setDefault('logging.file_logging_level', 'error');
+
+            // Cache layer configuration
             $config->setDefault('cache.enabled', false);
             $config->setDefault('cache.engine', 'redis');
             $config->setDefault('cache.host', '127.0.0.1');
@@ -30,15 +115,308 @@ class Configuration
             $config->setDefault('cache.username', null);
             $config->setDefault('cache.password', null);
             $config->setDefault('cache.database', 0);
-            $config->setDefault('cache.variables.enabled', true);
-            $config->setDefault('cache.variables.ttl', 3600);
-            $config->setDefault('cache.variables.max', 1000);
+            $config->setDefault('cache.sessions.enabled', true);
+            $config->setDefault('cache.sessions.ttl', 3600);
+            $config->setDefault('cache.sessions.max', 1000);
+
+            // Registration configuration
+            $config->setDefault('registration.enabled', true);
+            $config->setDefault('registration.privacy_policy_document', null);
+            $config->setDefault('registration.privacy_policy_date', 1734985525);
+            $config->setDefault('registration.accept_privacy_policy', true);
+            $config->setDefault('registration.terms_of_service_document', null);
+            $config->setDefault('registration.terms_of_service_date', 1734985525);
+            $config->setDefault('registration.accept_terms_of_service', true);
+            $config->setDefault('registration.community_guidelines_document', null);
+            $config->setDefault('registration.community_guidelines_date', 1734985525);
+            $config->setDefault('registration.accept_community_guidelines', true);
+            $config->setDefault('registration.password_required', true);
+            $config->setDefault('registration.otp_required', false);
+            $config->setDefault('registration.display_name_required', true);
+            $config->setDefault('registration.first_name_required', false);
+            $config->setDefault('registration.middle_name_required', false);
+            $config->setDefault('registration.last_name_required', false);
+            $config->setDefault('registration.display_picture_required', false);
+            $config->setDefault('registration.email_address_required', false);
+            $config->setDefault('registration.phone_number_required', false);
+            $config->setDefault('registration.birthday_required', false);
+            $config->setDefault('registration.url_required', false);
+            $config->setDefault('registration.image_captcha_verification_required', true);
+
+            // Authentication configuration
+            $config->setDefault('authentication.enabled', true);
+            $config->setDefault('authentication.image_captcha_verification_required', true);
+
+            // Server Policies
+            // The maximum number of signing keys a peer can register onto the server at once
+            $config->setDefault('policies.max_signing_keys', 20);
+            $config->setDefault('policies.max_contact_signing_keys', 50);
+            // The amount of time in seconds it takes before a session is considered expired due to inactivity
+            // Default: 12hours
+            $config->setDefault('policies.session_inactivity_expires', 43200);
+            // The amount of time in seconds it takes before an image captcha is considered expired due to lack of
+            // answer within the time-frame that the captcha was generated
+            // If expired; client is expected to request for a new captcha which will generate a new random answer.
+            $config->setDefault('policies.image_captcha_expires', 300);
+            // The amount of time in seconds it takes before a peer's external address is resolved again
+            // When a peer's external address is resolved, it is cached for this amount of time before resolving again.
+            // This reduces the amount of times a resolution request is made to the external server.
+            $config->setDefault('policies.peer_sync_interval', 3600);
+            // The maximum number of contacts a peer can retrieve from the server at once, if the client puts a
+            // value that exceeds this limit, the server will use this limit instead.
+            // recommendation: 100
+            $config->setDefault('policies.get_contacts_limit', 100);
+            $config->setDefault('policies.get_encryption_channel_requests_limit', 100);
+            $config->setDefault('policies.get_encryption_channels_limit', 100);
+            $config->setDefault('policies.get_encryption_channel_incoming_limit', 100);
+            $config->setDefault('policies.get_encryption_channel_outgoing_limit', 100);
+
+            // Default privacy states for information fields associated with the peer
+            $config->setDefault('policies.default_display_picture_privacy', 'PUBLIC');
+            $config->setDefault('policies.default_first_name_privacy', 'CONTACTS');
+            $config->setDefault('policies.default_middle_name_privacy', 'PRIVATE');
+            $config->setDefault('policies.default_last_name_privacy', 'PRIVATE');
+            $config->setDefault('policies.default_email_address_privacy', 'CONTACTS');
+            $config->setDefault('policies.default_phone_number_privacy', 'CONTACTS');
+            $config->setDefault('policies.default_birthday_privacy', 'PRIVATE');
+            $config->setDefault('policies.default_url_privacy', 'PUBLIC');
+
+            // Storage configuration
+            $config->setDefault('storage.path', '/etc/socialbox'); // The main path for file storage
+            $config->setDefault('storage.user_display_images_path', 'user_profiles'); // eg; `/etc/socialbox/user_profiles`
+            $config->setDefault('storage.user_display_images_max_size', 3145728); // 3MB
 
             $config->save();
 
-            self::$configuration = $config->getConfiguration();
+            self::$configuration = $config;
+            self::$instanceConfiguration = new InstanceConfiguration(self::$configuration->getConfiguration()['instance']);
+            self::$securityConfiguration = new SecurityConfiguration(self::$configuration->getConfiguration()['security']);
+            self::$cryptographyConfiguration = new CryptographyConfiguration(self::$configuration->getConfiguration()['cryptography']);
+            self::$databaseConfiguration = new DatabaseConfiguration(self::$configuration->getConfiguration()['database']);
+            self::$loggingConfiguration = new LoggingConfiguration(self::$configuration->getConfiguration()['logging']);
+            self::$cacheConfiguration = new CacheConfiguration(self::$configuration->getConfiguration()['cache']);
+            self::$registrationConfiguration = new RegistrationConfiguration(self::$configuration->getConfiguration()['registration']);
+            self::$authenticationConfiguration = new AuthenticationConfiguration(self::$configuration->getConfiguration()['authentication']);
+            self::$policiesConfiguration = new PoliciesConfiguration(self::$configuration->getConfiguration()['policies']);
+            self::$storageConfiguration = new StorageConfiguration(self::$configuration->getConfiguration()['storage']);
         }
 
-        return self::$configuration;
-    }
-}
\ No newline at end of file
+        /**
+         * Resets all configuration instances by setting them to null and then
+         * reinitializes the configurations.
+         *
+         * @return void
+         */
+        public static function reload(): void
+        {
+            self::$configuration = null;
+            self::$instanceConfiguration = null;
+            self::$securityConfiguration = null;
+            self::$databaseConfiguration = null;
+            self::$loggingConfiguration = null;
+            self::$cacheConfiguration = null;
+            self::$registrationConfiguration = null;
+
+            self::initializeConfiguration();
+        }
+
+        /**
+         * Retrieves the current configuration array. If the configuration is not initialized,
+         * it triggers the initialization process.
+         *
+         * @return array The current configuration array.
+         */
+        public static function getConfiguration(): array
+        {
+            if(self::$configuration === null)
+            {
+                self::initializeConfiguration();
+            }
+
+            return self::$configuration->getConfiguration();
+        }
+
+        /**
+         * Retrieves the configuration library instance.
+         *
+         * This method returns the current Configuration instance from the ConfigLib namespace.
+         * If the configuration has not been initialized yet, it initializes it first.
+         *
+         * @return \ConfigLib\Configuration The configuration library instance.
+         */
+        public static function getConfigurationLib(): \ConfigLib\Configuration
+        {
+            if(self::$configuration === null)
+            {
+                self::initializeConfiguration();
+            }
+
+            return self::$configuration;
+        }
+
+        /**
+         * Retrieves the current instance configuration.
+         *
+         * @return InstanceConfiguration The current instance configuration instance.
+         */
+        public static function getInstanceConfiguration(): InstanceConfiguration
+        {
+            if(self::$instanceConfiguration === null)
+            {
+                self::initializeConfiguration();
+            }
+
+            return self::$instanceConfiguration;
+        }
+
+        /**
+         * Retrieves the current security configuration.
+         *
+         * @return SecurityConfiguration The current security configuration instance.
+         */
+        public static function getSecurityConfiguration(): SecurityConfiguration
+        {
+            if(self::$securityConfiguration === null)
+            {
+                self::initializeConfiguration();
+            }
+
+            return self::$securityConfiguration;
+        }
+
+        /**
+         * Retrieves the cryptography configuration.
+         *
+         * This method returns the current CryptographyConfiguration instance.
+         * If the configuration has not been initialized yet, it initializes it first.
+         *
+         * @return CryptographyConfiguration|null The cryptography configuration instance or null if not available.
+         */
+        public static function getCryptographyConfiguration(): ?CryptographyConfiguration
+        {
+            if(self::$cryptographyConfiguration === null)
+            {
+                self::initializeConfiguration();
+            }
+
+            return self::$cryptographyConfiguration;
+        }
+
+        /**
+         * Retrieves the current database configuration.
+         *
+         * @return DatabaseConfiguration The configuration settings for the database.
+         */
+        public static function getDatabaseConfiguration(): DatabaseConfiguration
+        {
+            if(self::$databaseConfiguration === null)
+            {
+                self::initializeConfiguration();
+            }
+
+            return self::$databaseConfiguration;
+        }
+
+        /**
+         * Retrieves the current logging configuration.
+         *
+         * @return LoggingConfiguration The current logging configuration instance.
+         */
+        public static function getLoggingConfiguration(): LoggingConfiguration
+        {
+            if(self::$loggingConfiguration === null)
+            {
+                self::initializeConfiguration();
+            }
+
+            return self::$loggingConfiguration;
+        }
+
+        /**
+         * Retrieves the current cache configuration. If the cache configuration
+         * has not been initialized, it will initialize it first.
+         *
+         * @return CacheConfiguration The current cache configuration instance.
+         */
+        public static function getCacheConfiguration(): CacheConfiguration
+        {
+            if(self::$cacheConfiguration === null)
+            {
+                self::initializeConfiguration();
+            }
+
+            return self::$cacheConfiguration;
+        }
+
+        /**
+         * Retrieves the registration configuration.
+         *
+         * This method returns the current RegistrationConfiguration instance.
+         * If the configuration has not been initialized yet, it initializes it first.
+         *
+         * @return RegistrationConfiguration The registration configuration instance.
+         */
+        public static function getRegistrationConfiguration(): RegistrationConfiguration
+        {
+            if(self::$registrationConfiguration === null)
+            {
+                self::initializeConfiguration();
+            }
+
+            return self::$registrationConfiguration;
+        }
+
+        /**
+         * Retrieves the authentication configuration.
+         *
+         * This method returns the current AuthenticationConfiguration instance.
+         * If the configuration has not been initialized yet, it initializes it first.
+         *
+         * @return AuthenticationConfiguration The authentication configuration instance.
+         */
+        public static function getAuthenticationConfiguration(): AuthenticationConfiguration
+        {
+            if(self::$authenticationConfiguration === null)
+            {
+                self::initializeConfiguration();
+            }
+
+            return self::$authenticationConfiguration;
+        }
+
+        /**
+         * Retrieves the policies configuration.
+         *
+         * This method returns the current PoliciesConfiguration instance.
+         * If the configuration has not been initialized yet, it initializes it first.
+         *
+         * @return PoliciesConfiguration The policies configuration instance.
+         */
+        public static function getPoliciesConfiguration(): PoliciesConfiguration
+        {
+            if(self::$policiesConfiguration === null)
+            {
+                self::initializeConfiguration();
+            }
+
+            return self::$policiesConfiguration;
+        }
+
+        /**
+         * Retrieves the storage configuration.
+         *
+         * This method returns the current StorageConfiguration instance.
+         * If the configuration has not been initialized yet, it initializes it first.
+         *
+         * @return StorageConfiguration The storage configuration instance.
+         */
+        public static function getStorageConfiguration(): StorageConfiguration
+        {
+            if(self::$storageConfiguration === null)
+            {
+                self::initializeConfiguration();
+            }
+
+            return self::$storageConfiguration;
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Configuration/AuthenticationConfiguration.php b/src/Socialbox/Classes/Configuration/AuthenticationConfiguration.php
new file mode 100644
index 0000000..18fea9d
--- /dev/null
+++ b/src/Socialbox/Classes/Configuration/AuthenticationConfiguration.php
@@ -0,0 +1,36 @@
+<?php
+
+    namespace Socialbox\Classes\Configuration;
+
+    class AuthenticationConfiguration
+    {
+        private bool $enabled;
+        private bool $imageCaptchaVerificationRequired;
+
+        /**
+         * Public Constructor for the AuthenticationConfiguration class
+         *
+         * @param array $data The array data configuration
+         */
+        public function __construct(array $data)
+        {
+            $this->enabled = (bool)$data['enabled'];
+            $this->imageCaptchaVerificationRequired = (bool)$data['image_captcha_verification_required'];
+        }
+
+        /**
+         * @return bool
+         */
+        public function isEnabled(): bool
+        {
+            return $this->enabled;
+        }
+
+        /**
+         * @return bool
+         */
+        public function isImageCaptchaVerificationRequired(): bool
+        {
+            return $this->imageCaptchaVerificationRequired;
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Configuration/CacheConfiguration.php b/src/Socialbox/Classes/Configuration/CacheConfiguration.php
new file mode 100644
index 0000000..05ba6bb
--- /dev/null
+++ b/src/Socialbox/Classes/Configuration/CacheConfiguration.php
@@ -0,0 +1,151 @@
+<?php
+
+    namespace Socialbox\Classes\Configuration;
+
+    class CacheConfiguration
+    {
+        private bool $enabled;
+        private string $engine;
+        private string $host;
+        private int $port;
+        private ?string $username;
+        private ?string $password;
+        private ?int $database;
+
+        private bool $sessionsEnabled;
+        private int $sessionsTtl;
+        private int $sessionsMax;
+
+        /**
+         * Constructor to initialize configuration values.
+         *
+         * @param array $data An associative array containing configuration data.
+         *                    Keys include:
+         *                      - enabled (bool): Whether the feature is enabled.
+         *                      - engine (string): The engine type.
+         *                      - host (string): The host address.
+         *                      - port (int): The port number.
+         *                      - username (string|null): The username for authentication.
+         *                      - password (string|null): The password for authentication.
+         *                      - database (int|null): The database ID.
+         *                      - sessions (array): Session-specific settings. Keys include:
+         *                          - enabled (bool): Whether sessions are enabled.
+         *                          - ttl (int): Session time-to-live in seconds.
+         *                          - max (int): Maximum number of concurrent sessions.
+         *
+         * @return void
+         */
+        public function __construct(array $data)
+        {
+            $this->enabled = (bool)$data['enabled'];
+            $this->engine = (string)$data['engine'];
+            $this->host = (string)$data['host'];
+            $this->port = (int)$data['port'];
+            $this->username = $data['username'] ? (string)$data['username'] : null;
+            $this->password = $data['password'] ? (string)$data['password'] : null;
+            $this->database = $data['database'] ? (int)$data['database'] : null;
+            $this->sessionsEnabled = (bool)$data['sessions']['enabled'];
+            $this->sessionsTtl = (int)$data['sessions']['ttl'];
+            $this->sessionsMax = (int)$data['sessions']['max'];
+        }
+
+        /**
+         * Checks whether the feature is enabled.
+         *
+         * @return bool Returns true if the feature is enabled, false otherwise.
+         */
+        public function isEnabled(): bool
+        {
+            return $this->enabled;
+        }
+
+        /**
+         * Retrieves the engine name.
+         *
+         * @return string Returns the name of the engine.
+         */
+        public function getEngine(): string
+        {
+            return $this->engine;
+        }
+
+        /**
+         * Retrieves the host value.
+         *
+         * @return string The host as a string.
+         */
+        public function getHost(): string
+        {
+            return $this->host;
+        }
+
+        /**
+         * Retrieves the port value.
+         *
+         * @return int The port number.
+         */
+        public function getPort(): int
+        {
+            return $this->port;
+        }
+
+        /**
+         * Retrieves the username value.
+         *
+         * @return string|null The username, or null if not set.
+         */
+        public function getUsername(): ?string
+        {
+            return $this->username;
+        }
+
+        /**
+         * Retrieves the password value.
+         *
+         * @return string|null The password as a string or null if not set.
+         */
+        public function getPassword(): ?string
+        {
+            return $this->password;
+        }
+
+        /**
+         * Retrieves the database identifier.
+         *
+         * @return int|null The database identifier or null if not set.
+         */
+        public function getDatabase(): ?int
+        {
+            return $this->database;
+        }
+
+        /**
+         * Checks whether sessions are enabled.
+         *
+         * @return bool Returns true if sessions are enabled, otherwise false.
+         */
+        public function isSessionsEnabled(): bool
+        {
+            return $this->sessionsEnabled;
+        }
+
+        /**
+         * Retrieves the time-to-live (TTL) value for sessions.
+         *
+         * @return int The TTL value for sessions.
+         */
+        public function getSessionsTtl(): int
+        {
+            return $this->sessionsTtl;
+        }
+
+        /**
+         * Retrieves the maximum number of sessions allowed.
+         *
+         * @return int Returns the maximum number of sessions.
+         */
+        public function getSessionsMax(): int
+        {
+            return $this->sessionsMax;
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Configuration/CryptographyConfiguration.php b/src/Socialbox/Classes/Configuration/CryptographyConfiguration.php
new file mode 100644
index 0000000..34c8567
--- /dev/null
+++ b/src/Socialbox/Classes/Configuration/CryptographyConfiguration.php
@@ -0,0 +1,111 @@
+<?php
+
+    namespace Socialbox\Classes\Configuration;
+
+    class CryptographyConfiguration
+    {
+        private ?int $hostKeyPairExpires;
+        private ?string $hostPublicKey;
+        private ?string $hostPrivateKey;
+        private ?array $internalEncryptionKeys;
+        private int $encryptionKeysCount;
+        private string $encryptionKeysAlgorithm;
+        private string $transportEncryptionAlgorithm;
+
+        /**
+         * Constructor to initialize encryption and transport keys from provided data.
+         *
+         * @param array $data An associative array containing key-value pairs for encryption keys, algorithms, and expiration settings.
+         * @return void
+         */
+        public function __construct(array $data)
+        {
+            $this->hostKeyPairExpires = $data['host_keypair_expires'] ?? null;
+            $this->hostPublicKey = $data['host_public_key'] ?? null;
+            $this->hostPrivateKey = $data['host_private_key'] ?? null;
+            $this->internalEncryptionKeys = $data['internal_encryption_keys'] ?? null;
+            $this->encryptionKeysCount = $data['encryption_keys_count'];
+            $this->encryptionKeysAlgorithm = $data['encryption_keys_algorithm'];
+            $this->transportEncryptionAlgorithm = $data['transport_encryption_algorithm'];
+        }
+
+        /**
+         * Retrieves the expiration timestamp of the host key pair.
+         *
+         * @return int|null The expiration timestamp of the host key pair, or null if not set.
+         */
+        public function getHostKeyPairExpires(): ?int
+        {
+            return $this->hostKeyPairExpires;
+        }
+
+        /**
+         * Retrieves the host's public key.
+         *
+         * @return string|null The host's public key, or null if not set.
+         */
+        public function getHostPublicKey(): ?string
+        {
+            return $this->hostPublicKey;
+        }
+
+        /**
+         * Retrieves the private key associated with the host.
+         *
+         * @return string|null The host's private key, or null if not set.
+         */
+        public function getHostPrivateKey(): ?string
+        {
+            return $this->hostPrivateKey;
+        }
+
+        /**
+         * Retrieves the internal encryption keys.
+         *
+         * @return array|null Returns an array of internal encryption keys if set, or null if no keys are available.
+         */
+        public function getInternalEncryptionKeys(): ?array
+        {
+            return $this->internalEncryptionKeys;
+        }
+
+        /**
+         * Retrieves a random internal encryption key from the available set of encryption keys.
+         *
+         * @return string|null Returns a randomly selected encryption key as a string, or null if no keys are available.
+         */
+        public function getRandomInternalEncryptionKey(): ?string
+        {
+            return $this->internalEncryptionKeys[array_rand($this->internalEncryptionKeys)];
+        }
+
+        /**
+         * Retrieves the total count of encryption keys.
+         *
+         * @return int The number of encryption keys.
+         */
+        public function getEncryptionKeysCount(): int
+        {
+            return $this->encryptionKeysCount;
+        }
+
+        /**
+         * Retrieves the algorithm used for the encryption keys.
+         *
+         * @return string The encryption keys algorithm.
+         */
+        public function getEncryptionKeysAlgorithm(): string
+        {
+            return $this->encryptionKeysAlgorithm;
+        }
+
+        /**
+         * Retrieves the transport encryption algorithm being used.
+         *
+         * @return string The transport encryption algorithm.
+         */
+        public function getTransportEncryptionAlgorithm(): string
+        {
+            return $this->transportEncryptionAlgorithm;
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Configuration/DatabaseConfiguration.php b/src/Socialbox/Classes/Configuration/DatabaseConfiguration.php
new file mode 100644
index 0000000..05ff654
--- /dev/null
+++ b/src/Socialbox/Classes/Configuration/DatabaseConfiguration.php
@@ -0,0 +1,94 @@
+<?php
+
+    namespace Socialbox\Classes\Configuration;
+
+    class DatabaseConfiguration
+    {
+        private string $host;
+        private int $port;
+        private string $username;
+        private ?string $password;
+        private string $name;
+
+        /**
+         * Constructor method to initialize properties from the provided data array.
+         *
+         * @param array $data Associative array containing the keys 'host', 'port', 'username', 'password', and 'name'.
+         *                    - 'host' (string): The host of the server.
+         *                    - 'port' (int): The port number.
+         *                    - 'username' (string): The username for authentication.
+         *                    - 'password' (string|null): The password for authentication, optional.
+         *                    - 'name' (string): The name associated with the connection or resource.
+         *
+         * @return void
+         */
+        public function __construct(array $data)
+        {
+            $this->host = (string)$data['host'];
+            $this->port = (int)$data['port'];
+            $this->username = (string)$data['username'];
+            $this->password = $data['password'] ? (string)$data['password'] : null;
+            $this->name = (string)$data['name'];
+        }
+
+        /**
+         * Retrieves the host value.
+         *
+         * @return string The value of the host.
+         */
+        public function getHost(): string
+        {
+            return $this->host;
+        }
+
+        /**
+         * Retrieves the port value.
+         *
+         * @return int The value of the port.
+         */
+        public function getPort(): int
+        {
+            return $this->port;
+        }
+
+        /**
+         * Retrieves the username value.
+         *
+         * @return string The value of the username.
+         */
+        public function getUsername(): string
+        {
+            return $this->username;
+        }
+
+        /**
+         * Retrieves the password value.
+         *
+         * @return string|null The value of the password, or null if not set.
+         */
+        public function getPassword(): ?string
+        {
+            return $this->password;
+        }
+
+        /**
+         * Retrieves the name value.
+         *
+         * @return string The value of the name
+         */
+        public function getName(): string
+        {
+            return $this->name;
+        }
+
+
+        /**
+         * Constructs and retrieves the Data Source Name (DSN) string.
+         *
+         * @return string The DSN string for the database connection.
+         */
+        public function getDsn(): string
+        {
+            return sprintf('mysql:host=%s;dbname=%s;port=%s;charset=utf8mb4', $this->host, $this->name, $this->port);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Configuration/InstanceConfiguration.php b/src/Socialbox/Classes/Configuration/InstanceConfiguration.php
new file mode 100644
index 0000000..7609e49
--- /dev/null
+++ b/src/Socialbox/Classes/Configuration/InstanceConfiguration.php
@@ -0,0 +1,68 @@
+<?php
+
+    namespace Socialbox\Classes\Configuration;
+
+    class InstanceConfiguration
+    {
+        private bool $enabled;
+        private string $name;
+        private ?string $domain;
+        private ?string $rpcEndpoint;
+        private array $dnsMocks;
+
+        /**
+         * Constructor that initializes object properties with the provided data.
+         *
+         * @param array $data An associative array with keys 'enabled', 'domain', 'private_key', and 'public_key'.
+         * @return void
+         */
+        public function __construct(array $data)
+        {
+            $this->enabled = (bool)$data['enabled'];
+            $this->name = $data['name'];
+            $this->domain = $data['domain'];
+            $this->rpcEndpoint = $data['rpc_endpoint'];
+            $this->dnsMocks = $data['dns_mocks'];
+        }
+
+        /**
+         * Checks if the current object is enabled.
+         *
+         * @return bool True if the object is enabled, false otherwise.
+         */
+        public function isEnabled(): bool
+        {
+            return $this->enabled;
+        }
+
+        public function getName(): string
+        {
+            return $this->name;
+        }
+
+        /**
+         * Retrieves the domain.
+         *
+         * @return string|null The domain.
+         */
+        public function getDomain(): ?string
+        {
+            return $this->domain;
+        }
+
+        /**
+         * @return string|null
+         */
+        public function getRpcEndpoint(): ?string
+        {
+            return $this->rpcEndpoint;
+        }
+
+        /**
+         * @return array
+         */
+        public function getDnsMocks(): array
+        {
+            return $this->dnsMocks;
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Configuration/LoggingConfiguration.php b/src/Socialbox/Classes/Configuration/LoggingConfiguration.php
new file mode 100644
index 0000000..2830648
--- /dev/null
+++ b/src/Socialbox/Classes/Configuration/LoggingConfiguration.php
@@ -0,0 +1,121 @@
+<?php
+
+    namespace Socialbox\Classes\Configuration;
+
+    use LogLib\Enums\LogLevel;
+
+    class LoggingConfiguration
+    {
+        private bool $consoleLoggingEnabled;
+        private string $consoleLoggingLevel;
+        private bool $fileLoggingEnabled;
+        private string $fileLoggingLevel;
+
+        /**
+         * Initializes a new instance of the class with the given configuration data.
+         *
+         * @param array $data An associative array containing logging configuration settings.
+         * @return void
+         */
+        public function __construct(array $data)
+        {
+            $this->consoleLoggingEnabled = (bool) $data['console_logging_enabled'];
+            $this->consoleLoggingLevel = $data['console_logging_level'];
+            $this->fileLoggingEnabled = (bool) $data['file_logging_enabled'];
+            $this->fileLoggingLevel = $data['file_logging_level'];
+        }
+
+        /**
+         * Checks if console logging is enabled.
+         *
+         * @return bool True if console logging is enabled, otherwise false.
+         */
+        public function isConsoleLoggingEnabled(): bool
+        {
+            return $this->consoleLoggingEnabled;
+        }
+
+        /**
+         * Retrieves the logging level for console output.
+         *
+         * @return LogLevel The logging level configured for console output.
+         */
+        public function getConsoleLoggingLevel(): LogLevel
+        {
+            return $this->parseLogLevel($this->consoleLoggingLevel);
+        }
+
+        /**
+         * Checks if file logging is enabled.
+         *
+         * @return bool True if file logging is enabled, false otherwise.
+         */
+        public function isFileLoggingEnabled(): bool
+        {
+            return $this->fileLoggingEnabled;
+        }
+
+        /**
+         * Retrieves the logging level for file logging.
+         *
+         * @return LogLevel The logging level set for file logging.
+         */
+        public function getFileLoggingLevel(): LogLevel
+        {
+            return $this->parseLogLevel($this->fileLoggingLevel);
+        }
+
+        /**
+         * Parses the given log level from string format to a LogLevel enumeration.
+         *
+         * @param string $logLevel The log level as a string.
+         * @return LogLevel The corresponding LogLevel enumeration.
+         */
+        private function parseLogLevel(string $logLevel): LogLevel
+        {
+            switch (strtolower($logLevel))
+            {
+                case LogLevel::DEBUG:
+                case 'debug':
+                case '6':
+                case 'dbg':
+                    return LogLevel::DEBUG;
+
+                case LogLevel::VERBOSE:
+                case 'verbose':
+                case '5':
+                case 'vrb':
+                    return LogLevel::VERBOSE;
+
+                default:
+                case LogLevel::INFO:
+                case 'info':
+                case '4':
+                case 'inf':
+                    return LogLevel::INFO;
+
+                case LogLevel::WARNING:
+                case 'warning':
+                case '3':
+                case 'wrn':
+                    return LogLevel::WARNING;
+                case LogLevel::ERROR:
+                case 'error':
+                case '2':
+                case 'err':
+                    return LogLevel::ERROR;
+
+                case LogLevel::FATAL:
+                case 'fatal':
+                case '1':
+                case 'crt':
+                    return LogLevel::FATAL;
+
+                case LogLevel::SILENT:
+                case 'silent':
+                case '0':
+                case 'sil':
+                    return LogLevel::SILENT;
+            }
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Configuration/PoliciesConfiguration.php b/src/Socialbox/Classes/Configuration/PoliciesConfiguration.php
new file mode 100644
index 0000000..bd17e7f
--- /dev/null
+++ b/src/Socialbox/Classes/Configuration/PoliciesConfiguration.php
@@ -0,0 +1,240 @@
+<?php
+
+    namespace Socialbox\Classes\Configuration;
+
+    use Socialbox\Enums\PrivacyState;
+
+    class PoliciesConfiguration
+    {
+        private int $maxSigningKeys;
+        private int $maxContactSigningKeys;
+        private int $sessionInactivityExpires;
+        private int $imageCaptchaExpires;
+        private int $peerSyncInterval;
+        private int $getContactsLimit;
+        private int $getEncryptionChannelRequestsLimit;
+        private int $getEncryptionChannelsLimit;
+        private int $getEncryptionChannelIncomingLimit;
+        private int $getEncryptionChannelOutgoingLimit;
+        private PrivacyState $defaultDisplayPicturePrivacy;
+        private PrivacyState $defaultFirstNamePrivacy;
+        private PrivacyState $defaultMiddleNamePrivacy;
+        private PrivacyState $defaultLastNamePrivacy;
+        private PrivacyState $defaultEmailAddressPrivacy;
+        private PrivacyState $defaultPhoneNumberPrivacy;
+        private PrivacyState $defaultBirthdayPrivacy;
+        private PrivacyState $defaultUrlPrivacy;
+
+        /**
+         * Constructor method for initializing the policies configuration
+         *
+         * @param array $data An associative array containing the following keys:
+         *                    'max_signing_keys', 'session_inactivity_expires',
+         *                    'image_captcha_expires', 'peer_sync_interval',
+         *                    'get_contacts_limit', 'default_display_picture_privacy',
+         *                    'default_first_name_privacy', 'default_middle_name_privacy',
+         *                    'default_last_name_privacy', 'default_email_address_privacy',
+         *                    'default_phone_number_privacy', 'default_birthday_privacy',
+         *                    'default_url_privacy'.
+         *
+         * @return void
+         */
+        public function __construct(array $data)
+        {
+            $this->maxSigningKeys = $data['max_signing_keys'];
+            $this->maxContactSigningKeys = $data['max_contact_signing_keys'];
+            $this->sessionInactivityExpires = $data['session_inactivity_expires'];
+            $this->imageCaptchaExpires = $data['image_captcha_expires'];
+            $this->peerSyncInterval = $data['peer_sync_interval'];
+            $this->getContactsLimit = $data['get_contacts_limit'];
+            $this->getEncryptionChannelRequestsLimit = $data['get_encryption_channel_requests_limit'];
+            $this->getEncryptionChannelsLimit = $data['get_encryption_channels_limit'];
+            $this->getEncryptionChannelIncomingLimit = $data['get_encryption_channel_incoming_limit'];
+            $this->getEncryptionChannelOutgoingLimit = $data['get_encryption_channel_outgoing_limit'];
+            $this->defaultDisplayPicturePrivacy = PrivacyState::tryFrom($data['default_display_picture_privacy']) ?? PrivacyState::PRIVATE;
+            $this->defaultFirstNamePrivacy = PrivacyState::tryFrom($data['default_first_name_privacy']) ?? PrivacyState::PRIVATE;
+            $this->defaultMiddleNamePrivacy = PrivacyState::tryFrom($data['default_middle_name_privacy']) ?? PrivacyState::PRIVATE;
+            $this->defaultLastNamePrivacy = PrivacyState::tryFrom($data['default_last_name_privacy']) ?? PrivacyState::PRIVATE;
+            $this->defaultEmailAddressPrivacy = PrivacyState::tryFrom($data['default_email_address_privacy']) ?? PrivacyState::PRIVATE;
+            $this->defaultPhoneNumberPrivacy = PrivacyState::tryFrom($data['default_phone_number_privacy']) ?? PrivacyState::PRIVATE;
+            $this->defaultBirthdayPrivacy = PrivacyState::tryFrom($data['default_birthday_privacy']) ?? PrivacyState::PRIVATE;
+            $this->defaultUrlPrivacy = PrivacyState::tryFrom($data['default_url_privacy']) ?? PrivacyState::PRIVATE;
+        }
+
+        /**
+         * Returns the maximum amount of signing keys a peer can register with the server at once
+         *
+         * @return int
+         */
+        public function getMaxSigningKeys(): int
+        {
+            return $this->maxSigningKeys;
+        }
+
+        public function getMaxContactSigningKeys(): int
+        {
+            return $this->maxContactSigningKeys;
+        }
+
+        /**
+         * Returns the maximum amount of seconds before the session is considered expired due to inactivity
+         *
+         * @return int
+         */
+        public function getSessionInactivityExpires(): int
+        {
+            return $this->sessionInactivityExpires;
+        }
+
+        /**
+         * Returns the maximum amount of seconds before a captcha is considered expired due to the amount of time
+         * that has passed since the answer was generated, if a user fails to answer the captcha during the time
+         * period then the user must request for a new captcha with a new answer.
+         *
+         * @return int
+         */
+        public function getImageCaptchaExpires(): int
+        {
+            return $this->imageCaptchaExpires;
+        }
+
+        /**
+         * Returns the maximum amount of seconds before the external peer resolve cache is considered expired
+         *
+         * @return int
+         */
+        public function getPeerSyncInterval(): int
+        {
+            return $this->peerSyncInterval;
+        }
+
+        /**
+         * Returns the maximum amount of contacts that can be retrieved in a single request
+         *
+         * @return int
+         */
+        public function getGetContactsLimit(): int
+        {
+            return $this->getContactsLimit;
+        }
+
+        /**
+         * Returns the maximum number of encryption channel requests that can be retrieved in a single request
+         *
+         * @return int
+         */
+        public function getEncryptionChannelRequestsLimit(): int
+        {
+            return $this->getEncryptionChannelRequestsLimit;
+        }
+
+        /**
+         * Returns the maximum number of encryption channels that can be retrieved in a single request
+         *
+         * @return int
+         */
+        public function getEncryptionChannelsLimit(): int
+        {
+            return $this->getEncryptionChannelsLimit;
+        }
+
+        /**
+         * Returns the maximum number of incoming encryption channels that can be retrieved in a single request
+         *
+         * @return int
+         */
+        public function getEncryptionChannelIncomingLimit(): int
+        {
+            return $this->getEncryptionChannelIncomingLimit;
+        }
+
+        /**
+         * Returns the maximum number of outgoing encryption channels that can be retrieved in a single request
+         *
+         * @return int
+         */
+        public function getEncryptionChannelOutgoingLimit(): int
+        {
+            return $this->getEncryptionChannelOutgoingLimit;
+        }
+
+        /**
+         * Returns the default privacy state for the display picture
+         *
+         * @return PrivacyState
+         */
+        public function getDefaultDisplayPicturePrivacy(): PrivacyState
+        {
+            return $this->defaultDisplayPicturePrivacy;
+        }
+
+        /**
+         * Returns the default privacy state for the first name
+         *
+         * @return PrivacyState
+         */
+        public function getDefaultFirstNamePrivacy(): PrivacyState
+        {
+            return $this->defaultFirstNamePrivacy;
+        }
+        
+        /**
+         * Returns the default privacy state for the middle name
+         *
+         * @return PrivacyState
+         */
+        public function getDefaultMiddleNamePrivacy(): PrivacyState
+        {
+            return $this->defaultMiddleNamePrivacy;
+        }
+
+        /**
+         * Returns the default privacy state for the last name
+         *
+         * @return PrivacyState
+         */
+        public function getDefaultLastNamePrivacy(): PrivacyState
+        {
+            return $this->defaultLastNamePrivacy;
+        }
+
+        /**
+         * Returns the default privacy state for the email address
+         *
+         * @return PrivacyState
+         */
+        public function getDefaultEmailAddressPrivacy(): PrivacyState
+        {
+            return $this->defaultEmailAddressPrivacy;
+        }
+
+        /**
+         * Returns the default privacy state for the phone number
+         *
+         * @return PrivacyState
+         */
+        public function getDefaultPhoneNumberPrivacy(): PrivacyState
+        {
+            return $this->defaultPhoneNumberPrivacy;
+        }
+
+        /**
+         * Returns the default privacy state for the birthday
+         *
+         * @return PrivacyState
+         */
+        public function getDefaultBirthdayPrivacy(): PrivacyState
+        {
+            return $this->defaultBirthdayPrivacy;
+        }
+
+        /**
+         * Returns the default privacy state for the URL
+         *
+         * @return PrivacyState
+         */
+        public function getDefaultUrlPrivacy(): PrivacyState
+        {
+            return $this->defaultUrlPrivacy;
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Configuration/RegistrationConfiguration.php b/src/Socialbox/Classes/Configuration/RegistrationConfiguration.php
new file mode 100644
index 0000000..6745109
--- /dev/null
+++ b/src/Socialbox/Classes/Configuration/RegistrationConfiguration.php
@@ -0,0 +1,286 @@
+<?php
+
+    namespace Socialbox\Classes\Configuration;
+
+    class RegistrationConfiguration
+    {
+        private bool $registrationEnabled;
+        private ?string $privacyPolicyDocument;
+        private int $privacyPolicyDate;
+        private bool $acceptPrivacyPolicy;
+        private ?string $termsOfServiceDocument;
+        private int $termsOfServiceDate;
+        private bool $acceptTermsOfService;
+        private ?string $communityGuidelinesDocument;
+        private int $communityGuidelinesDate;
+        private bool $acceptCommunityGuidelines;
+        private bool $passwordRequired;
+        private bool $otpRequired;
+        private bool $displayNameRequired;
+        private bool $firstNameRequired;
+        private bool $middleNameRequired;
+        private bool $lastNameRequired;
+        private bool $displayPictureRequired;
+        private bool $emailAddressRequired;
+        private bool $phoneNumberRequired;
+        private bool $birthdayRequired;
+        private bool $urlRequired;
+        private bool $imageCaptchaVerificationRequired;
+
+        /**
+         * Constructor method for initializing verification requirements.
+         *
+         * @param array $data An associative array containing the following keys:
+         *                    'registration_enabled', 'password_required',
+         *                    'otp_required', 'display_name_required',
+         *                    'email_verification_required', 'sms_verification_required',
+         *                    'phone_call_verification_required', 'image_captcha_verification_required'.
+         *
+         * @return void
+         */
+        public function __construct(array $data)
+        {
+            $this->registrationEnabled = (bool)$data['enabled'];
+            $this->privacyPolicyDocument = $data['privacy_policy_document'] ?? null;
+            $this->privacyPolicyDate = $data['privacy_policy_date'] ?? 0;
+            $this->acceptPrivacyPolicy = $data['accept_privacy_policy'] ?? true;
+            $this->termsOfServiceDocument = $data['terms_of_service_document'] ?? null;
+            $this->termsOfServiceDate = $data['terms_of_service_date'] ?? 0;
+            $this->acceptTermsOfService = $data['accept_terms_of_service'] ?? true;
+            $this->communityGuidelinesDocument = $data['community_guidelines_document'] ?? null;
+            $this->communityGuidelinesDate = $data['community_guidelines_date'] ?? 0;
+            $this->acceptCommunityGuidelines = $data['accept_community_guidelines'] ?? true;
+            $this->passwordRequired = (bool)$data['password_required'];
+            $this->otpRequired = (bool)$data['otp_required'];
+            $this->displayNameRequired = (bool)$data['display_name_required'];
+            $this->firstNameRequired = (bool)$data['first_name_required'];
+            $this->middleNameRequired = (bool)$data['middle_name_required'];
+            $this->lastNameRequired = (bool)$data['last_name_required'];
+            $this->displayPictureRequired = (bool)$data['display_picture_required'];
+            $this->emailAddressRequired = (bool)$data['email_address_required'];
+            $this->phoneNumberRequired = (bool)$data['phone_number_required'];
+            $this->birthdayRequired = (bool)$data['birthday_required'];
+            $this->urlRequired = (bool)$data['url_required'];
+            $this->imageCaptchaVerificationRequired = (bool)$data['image_captcha_verification_required'];
+        }
+
+        /**
+         * Checks if the registration is enabled.
+         *
+         * @return bool True if registration is enabled, false otherwise.
+         */
+        public function isRegistrationEnabled(): bool
+        {
+            return $this->registrationEnabled;
+        }
+
+        /**
+         * Retrieves the privacy policy document.
+         *
+         * @return ?string Returns the privacy policy document or null if not set.
+         */
+        public function getPrivacyPolicyDocument(): ?string
+        {
+            return $this->privacyPolicyDocument;
+        }
+
+        /**
+         * Retrieves the date of the privacy policy.
+         *
+         * @return int Returns the date of the privacy policy.
+         */
+        public function getPrivacyPolicyDate(): int
+        {
+            return $this->privacyPolicyDate;
+        }
+
+        /**
+         * Checks if accepting the privacy policy is required.
+         *
+         * @return bool Returns true if the privacy policy must be accepted, false otherwise.
+         */
+        public function isAcceptPrivacyPolicyRequired(): bool
+        {
+            return $this->acceptPrivacyPolicy;
+        }
+
+        /**
+         * Retrieves the terms of service document.
+         *
+         * @return ?string Returns the terms of service document or null if not set.
+         */
+        public function getTermsOfServiceDocument(): ?string
+        {
+            return $this->termsOfServiceDocument;
+        }
+
+        /**
+         * Retrieves the date of the terms of service.
+         *
+         * @return int Returns the date of the terms of service.
+         */
+        public function getTermsOfServiceDate(): int
+        {
+            return $this->termsOfServiceDate;
+        }
+
+        /**
+         * Checks if accepting the terms of service is required.
+         *
+         * @return bool Returns true if the terms of service must be accepted, false otherwise.
+         */
+        public function isAcceptTermsOfServiceRequired(): bool
+        {
+            return $this->acceptTermsOfService;
+        }
+
+        /**
+         * Retrieves the community guidelines document.
+         *
+         * @return ?string Returns the community guidelines document or null if not set.
+         */
+        public function getCommunityGuidelinesDocument(): ?string
+        {
+            return $this->communityGuidelinesDocument;
+        }
+
+        /**
+         * Retrieves the date of the community guidelines.
+         *
+         * @return int Returns the date of the community guidelines.
+         */
+        public function getCommunityGuidelinesDate(): int
+        {
+            return $this->communityGuidelinesDate;
+        }
+
+        /**
+         * Checks if accepting the community guidelines is required.
+         *
+         * @return bool Returns true if the community guidelines must be accepted, false otherwise.
+         */
+        public function isAcceptCommunityGuidelinesRequired(): bool
+        {
+            return $this->acceptCommunityGuidelines;
+        }
+
+        /**
+         * Determines if a password is required.
+         *
+         * @return bool True if a password is required, false otherwise.
+         */
+        public function isPasswordRequired(): bool
+        {
+            return $this->passwordRequired;
+        }
+
+        /**
+         * Determines if OTP (One-Time Password) is required.
+         *
+         * @return bool True if OTP is required, false otherwise.
+         */
+        public function isOtpRequired(): bool
+        {
+            return $this->otpRequired;
+        }
+
+        /**
+         * Checks if a display name is required.
+         *
+         * @return bool Returns true if a display name is required, false otherwise.
+         */
+        public function isDisplayNameRequired(): bool
+        {
+            return $this->displayNameRequired;
+        }
+
+        /**
+         * Checks if a first name is required.
+         *
+         * @return bool Returns true if a first name is required, false otherwise.
+         */
+        public function isFirstNameRequired(): bool
+        {
+            return $this->firstNameRequired;
+        }
+
+        /**
+         * Checks if a middle name is required.
+         *
+         * @return bool Returns true if a middle name is required, false otherwise.
+         */
+        public function isMiddleNameRequired(): bool
+        {
+            return $this->middleNameRequired;
+        }
+
+        /**
+         * Checks if a last name is required.
+         *
+         * @return bool Returns true if a last name is required, false otherwise.
+         */
+        public function isLastNameRequired(): bool
+        {
+            return $this->lastNameRequired;
+        }
+
+        /**
+         * Checks if a display picture is required.
+         *
+         * @return bool Returns true if a display picture is required, false otherwise.
+         */
+        public function isDisplayPictureRequired(): bool
+        {
+            return $this->displayPictureRequired;
+        }
+
+        /**
+         * Determines whether an email address is required.
+         *
+         * @return bool Returns true if an email address is required, false otherwise.
+         */
+        public function isEmailAddressRequired(): bool
+        {
+            return $this->emailAddressRequired;
+        }
+
+        /**
+         * Determines if a phone number is required.
+         *
+         * @return bool Returns true if a phone number is required, false otherwise.
+         */
+        public function isPhoneNumberRequired(): bool
+        {
+            return $this->phoneNumberRequired;
+        }
+
+        /**
+         * Determines if a birthday is required.
+         *
+         * @return bool Returns true if a birthday is required, otherwise false.
+         */
+        public function isBirthdayRequired(): bool
+        {
+            return $this->birthdayRequired;
+        }
+
+        /**
+         * Determines if a URL is required.
+         *
+         * @return bool Returns true if a URL is required, false otherwise.
+         */
+        public function isUrlRequired(): bool
+        {
+            return $this->urlRequired;
+        }
+
+        /**
+         * Determines if image CAPTCHA verification is required.
+         *
+         * @return bool Returns true if image CAPTCHA verification is required, false otherwise.
+         */
+        public function isImageCaptchaVerificationRequired(): bool
+        {
+            return $this->imageCaptchaVerificationRequired;
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Configuration/SecurityConfiguration.php b/src/Socialbox/Classes/Configuration/SecurityConfiguration.php
new file mode 100644
index 0000000..09ccf2a
--- /dev/null
+++ b/src/Socialbox/Classes/Configuration/SecurityConfiguration.php
@@ -0,0 +1,114 @@
+<?php
+
+    namespace Socialbox\Classes\Configuration;
+
+    class SecurityConfiguration
+    {
+        private bool $displayInternalExceptions;
+        private int $resolvedServersTtl;
+        private int $captchaTtl;
+        private int $otpSecretKeyLength;
+        private int $otpTimeStep;
+        private int $otpDigits;
+        private string $otpHashAlgorithm;
+        private int $otpWindow;
+
+        /**
+         * Constructor method for initializing class properties.
+         *
+         * @param array $data An associative array containing values for initializing the properties.
+         *
+         * @return void
+         */
+        public function __construct(array $data)
+        {
+            $this->displayInternalExceptions = $data['display_internal_exceptions'];
+            $this->resolvedServersTtl = $data['resolved_servers_ttl'];
+            $this->captchaTtl = $data['captcha_ttl'];
+            $this->otpSecretKeyLength = $data['otp_secret_key_length'];
+            $this->otpTimeStep = $data['otp_time_step'];
+            $this->otpDigits = $data['otp_digits'];
+            $this->otpHashAlgorithm = $data['otp_hash_algorithm'];
+            $this->otpWindow = $data['otp_window'];
+        }
+
+        /**
+         * Determines if the display of internal errors is enabled.
+         *
+         * @return bool True if the display of internal errors is enabled, false otherwise.
+         */
+        public function isDisplayInternalExceptions(): bool
+        {
+            return $this->displayInternalExceptions;
+        }
+
+        /**
+         * Retrieves the time-to-live (TTL) value for resolved servers.
+         *
+         * @return int The TTL value for resolved servers.
+         */
+        public function getResolvedServersTtl(): int
+        {
+            return $this->resolvedServersTtl;
+        }
+
+        /**
+         * Retrieves the time-to-live (TTL) value for captchas.
+         *
+         * @return int The TTL value for captchas.
+         */
+        public function getCaptchaTtl(): int
+        {
+            return $this->captchaTtl;
+        }
+
+        /**
+         * Retrieves the length of the secret key used for OTP generation.
+         *
+         * @return int The length of the secret key used for OTP generation.
+         */
+        public function getOtpSecretKeyLength(): int
+        {
+            return $this->otpSecretKeyLength;
+        }
+
+        /**
+         * Retrieves the time step value for OTP generation.
+         *
+         * @return int The time step value for OTP generation.
+         */
+        public function getOtpTimeStep(): int
+        {
+            return $this->otpTimeStep;
+        }
+
+        /**
+         * Retrieves the number of digits in the OTP.
+         *
+         * @return int The number of digits in the OTP.
+         */
+        public function getOtpDigits(): int
+        {
+            return $this->otpDigits;
+        }
+
+        /**
+         * Retrieves the hash algorithm used for OTP generation.
+         *
+         * @return string The hash algorithm used for OTP generation.
+         */
+        public function getOtpHashAlgorithm(): string
+        {
+            return $this->otpHashAlgorithm;
+        }
+
+        /**
+         * Retrieves the window value for OTP generation.
+         *
+         * @return int The window value for OTP generation.
+         */
+        public function getOtpWindow(): int
+        {
+            return $this->otpWindow;
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Configuration/StorageConfiguration.php b/src/Socialbox/Classes/Configuration/StorageConfiguration.php
new file mode 100644
index 0000000..639af4d
--- /dev/null
+++ b/src/Socialbox/Classes/Configuration/StorageConfiguration.php
@@ -0,0 +1,52 @@
+<?php
+
+    namespace Socialbox\Classes\Configuration;
+
+    class StorageConfiguration
+    {
+        private string $path;
+        private string $userDisplayImagesPath;
+        private int $userDisplayImagesMaxSize;
+
+        /**
+         * Constructor method to initialize the class properties with provided data.
+         *
+         * @param array $data An associative array containing configuration values
+         */
+        public function __construct(array $data)
+        {
+            $this->path = $data['path'];
+            $this->userDisplayImagesPath = $data['user_display_images_path'];
+            $this->userDisplayImagesMaxSize = $data['user_display_images_max_size'];
+        }
+
+        /**
+         * Retrieves the base path value.
+         *
+         * @return string The base path.
+         */
+        public function getPath(): string
+        {
+            return $this->path;
+        }
+
+        /**
+         * Retrieves the path for user display images.
+         *
+         * @return string The path where user display images are stored.
+         */
+        public function getUserDisplayImagesPath(): string
+        {
+            return $this->path . DIRECTORY_SEPARATOR . $this->userDisplayImagesPath;
+        }
+
+        /**
+         * Retrieves the maximum size allowed for user display images.
+         *
+         * @return int The maximum size in bytes.
+         */
+        public function getUserDisplayImagesMaxSize(): int
+        {
+            return $this->userDisplayImagesMaxSize;
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Cryptography.php b/src/Socialbox/Classes/Cryptography.php
index 20d242f..9d83e9d 100644
--- a/src/Socialbox/Classes/Cryptography.php
+++ b/src/Socialbox/Classes/Cryptography.php
@@ -1,243 +1,883 @@
 <?php
 
-namespace Socialbox\Classes;
+    namespace Socialbox\Classes;
 
-use InvalidArgumentException;
-use Socialbox\Exceptions\CryptographyException;
-use Socialbox\Objects\KeyPair;
+    use Exception;
+    use Socialbox\Exceptions\CryptographyException;
+    use Socialbox\Objects\KeyPair;
+    use SodiumException;
 
-class Cryptography
-{
-    private const int TIME_BLOCK = 60;
-    private const int KEY_SIZE = 2048;
-    private const int ALGORITHM = OPENSSL_KEYTYPE_RSA;
-    private const int HASH_ALGORITHM = OPENSSL_ALGO_SHA256;
-    private const int PADDING = OPENSSL_PKCS1_OAEP_PADDING;
-    private const string PEM_PRIVATE_HEADER = 'PRIVATE';
-    private const string PEM_PUBLIC_HEADER = 'PUBLIC';
-
-    /**
-     * Generates a new public-private key pair.
-     *
-     * @return KeyPair The generated key pair, with the keys encoded in base64 DER format.
-     * @throws CryptographyException If an error occurs during key generation.
-     */
-    public static function generateKeyPair(): KeyPair
+    class Cryptography
     {
-        $config = [
-            "private_key_type" => self::ALGORITHM,
-            "private_key_bits" => self::KEY_SIZE,
-        ];
+        private const string KEY_TYPE_ENCRYPTION = 'enc:';
+        private const string KEY_TYPE_SIGNING = 'sig:';
+        private const int BASE64_VARIANT = SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING;
 
-        $res = openssl_pkey_new($config);
-        if (!$res)
+        /**
+         * Generates a new encryption key pair consisting of a public key and a secret key.
+         * The generated keys are encoded in a specific format and securely handled in memory.
+         *
+         * @return KeyPair Returns an instance of KeyPair containing the encoded public and secret keys.
+         * @throws CryptographyException If key pair generation fails.
+         */
+        public static function generateEncryptionKeyPair(): KeyPair
         {
-            throw new CryptographyException('Failed to generate private key: ' . openssl_error_string());
-        }
-
-        openssl_pkey_export($res, $privateKeyPem);
-        $publicKeyPem = openssl_pkey_get_details($res)['key'];
-
-        return new KeyPair(
-            Utilities::base64encode(self::pemToDer($publicKeyPem)),
-            Utilities::base64encode(self::pemToDer($privateKeyPem))
-        );
-    }
-
-    /**
-     * Converts a PEM formatted key to DER format.
-     *
-     * @param string $pemKey The PEM formatted key as a string.
-     *
-     * @return string The DER formatted key as a binary string.
-     */
-    private static function pemToDer(string $pemKey): string
-    {
-        $pemKey = preg_replace('/-----(BEGIN|END) [A-Z ]+-----/', '', $pemKey);
-        return base64_decode(str_replace(["\n", "\r", " "], '', $pemKey));
-    }
-
-    /**
-     * Converts a DER formatted key to PEM format.
-     *
-     * @param string $derKey The DER formatted key.
-     * @param string $type The type of key, either private or public. Default is private.
-     * @return string The PEM formatted key.
-     */
-    private static function derToPem(string $derKey, string $type): string
-    {
-        $formattedKey = chunk_split(base64_encode($derKey), 64);
-        $headerFooter = strtoupper($type) === self::PEM_PUBLIC_HEADER
-            ? "PUBLIC KEY" : "PRIVATE KEY";
-
-        return "-----BEGIN $headerFooter-----\n$formattedKey-----END $headerFooter-----\n";
-    }
-
-    /**
-     * Signs the given content using the provided private key.
-     *
-     * @param string $content The content to be signed.
-     * @param string $privateKey The private key used to sign the content.
-     * @return string The Base64 encoded signature of the content.
-     * @throws CryptographyException If the private key is invalid or if the content signing fails.
-     */
-    public static function signContent(string $content, string $privateKey): string
-    {
-        $privateKey = openssl_pkey_get_private(self::derToPem(Utilities::base64decode($privateKey), self::PEM_PRIVATE_HEADER));
-        if (!$privateKey)
-        {
-            throw new CryptographyException('Invalid private key: ' . openssl_error_string());
-        }
-
-        if (!openssl_sign($content, $signature, $privateKey, self::HASH_ALGORITHM))
-        {
-            throw new CryptographyException('Failed to sign content: ' . openssl_error_string());
-        }
-
-        return base64_encode($signature);
-    }
-
-    /**
-     * Verifies the integrity of the given content using the provided digital signature and public key.
-     *
-     * @param string $content The content to be verified.
-     * @param string $signature The digital signature to verify against.
-     * @param string $publicKey The public key to use for verification.
-     * @return bool Returns true if the content verification is successful, false otherwise.
-     * @throws CryptographyException If the public key is invalid or if the signature verification fails.
-     */
-    public static function verifyContent(string $content, string $signature, string $publicKey): bool
-    {
-        $publicKey = openssl_pkey_get_public(self::derToPem(Utilities::base64decode($publicKey), self::PEM_PUBLIC_HEADER));
-        
-        if (!$publicKey)
-        {
-            throw new CryptographyException('Invalid public key: ' . openssl_error_string());
-        }
-
-        return openssl_verify($content, base64_decode($signature), $publicKey, self::HASH_ALGORITHM) === 1;
-    }
-
-    /**
-     * Temporarily signs the provided content by appending a timestamp-based value and signing it.
-     *
-     * @param string $content The content to be signed.
-     * @param string $privateKey The private key used to sign the content.
-     * @return string The base64 encoded signature of the content with the appended timestamp.
-     * @throws CryptographyException If the private key is invalid or if the content signing fails.
-     */
-    public static function temporarySignContent(string $content, string $privateKey): string
-    {
-        return self::signContent(sprintf('%s|%d', $content, time() / self::TIME_BLOCK), $privateKey);
-    }
-
-    /**
-     * Verify the provided temporary signature for the given content using the public key.
-     *
-     * @param string $content The content whose signature needs to be verified.
-     * @param string $signature The signature associated with the content.
-     * @param string $publicKey The public key to be used for verifying the signature.
-     * @param int $frames The number of time frames to consider for validating the signature (default is 1).
-     * @return bool Returns true if the signature is valid within the provided time frames, otherwise false.
-     * @throws CryptographyException If the public key is invalid or the signature verification fails.
-     */
-    public static function verifyTemporarySignature(string $content, string $signature, string $publicKey, int $frames = 1): bool
-    {
-        $currentTime = time() / self::TIME_BLOCK;
-        for ($i = 0; $i < max(1, $frames); $i++)
-        {
-            if (self::verifyContent(sprintf('%s|%d', $content, $currentTime - $i), $signature, $publicKey))
+            try
             {
-                return true;
+                $keyPair = sodium_crypto_box_keypair();
+                $publicKey = sodium_crypto_box_publickey($keyPair);
+                $secretKey = sodium_crypto_box_secretkey($keyPair);
+
+                $result = new KeyPair(
+                    self::KEY_TYPE_ENCRYPTION . sodium_bin2base64($publicKey, self::BASE64_VARIANT),
+                    self::KEY_TYPE_ENCRYPTION . sodium_bin2base64($secretKey, self::BASE64_VARIANT)
+                );
+
+                // Clean up sensitive data
+                sodium_memzero($keyPair);
+                sodium_memzero($secretKey);
+
+                return $result;
+            }
+            catch (Exception $e)
+            {
+                throw new CryptographyException("Failed to generate encryption keypair: " . $e->getMessage());
             }
         }
-        return false;
-    }
 
-    /**
-     * Encrypts the given content using the provided public key.
-     *
-     * @param string $content The content to be encrypted.
-     * @param string $publicKey The public key used for encryption, in DER-encoded format.
-     * @return string The encrypted content, encoded in base64 format.
-     * @throws CryptographyException If the public key is invalid or the encryption fails.
-     */
-    public static function encryptContent(string $content, string $publicKey): string
-    {
-        $publicKey = openssl_pkey_get_public(self::derToPem(Utilities::base64decode($publicKey), self::PEM_PUBLIC_HEADER));
-        if (!$publicKey)
+        /**
+         * Validates a public encryption key to ensure it is properly formatted and of the correct length.
+         *
+         * @param string $publicKey The base64-encoded public key to validate.
+         * @return bool True if the public key is valid, false otherwise.
+         */
+        public static function validatePublicEncryptionKey(string $publicKey): bool
         {
-            throw new CryptographyException('Invalid public key: ' . openssl_error_string());
+            if(!str_starts_with($publicKey, self::KEY_TYPE_ENCRYPTION))
+            {
+                return false;
+            }
+
+            $base64Key = substr($publicKey, 4);
+
+            try
+            {
+                $decodedKey = sodium_base642bin($base64Key, self::BASE64_VARIANT, true);
+
+                if (strlen($decodedKey) !== SODIUM_CRYPTO_BOX_PUBLICKEYBYTES)
+                {
+                    return false;
+                }
+
+                return true;
+            }
+            catch (Exception)
+            {
+                return false;
+            }
         }
 
-        if (!openssl_public_encrypt($content, $encrypted, $publicKey, self::PADDING))
+        /**
+         * Generates a new signing key pair consisting of a public key and a secret key.
+         *
+         * @return KeyPair An object containing the base64-encoded public and secret keys, each prefixed with the signing key type identifier.
+         * @throws CryptographyException If the key pair generation process fails.
+         */
+        public static function generateSigningKeyPair(): KeyPair
         {
-            throw new CryptographyException('Failed to encrypt content: ' . openssl_error_string());
+            try
+            {
+                $keyPair = sodium_crypto_sign_keypair();
+                $publicKey = sodium_crypto_sign_publickey($keyPair);
+                $secretKey = sodium_crypto_sign_secretkey($keyPair);
+
+                $result = new KeyPair(
+                    self::KEY_TYPE_SIGNING . sodium_bin2base64($publicKey, self::BASE64_VARIANT),
+                    self::KEY_TYPE_SIGNING . sodium_bin2base64($secretKey, self::BASE64_VARIANT)
+                );
+
+                // Clean up sensitive data
+                sodium_memzero($keyPair);
+                sodium_memzero($secretKey);
+
+                return $result;
+            }
+            catch (Exception $e)
+            {
+                throw new CryptographyException("Failed to generate signing keypair: " . $e->getMessage());
+            }
         }
 
-        return base64_encode($encrypted);
-    }
-
-    /**
-     * Decrypts the provided content using the specified private key.
-     *
-     * @param string $content The content to be decrypted, encoded in base64.
-     * @param string $privateKey The private key for decryption, encoded in base64.
-     * @return string The decrypted content, encoded in UTF-8.
-     * @throws CryptographyException If the private key is invalid or the decryption fails.
-     */
-    public static function decryptContent(string $content, string $privateKey): string
-    {
-        $privateKey = openssl_pkey_get_private(self::derToPem(Utilities::base64decode($privateKey), self::PEM_PRIVATE_HEADER));
-
-        if (!$privateKey)
+        /**
+         * Validates a public signing key for proper format and length.
+         *
+         * @param string $publicKey The base64-encoded public signing key to be validated.
+         * @return bool Returns true if the key is valid, or false if it is invalid.
+         */
+        public static function validatePublicSigningKey(string $publicKey): bool
         {
-            throw new CryptographyException('Invalid private key: ' . openssl_error_string());
+            // Check if the key is prefixed with "sig:"
+            if (!str_starts_with($publicKey, self::KEY_TYPE_SIGNING))
+            {
+                // If it doesn't start with "sig:", consider it invalid
+                return false;
+            }
+
+            // Remove the "sig:" prefix
+            $base64Key = substr($publicKey, 4);
+
+            try
+            {
+                // Decode the base64 key
+                $decodedKey = sodium_base642bin($base64Key, self::BASE64_VARIANT, true);
+
+                // Validate the length of the decoded key
+                return strlen($decodedKey) === SODIUM_CRYPTO_SIGN_PUBLICKEYBYTES;
+            }
+            catch (Exception)
+            {
+                // If decoding fails, consider the key invalid
+                return false;
+            }
         }
 
-        if (!openssl_private_decrypt(base64_decode($content), $decrypted, $privateKey, self::PADDING))
+        /**
+         * Performs a Diffie-Hellman Exchange (DHE) to derive a shared secret key using the provided public and private keys.
+         *
+         * @param string $publicKey The base64-encoded public key of the other party.
+         * @param string $privateKey The base64-encoded private key of the local party.
+         * @return string The base64-encoded derived shared secret key.
+         * @throws CryptographyException If the provided keys are invalid or the key exchange process fails.
+         */
+        public static function performDHE(string $publicKey, string $privateKey): string
         {
-            throw new CryptographyException('Failed to decrypt content: ' . openssl_error_string());
+            try
+            {
+                if (empty($publicKey) || empty($privateKey))
+                {
+                    throw new CryptographyException("Empty key(s) provided");
+                }
+
+                $publicKey = self::validateAndExtractKey($publicKey, self::KEY_TYPE_ENCRYPTION);
+                $privateKey = self::validateAndExtractKey($privateKey, self::KEY_TYPE_ENCRYPTION);
+
+                $decodedPublicKey = sodium_base642bin($publicKey, self::BASE64_VARIANT, true);
+                $decodedPrivateKey = sodium_base642bin($privateKey, self::BASE64_VARIANT, true);
+
+                if (strlen($decodedPublicKey) !== SODIUM_CRYPTO_BOX_PUBLICKEYBYTES)
+                {
+                    throw new CryptographyException("Invalid public key length");
+                }
+
+                if (strlen($decodedPrivateKey) !== SODIUM_CRYPTO_BOX_SECRETKEYBYTES)
+                {
+                    throw new CryptographyException("Invalid private key length");
+                }
+
+                $sharedSecret = sodium_crypto_scalarmult($decodedPrivateKey, $decodedPublicKey);
+                $derivedKey = sodium_crypto_generichash($sharedSecret, '', SODIUM_CRYPTO_SECRETBOX_KEYBYTES);
+                $result = sodium_bin2base64($derivedKey, self::BASE64_VARIANT);
+
+                // Clean up sensitive data
+                sodium_memzero($sharedSecret);
+                sodium_memzero($derivedKey);
+                sodium_memzero($decodedPrivateKey);
+
+                return $result;
+            }
+            catch (Exception $e)
+            {
+                throw new CryptographyException("Failed to perform DHE: " . $e->getMessage());
+            }
         }
 
-        return mb_convert_encoding($decrypted, 'UTF-8', 'auto');
-    }
+        /**
+         * Encrypts a message using the provided shared secret.
+         *
+         * @param string $message The message to be encrypted.
+         * @param string $sharedSecret The base64-encoded shared secret used for encryption.
+         * @return string The base64-encoded encrypted message, including a randomly generated nonce.
+         * @throws CryptographyException If the message or shared secret is invalid or the encryption fails.
+         */
+        public static function encryptShared(string $message, string $sharedSecret): string
+        {
+            try
+            {
+                if (empty($message))
+                {
+                    throw new CryptographyException("Empty message provided");
+                }
 
-    public static function validatePublicKey(string $publicKey): bool
-    {
-        try
-        {
-            $result = openssl_pkey_get_public(self::derToPem(Utilities::base64decode($publicKey), self::PEM_PUBLIC_HEADER));
-        }
-        catch(InvalidArgumentException)
-        {
-            return false;
+                if (empty($sharedSecret))
+                {
+                    throw new CryptographyException("Empty shared secret provided");
+                }
+
+                $nonce = random_bytes(SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
+                $key = sodium_base642bin($sharedSecret, self::BASE64_VARIANT, true);
+
+                if (strlen($key) !== SODIUM_CRYPTO_SECRETBOX_KEYBYTES)
+                {
+                    throw new CryptographyException("Invalid shared secret length");
+                }
+
+                $encrypted = sodium_crypto_secretbox($message, $nonce, $key);
+                $result = sodium_bin2base64($nonce . $encrypted, self::BASE64_VARIANT);
+
+                // Clean up sensitive data
+                sodium_memzero($key);
+
+                return $result;
+            }
+            catch (Exception $e)
+            {
+                throw new CryptographyException("Encryption failed: " . $e->getMessage());
+            }
         }
 
-        if($result === false)
+        /**
+         * Decrypts an encrypted message using the provided shared secret.
+         *
+         * @param string $encryptedMessage The base64-encoded encrypted message to be decrypted.
+         * @param string $sharedSecret The base64-encoded shared secret used to decrypt the message.
+         * @return string The decrypted message.
+         * @throws CryptographyException If the encrypted message or shared secret is invalid, or the decryption process fails.
+         */
+        public static function decryptShared(string $encryptedMessage, string $sharedSecret): string
         {
-            return false;
+            try
+            {
+                if (empty($encryptedMessage))
+                {
+                    throw new CryptographyException("Empty encrypted message provided");
+                }
+
+                if (empty($sharedSecret))
+                {
+                    throw new CryptographyException("Empty shared secret provided");
+                }
+
+                $decoded = sodium_base642bin($encryptedMessage, self::BASE64_VARIANT, true);
+                $key = sodium_base642bin($sharedSecret, self::BASE64_VARIANT, true);
+
+                if (strlen($key) !== SODIUM_CRYPTO_SECRETBOX_KEYBYTES)
+                {
+                    throw new CryptographyException("Invalid shared secret length");
+                }
+
+                if (strlen($decoded) < SODIUM_CRYPTO_SECRETBOX_NONCEBYTES)
+                {
+                    throw new CryptographyException("Encrypted message too short");
+                }
+
+                $nonce = mb_substr($decoded, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, '8bit');
+                $ciphertext = mb_substr($decoded, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, null, '8bit');
+
+                $decrypted = sodium_crypto_secretbox_open($ciphertext, $nonce, $key);
+
+                if ($decrypted === false)
+                {
+                    throw new CryptographyException("Decryption failed: Invalid message or shared secret");
+                }
+
+                sodium_memzero($key);
+                return $decrypted;
+            }
+            catch (Exception $e)
+            {
+                throw new CryptographyException("Decryption failed: " . $e->getMessage());
+            }
         }
 
-        return true;
-    }
+        /**
+         * Signs a message using the provided private key.
+         *
+         * @param string $message The message to be signed.
+         * @param string $privateKey The base64-encoded private key used for signing.
+         * @return string The base64-encoded digital signature.
+         * @throws CryptographyException If the message or private key is invalid, or if signing fails.
+         */
+        public static function signMessage(string $message, string $privateKey, bool $hash=true): string
+        {
+            if (empty($message))
+            {
+                throw new CryptographyException("Empty message provided");
+            }
 
-    public static function validatePrivateKey(string $privateKey): bool
-    {
-        try
-        {
-            $result = openssl_pkey_get_private(self::derToPem(Utilities::base64decode($privateKey), self::PEM_PRIVATE_HEADER));
-        }
-        catch(InvalidArgumentException)
-        {
-            return false;
+            if (empty($privateKey))
+            {
+                throw new CryptographyException("Empty private key provided");
+            }
+
+            if($hash)
+            {
+                $message = hash('sha512', $message);
+            }
+            else
+            {
+                if(!self::validateSha512($message))
+                {
+                    throw new CryptographyException("Invalid SHA-512 hash provided");
+                }
+            }
+
+            try
+            {
+                $privateKey = self::validateAndExtractKey($privateKey, self::KEY_TYPE_SIGNING);
+                $decodedKey = sodium_base642bin($privateKey, self::BASE64_VARIANT, true);
+
+                if (strlen($decodedKey) !== SODIUM_CRYPTO_SIGN_SECRETKEYBYTES)
+                {
+                    throw new CryptographyException("Invalid private key length");
+                }
+
+                $signature = sodium_crypto_sign_detached($message, $decodedKey);
+
+                sodium_memzero($decodedKey);
+                return sodium_bin2base64($signature, self::BASE64_VARIANT);
+            }
+            catch (Exception $e)
+            {
+                if($e instanceof CryptographyException)
+                {
+                    throw $e;
+                }
+
+                throw new CryptographyException("Failed to sign message: " . $e->getMessage());
+            }
         }
 
-        if($result === false)
+        /**
+         * Signs a message using the provided private key and a timestamp.
+         *
+         * @param string $message The message to be signed.
+         * @param string $privateKey The base64-encoded private key used for signing.
+         * @param int $timestamp The timestamp to be included in the signed message.
+         * @param bool $hash True to hash the message before signing, false to use the message directly.
+         * @return string The base64-encoded digital signature.
+         * @throws CryptographyException If the message or private key is invalid, or if signing fails.
+         */
+        public static function signTimedMessage(string $message, string $privateKey, int $timestamp, bool $hash=true): string
         {
-            return false;
+            if (empty($message))
+            {
+                throw new CryptographyException("Empty message provided");
+            }
+
+            if($timestamp <= 0)
+            {
+                throw new CryptographyException("Invalid timestamp provided");
+            }
+
+            if($hash)
+            {
+                $message = hash('sha512', $message);
+            }
+            else
+            {
+                if(!self::validateSha512($message))
+                {
+                    throw new CryptographyException("Invalid SHA-512 hash provided");
+                }
+            }
+
+            return self::signMessage(sprintf("digest:%s;timestamp:%d", $message, $timestamp), $privateKey);
         }
 
-        return true;
-    }
-}
\ No newline at end of file
+        /**
+         * Verifies the validity of a given signature for a message using the provided public key.
+         *
+         * @param string $message The original message that was signed.
+         * @param string $signature The base64-encoded signature to be verified.
+         * @param string $publicKey The base64-encoded public key used to verify the signature.
+         * @param bool $hash True to hash the message before verification, false to use the message directly.
+         * @return bool True if the signature is valid; false otherwise.
+         * @throws CryptographyException If any parameter is empty, if the public key or signature is invalid, or if the verification process fails.
+         */
+        public static function verifyMessage(string $message, string $signature, string $publicKey, bool $hash=true): bool
+        {
+            if (empty($message) || empty($signature) || empty($publicKey))
+            {
+                throw new CryptographyException("Empty parameter(s) provided");
+            }
+
+            if($hash)
+            {
+                $message = hash('sha512', $message);
+            }
+            else
+            {
+                if(!self::validateSha512($message))
+                {
+                    throw new CryptographyException("Invalid SHA-512 hash provided");
+                }
+            }
+
+            try
+            {
+                $publicKey = self::validateAndExtractKey($publicKey, self::KEY_TYPE_SIGNING);
+                $decodedKey = sodium_base642bin($publicKey, self::BASE64_VARIANT, true);
+                $decodedSignature = sodium_base642bin($signature, self::BASE64_VARIANT, true);
+
+                if (strlen($decodedKey) !== SODIUM_CRYPTO_SIGN_PUBLICKEYBYTES)
+                {
+                    throw new CryptographyException("Invalid public key length");
+                }
+
+                if (strlen($decodedSignature) !== SODIUM_CRYPTO_SIGN_BYTES)
+                {
+                    throw new CryptographyException("Invalid signature length");
+                }
+
+                return sodium_crypto_sign_verify_detached($decodedSignature, $message, $decodedKey);
+            }
+            catch (Exception $e)
+            {
+                if($e instanceof CryptographyException)
+                {
+                    throw $e;
+                }
+
+                throw new CryptographyException("Failed to verify signature: " . $e->getMessage());
+            }
+        }
+
+        /**
+         * Verifies the validity of a given signature for a message using the provided public key and timestamp.
+         *
+         * @param string $message The original message that was signed.
+         * @param string $signature The base64-encoded signature to be verified.
+         * @param string $publicKey The base64-encoded public key used to verify the signature.
+         * @param int $timestamp The timestamp to be included in the signed message.
+         * @param bool $hash True to hash the message before verification, false to use the message directly.
+         * @return bool True if the signature is valid; false otherwise.
+         * @throws CryptographyException If any parameter is empty, if the public key or signature is invalid, or if the verification process fails.
+         */
+        public static function verifyTimedMessage(string $message, string $signature, string $publicKey, int $timestamp, bool $hash=true): bool
+        {
+            if (empty($message) || empty($signature) || empty($publicKey))
+            {
+                throw new CryptographyException("Empty parameter(s) provided");
+            }
+
+            if($timestamp <= 0)
+            {
+                throw new CryptographyException("Invalid timestamp provided");
+            }
+
+            if($hash)
+            {
+                $message = hash('sha512', $message);
+            }
+            else
+            {
+                if(!self::validateSha512($message))
+                {
+                    throw new CryptographyException("Invalid SHA-512 hash provided");
+                }
+            }
+
+            return self::verifyMessage(sprintf("digest:%s;timestamp:%d", $message, $timestamp), $signature, $publicKey);
+        }
+
+        /**
+         * Determines if the provided algorithm is supported.
+         *
+         * @param string $algorithm The name of the algorithm to check.
+         * @return bool True if the algorithm is supported, false otherwise.
+         */
+        public static function isSupportedAlgorithm(string $algorithm): bool
+        {
+            return match($algorithm)
+            {
+                'xchacha20', 'chacha20', 'aes256gcm' => true,
+                default => false
+            };
+        }
+
+        /**
+         * Generates a new encryption key for the specified algorithm.
+         *
+         * @param string $algorithm The encryption algorithm for which the key is generated.
+         *                          Supported values are 'xchacha20', 'chacha20', and 'aes256gcm'.
+         * @return string The base64-encoded encryption key.
+         * @throws CryptographyException If the algorithm is unsupported or if key generation fails.
+         */
+        public static function generateEncryptionKey(string $algorithm): string
+        {
+            if(!self::isSupportedAlgorithm($algorithm))
+            {
+                throw new CryptographyException('Unsupported Algorithm: ' . $algorithm);
+            }
+
+            try
+            {
+                $keygenMethod = match ($algorithm)
+                {
+                    'xchacha20' => 'sodium_crypto_aead_xchacha20poly1305_ietf_keygen',
+                    'chacha20' => 'sodium_crypto_aead_chacha20poly1305_keygen',
+                    'aes256gcm' => 'sodium_crypto_aead_aes256gcm_keygen',
+                };
+
+                return sodium_bin2base64($keygenMethod(), self::BASE64_VARIANT);
+            }
+            catch (Exception $e)
+            {
+                if($e instanceof CryptographyException)
+                {
+                    throw $e;
+                }
+
+                throw new CryptographyException("Failed to generate encryption key: " . $e->getMessage());
+            }
+        }
+
+        /**
+         * Validates the provided encryption key against the specified algorithm.
+         *
+         * @param string $encryptionKey The encryption key to be validated, encoded in Base64.
+         * @param string $algorithm The encryption algorithm that the key should match.
+         *                          Supported algorithms include 'xchacha20', 'chacha20', and 'aes256gcm'.
+         * @return bool Returns true if the encryption key is valid for the given algorithm, otherwise false.
+         */
+        public static function validateEncryptionKey(string $encryptionKey, string $algorithm): bool
+        {
+            if (empty($encryptionKey))
+            {
+                return false;
+            }
+
+            if(!self::isSupportedAlgorithm($algorithm))
+            {
+                return false;
+            }
+
+            try
+            {
+                $key = sodium_base642bin($encryptionKey, self::BASE64_VARIANT, true);
+                $keyLength = match ($algorithm)
+                {
+                    'xchacha20' => SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES,
+                    'chacha20' => SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES,
+                    'aes256gcm' => SODIUM_CRYPTO_AEAD_AES256GCM_KEYBYTES
+                };
+
+                if (strlen($key) !== $keyLength)
+                {
+                    return false;
+                }
+
+                return true;
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+            finally
+            {
+                if (isset($key))
+                {
+                    try
+                    {
+                        sodium_memzero($key);
+                    }
+                    catch (SodiumException)
+                    {
+                        // Ignore
+                    }
+                }
+            }
+        }
+
+        /**
+         * Encrypts a message using the specified encryption algorithm and key.
+         *
+         * @param string $message The plaintext message to be encrypted.
+         * @param string $encryptionKey A base64-encoded encryption key.
+         * @param string $algorithm The name of the encryption algorithm to be used (e.g., 'xchacha20', 'chacha20', 'aes256gcm').
+         * @return string The base64-encoded encrypted message including the nonce.
+         * @throws CryptographyException If the message, encryption key, or algorithm is invalid, or if encryption fails.
+         */
+        public static function encryptMessage(string $message, string $encryptionKey, string $algorithm): string
+        {
+            try
+            {
+                if (empty($message))
+                {
+                    throw new CryptographyException("Empty message provided");
+                }
+
+                if (empty($encryptionKey))
+                {
+                    throw new CryptographyException("Empty encryption key provided");
+                }
+
+                if(!self::isSupportedAlgorithm($algorithm))
+                {
+                    throw new CryptographyException('Unsupported Algorithm: ' . $algorithm);
+                }
+
+                $key = sodium_base642bin($encryptionKey, self::BASE64_VARIANT, true);
+
+                [$nonceLength, $encryptMethod, $keyLength] = match ($algorithm)
+                {
+                    'xchacha20' => [SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES, 'sodium_crypto_aead_xchacha20poly1305_ietf_encrypt', SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES],
+                    'chacha20' => [SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES, 'sodium_crypto_aead_chacha20poly1305_encrypt', SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES],
+                    'aes256gcm' => [SODIUM_CRYPTO_AEAD_AES256GCM_NPUBBYTES, 'sodium_crypto_aead_aes256gcm_encrypt', SODIUM_CRYPTO_AEAD_AES256GCM_KEYBYTES],
+                };
+
+                if (strlen($key) !== $keyLength)
+                {
+                    throw new CryptographyException("Invalid encryption key length for $algorithm");
+                }
+
+                $nonce = random_bytes($nonceLength);
+                $encrypted = $encryptMethod($message, '', $nonce, $key);
+                return sodium_bin2base64($nonce . $encrypted, self::BASE64_VARIANT);
+            }
+            catch (Exception $e)
+            {
+                if($e instanceof CryptographyException)
+                {
+                    throw $e;
+                }
+
+                throw new CryptographyException("Message encryption failed: " . $e->getMessage());
+            }
+            finally
+            {
+                if (isset($key))
+                {
+                    try
+                    {
+                        sodium_memzero($key);
+                    }
+                    catch (SodiumException)
+                    {
+                        // Ignore
+                    }
+                }
+            }
+        }
+
+        /**
+         * Decrypts an encrypted message using the specified encryption key and algorithm.
+         *
+         * @param string $encryptedMessage The base64-encoded encrypted message to be decrypted.
+         * @param string $encryptionKey The base64-encoded encryption key used for decryption.
+         * @param string $algorithm The encryption algorithm used to encrypt the message (e.g., 'xchacha20', 'chacha20', 'aes256gcm').
+         * @return string The decrypted plaintext message.
+         * @throws CryptographyException If the encrypted message, encryption key, or algorithm is invalid, or if decryption fails.
+         */
+        public static function decryptMessage(string $encryptedMessage, string $encryptionKey, string $algorithm): string
+        {
+            if (empty($encryptedMessage))
+            {
+                throw new CryptographyException("Empty encrypted message provided");
+            }
+
+            if (empty($encryptionKey))
+            {
+                throw new CryptographyException("Empty encryption key provided");
+            }
+
+            if(!self::isSupportedAlgorithm($algorithm))
+            {
+                throw new CryptographyException('Unsupported Algorithm: ' . $algorithm);
+            }
+
+            try
+            {
+
+                $key = sodium_base642bin($encryptionKey, self::BASE64_VARIANT, true);
+                [$nonceLength, $decryptMethod, $keyLength] = match ($algorithm)
+                {
+                    'xchacha20' => [SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES, 'sodium_crypto_aead_xchacha20poly1305_ietf_decrypt', SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES],
+                    'chacha20' => [SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES, 'sodium_crypto_aead_chacha20poly1305_decrypt', SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES],
+                    'aes256gcm' => [SODIUM_CRYPTO_AEAD_AES256GCM_NPUBBYTES, 'sodium_crypto_aead_aes256gcm_decrypt', SODIUM_CRYPTO_AEAD_AES256GCM_KEYBYTES]
+                };
+
+                if (strlen($key) !== $keyLength)
+                {
+                    throw new CryptographyException("Invalid encryption key length for $algorithm");
+                }
+
+                $decoded = sodium_base642bin($encryptedMessage, self::BASE64_VARIANT, true);
+
+                if (strlen($decoded) < $nonceLength)
+                {
+                    throw new CryptographyException("Encrypted message is too short");
+                }
+
+                $nonce = mb_substr($decoded, 0, $nonceLength, '8bit');
+                $ciphertext = mb_substr($decoded, $nonceLength, null, '8bit');
+                $decrypted = $decryptMethod($ciphertext, '', $nonce, $key);
+
+                if ($decrypted === false)
+                {
+                    throw new CryptographyException("Invalid message or encryption key");
+                }
+
+                return $decrypted;
+            }
+            catch (Exception $e)
+            {
+                if($e instanceof CryptographyException)
+                {
+                    throw $e;
+                }
+
+                throw new CryptographyException("Message decryption failed: " . $e->getMessage());
+            }
+            finally
+            {
+                if (isset($key))
+                {
+                    try
+                    {
+                        sodium_memzero($key);
+                    }
+                    catch (SodiumException)
+                    {
+                        // Ignore
+                    }
+                }
+            }
+        }
+
+        /**
+         * Validates whether the provided hash is a valid SHA-512 hash.
+         *
+         * @param string $hash The hash string to be validated, expected to be a 128-character hexadecimal string.
+         * @return bool Returns true if the hash is a valid SHA-512 hash, otherwise false.
+         */
+        public static function validateSha512(string $hash): bool
+        {
+            return preg_match('/^[A-Fa-f0-9]{128}$/', $hash) === 1;
+        }
+
+        /**
+         * Hashes a password securely using a memory-hard, CPU-intensive hashing algorithm.
+         *
+         * @param string $password The password in plaintext to be hashed, if $hash is false this should be a SHA-512 hash.
+         * @param bool $hash True to hash the password, false to use the provided SHA-512 hash directly which is validated.
+         * @return string The hashed password in a secure format.
+         * @throws CryptographyException If password hashing fails.
+         */
+        public static function hashPassword(string $password, bool $hash=true): string
+        {
+            if(empty($password))
+            {
+                throw new CryptographyException("Empty password provided");
+            }
+
+            if($hash === false && !self::validateSha512($password))
+            {
+                throw new CryptographyException("Invalid SHA-512 hash provided");
+            }
+
+            if($hash)
+            {
+                $sha512 = hash('sha512', $password);
+            }
+            
+            try
+            {
+                return sodium_crypto_pwhash_str($sha512, SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE, SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE);
+            }
+            catch (Exception $e)
+            {
+                throw new CryptographyException("Failed to hash password: " . $e->getMessage());
+            }
+        }
+
+        /**
+         * Validates the given Argon2id hash string based on its format and current security requirements.
+         *
+         * @param string $hash The hash string to be validated.
+         * @return bool Returns true if the hash is valid and meets current security standards.
+         */
+        public static function validatePasswordHash(string $hash): bool
+        {
+            try
+            {
+                // Step 1: Check the format
+                $argon2id_pattern = '/^\$argon2id\$v=\d+\$m=\d+,t=\d+,p=\d+\$[A-Za-z0-9+\/=]+\$[A-Za-z0-9+\/=]+$/D';
+                if (!preg_match($argon2id_pattern, $hash))
+                {
+                    return false;
+                }
+
+                // Step 2: Check if it needs rehashing (validates the hash structure)
+                if (sodium_crypto_pwhash_str_needs_rehash($hash, SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE, SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE))
+                {
+                    return false;
+                }
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        /**
+         * Verifies a password against a stored hash.
+         *
+         * @param string $sha512 The sha512 password to be verified.
+         * @param string $hash The stored password hash to be compared against.
+         * @return bool True if the password matches the hash; false otherwise.
+         * @throws CryptographyException If the password verification process fails.
+         */
+        public static function verifyPassword(string $sha512, string $hash): bool
+        {
+            if(!self::validateSha512($sha512))
+            {
+                throw new CryptographyException("Invalid password hash provided");
+            }
+            
+            if(!self::validatePasswordHash($hash))
+            {
+                throw new CryptographyException("Invalid password hash provided");
+            }
+
+            try
+            {
+                return sodium_crypto_pwhash_str_verify($hash, $sha512);
+            }
+            catch (Exception $e)
+            {
+                throw new CryptographyException("Failed to verify password: " . $e->getMessage());
+            }
+        }
+
+        /**
+         * Validates a key by ensuring it is not empty, matches the expected type, and extracts the usable portion.
+         *
+         * @param string $key The key to be validated and processed.
+         * @param string $expectedType The expected prefix type of the key.
+         * @return string The extracted portion of the key after the expected type.
+         * @throws CryptographyException If the key is empty, the key type is invalid, or the extracted portion is empty.
+         */
+        private static function validateAndExtractKey(string $key, string $expectedType): string
+        {
+            if (empty($key))
+            {
+                throw new CryptographyException("Empty key provided");
+            }
+
+            if (!str_starts_with($key, $expectedType))
+            {
+                throw new CryptographyException("Invalid key type. Expected {$expectedType}");
+            }
+
+            $extractedKey = substr($key, strlen($expectedType));
+            if (empty($extractedKey))
+            {
+                throw new CryptographyException("Empty key after type extraction");
+            }
+
+            return $extractedKey;
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Database.php b/src/Socialbox/Classes/Database.php
index 47fdcbc..93bc800 100644
--- a/src/Socialbox/Classes/Database.php
+++ b/src/Socialbox/Classes/Database.php
@@ -1,41 +1,41 @@
 <?php
 
-namespace Socialbox\Classes;
+    namespace Socialbox\Classes;
 
-use mysqli;
-use mysqli_sql_exception;
-use PDO;
-use PDOException;
-use Socialbox\Exceptions\DatabaseOperationException;
+    use PDO;
+    use PDOException;
+    use Socialbox\Classes\Configuration\DatabaseConfiguration;
+    use Socialbox\Exceptions\DatabaseOperationException;
 
-class Database
-{
-    private static ?PDO $instance = null;
-
-    /**
-     * @return PDO
-     * @throws DatabaseOperationException
-     */
-    public static function getConnection(): PDO
+    class Database
     {
-        if (self::$instance === null)
-        {
-            try
-            {
-                $dsn = 'mysql:host=127.0.0.1;dbname=socialbox;port=3306;charset=utf8mb4';
-                self::$instance = new PDO($dsn, 'root', 'root');
+        private static ?PDO $instance = null;
 
-                // Set some common PDO attributes for better error handling
-                self::$instance->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-                self::$instance->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
-            }
-            catch (PDOException $e)
+        /**
+         * @return PDO
+         * @throws DatabaseOperationException
+         */
+        public static function getConnection(): PDO
+        {
+            if (self::$instance === null)
             {
-                throw new DatabaseOperationException('Failed to connect to the database', $e);
+                $dsn = Configuration::getDatabaseConfiguration()->getDsn();
+
+                try
+                {
+                    self::$instance = new PDO($dsn, Configuration::getDatabaseConfiguration()->getUsername(), Configuration::getDatabaseConfiguration()->getPassword());
+
+                    // Set some common PDO attributes for better error handling
+                    self::$instance->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+                    self::$instance->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
+                }
+                catch (PDOException $e)
+                {
+                    throw new DatabaseOperationException('Failed to connect to the database using ' . $dsn, $e);
+                }
             }
+
+            return self::$instance;
         }
 
-        return self::$instance;
-    }
-
-}
\ No newline at end of file
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/DnsHelper.php b/src/Socialbox/Classes/DnsHelper.php
new file mode 100644
index 0000000..a431579
--- /dev/null
+++ b/src/Socialbox/Classes/DnsHelper.php
@@ -0,0 +1,41 @@
+<?php
+
+    namespace Socialbox\Classes;
+
+    use InvalidArgumentException;
+    use Socialbox\Objects\DnsRecord;
+
+    class DnsHelper
+    {
+        /**
+         * Generates a TXT formatted string containing the provided RPC endpoint, public key, and expiration time.
+         *
+         * @param string $rpcEndpoint The RPC endpoint to include in the TXT string.
+         * @param string $publicKey The public key to include in the TXT string.
+         * @param int $expirationTime The expiration time in seconds to include in the TXT string.
+         *
+         * @return string A formatted TXT string containing the input data.
+         */
+        public static function generateTxt(string $rpcEndpoint, string $publicKey, int $expirationTime): string
+        {
+            return sprintf('v=socialbox;sb-rpc=%s;sb-key=%s;sb-exp=%d', $rpcEndpoint, $publicKey, $expirationTime);
+        }
+
+        /**
+         * Parses a TXT record string and extracts its components into a DnsRecord object.
+         *
+         * @param string $txtRecord The TXT record string to be parsed.
+         * @return DnsRecord The extracted DnsRecord object containing the RPC endpoint, public key, and expiration time.
+         * @throws InvalidArgumentException If the TXT record format is invalid.
+         */
+        public static function parseTxt(string $txtRecord): DnsRecord
+        {
+            $pattern = '/v=socialbox;sb-rpc=(?P<rpcEndpoint>https?:\/\/[^;]+);sb-key=(?P<publicSigningKey>[^;]+);sb-exp=(?P<expirationTime>\d+)/';
+            if (preg_match($pattern, $txtRecord, $matches))
+            {
+                return new DnsRecord($matches['rpcEndpoint'], $matches['publicSigningKey'], (int)$matches['expirationTime']);
+            }
+
+            throw new InvalidArgumentException('Invalid TXT record format.');
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Logger.php b/src/Socialbox/Classes/Logger.php
new file mode 100644
index 0000000..9fe20b1
--- /dev/null
+++ b/src/Socialbox/Classes/Logger.php
@@ -0,0 +1,23 @@
+<?php
+
+    namespace Socialbox\Classes;
+
+
+    class Logger
+    {
+        private static ?\LogLib2\Logger $logger = null;
+
+        /**
+         * @return \LogLib2\Logger
+         */
+        public static function getLogger(): \LogLib2\Logger
+        {
+            if(self::$logger === null)
+            {
+                self::$logger = new \LogLib2\Logger(Configuration::getInstanceConfiguration()->getName());
+                \LogLib2\Logger::registerHandlers();
+            }
+
+            return self::$logger;
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/OtpCryptography.php b/src/Socialbox/Classes/OtpCryptography.php
new file mode 100644
index 0000000..21a2b77
--- /dev/null
+++ b/src/Socialbox/Classes/OtpCryptography.php
@@ -0,0 +1,132 @@
+<?php
+
+    namespace Socialbox\Classes;
+
+    use Random\RandomException;
+    use Socialbox\Exceptions\CryptographyException;
+
+    class OtpCryptography
+    {
+        private const string URI_FORMAT = 'otpauth://totp/%s?secret=%s%s&algorithm=%s&digits=%d&period=%d';
+
+        /**
+         * Generates a random secret key of the specified length.
+         *
+         * @param int $length The length of the secret key in bytes. Default is 32.
+         * @return string Returns the generated secret key as a hexadecimal string.
+         * @throws CryptographyException If the length is less than or equal to 0.
+         * @throws RandomException If an error occurs while generating random bytes.
+         */
+        public static function generateSecretKey(int $length=32): string
+        {
+            if($length <= 0)
+            {
+                throw new CryptographyException("Invalid secret key length: must be greater than 0.");
+            }
+
+            return bin2hex(random_bytes($length));
+        }
+
+        /**
+         * Generates a one-time password (OTP) based on the provided parameters.
+         *
+         * @param string $secretKey The secret key used to generate the OTP.
+         * @param int $timeStep The time step in seconds used for OTP generation. Default is 30 seconds.
+         * @param int $digits The number of digits in the OTP. Default is 6.
+         * @param int|null $counter Optional counter value. If not provided, it is calculated based on the current time and time step.
+         * @param string $hashAlgorithm The hash algorithm used for OTP generation. Default is 'sha512'.
+         * @return string Returns the generated OTP as a string with the specified number of digits.
+         * @throws CryptographyException If the generated hash length is less than 20 bytes.
+         */
+        public static function generateOTP(string $secretKey, int $timeStep=30, int $digits=6, int $counter=null, string $hashAlgorithm='sha512'): string
+        {
+            if ($counter === null)
+            {
+                $counter = floor(time() / $timeStep);
+            }
+
+            $hash = self::hashHmac($hashAlgorithm, pack('J', $counter), $secretKey);
+
+            if (strlen($hash) < 20)
+            {
+                throw new CryptographyException("Invalid hash length: must be at least 20 bytes.");
+            }
+
+            // Validate the $secretKey
+            if (!ctype_xdigit($secretKey))
+            {
+                throw new CryptographyException("Invalid secret key: must be a hexadecimal string.");
+            }
+
+            $offset = ord($hash[strlen($hash) - 1]) & 0x0F;
+            $binary = unpack('N', substr($hash, $offset, 4))[1] & 0x7FFFFFFF;
+            $otp = $binary % (10 ** $digits);
+
+            return str_pad((string)$otp, $digits, '0', STR_PAD_LEFT);
+        }
+
+        /**
+         * Verifies a one-time password (OTP) based on the provided parameters.
+         *
+         * @param string $secretKey The secret key used to generate the OTP.
+         * @param string $otp The one-time password to verify.
+         * @param int $timeStep The time step in seconds used for OTP generation. Default is 30 seconds.
+         * @param int $window The allowed window of time steps for verification. Default is 1.
+         * @param int $digits The number of digits in the OTP. Default is 6.
+         * @param string $hashAlgorithm The hash algorithm used for OTP generation. Default is 'sha512'.
+         * @return bool Returns true if the OTP is valid within the provided parameters, otherwise false.
+         * @throws CryptographyException If the generated hash length is less than 20 bytes.
+         */
+        public static function verifyOTP(string $secretKey, string $otp, int $timeStep=30, int $window=1, int $digits=6, string $hashAlgorithm='sha512'): bool
+        {
+            $currentTime = time();
+            $counter = floor($currentTime / $timeStep);
+
+            for ($i = -$window; $i <= $window; $i++)
+            {
+                $testCounter = $counter + $i;
+                $expectedOtp = self::generateOTP($secretKey, $timeStep, $digits, $testCounter, $hashAlgorithm);
+
+                if (hash_equals($expectedOtp, $otp))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /**
+         * Generates a key URI for use in configuring an authenticator application.
+         *
+         * @param string $label A unique label to identify the account (e.g., user or service name).
+         * @param string $secretKey The secret key used for generating the OTP.
+         * @param string|null $issuer The name of the organization or service issuing the key. Default is null.
+         * @param int $timeStep The time step in seconds used for OTP generation. Default is 30 seconds.
+         * @param int $digits The number of digits in the generated OTP. Default is 6.
+         * @param string $hashAlgorithm The hash algorithm used for OTP generation. Default is 'sha512'.
+         * @return string Returns the URI string formatted
+         */
+        public static function generateKeyUri(string $label, string $secretKey, ?string $issuer = null, int $timeStep=30, int $digits=6, string $hashAlgorithm='sha512'): string
+        {
+            $issuerPart = $issuer ? "&issuer=" . rawurlencode($issuer) : '';
+            return sprintf(self::URI_FORMAT, rawurlencode($label), $secretKey, $issuerPart, strtoupper($hashAlgorithm), $digits, $timeStep);
+        }
+
+        /**
+         * Computes a hash-based message authentication code (HMAC) using the specified algorithm.
+         *
+         * @param string $algorithm The hashing algorithm to be used (e.g., 'sha1', 'sha256', 'sha384', 'sha512').
+         * @param string $data The data to be hashed.
+         * @param string $key The secret key used for the HMAC generation.
+         * @return string The generated HMAC as a raw binary string.
+         * @throws CryptographyException If the algorithm is not supported.
+         */
+        private static function hashHmac(string $algorithm, string $data, string $key): string
+        {
+            return match($algorithm)
+            {
+                'sha1', 'sha256', 'sha512' => hash_hmac($algorithm, $data, $key, true),
+                default => throw new CryptographyException('Algorithm not supported')
+            };
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Resources.php b/src/Socialbox/Classes/Resources.php
index c932bab..c44a114 100644
--- a/src/Socialbox/Classes/Resources.php
+++ b/src/Socialbox/Classes/Resources.php
@@ -1,15 +1,84 @@
 <?php
 
-namespace Socialbox\Classes;
+    namespace Socialbox\Classes;
 
-use InvalidArgumentException;
-use Socialbox\Enums\DatabaseObjects;
+    use Socialbox\Enums\DatabaseObjects;
 
-class Resources
-{
-    public static function getDatabaseResource(DatabaseObjects $object): string
+    class Resources
     {
-        $tables_directory = __DIR__ . DIRECTORY_SEPARATOR . 'Resources' . DIRECTORY_SEPARATOR . 'database';
-        return $tables_directory . DIRECTORY_SEPARATOR . $object->value;
-    }
-}
\ No newline at end of file
+        /**
+         * Retrieves the full path to a database resource based on the provided DatabaseObjects instance.
+         *
+         * @param DatabaseObjects $object An instance of DatabaseObjects containing the resource value.
+         * @return string The full file path to the specified database resource.
+         */
+        public static function getDatabaseResource(DatabaseObjects $object): string
+        {
+            $tables_directory = __DIR__ . DIRECTORY_SEPARATOR . 'Resources' . DIRECTORY_SEPARATOR . 'database';
+            return $tables_directory . DIRECTORY_SEPARATOR . $object->value;
+        }
+
+        /**
+         * Retrieves the file path of a document resource based on the provided name.
+         *
+         * @param string $name The name of the document resource to retrieve.
+         * @return string The file path of the specified document resource.
+         */
+        public static function getDocumentResource(String $name): string
+        {
+            $documents_directory = __DIR__ . DIRECTORY_SEPARATOR . 'Resources' . DIRECTORY_SEPARATOR . 'documents';
+            return $documents_directory . DIRECTORY_SEPARATOR . $name . '.html';
+        }
+
+        /**
+         * Retrieves the content of the privacy policy document.
+         *
+         * @return string The content of the privacy policy document. Attempts to fetch the document
+         * from a configured location if available and valid; otherwise, retrieves it from a default resource.
+         */
+        public static function getPrivacyPolicy(): string
+        {
+            $configuredLocation = Configuration::getRegistrationConfiguration()->getPrivacyPolicyDocument();
+            if($configuredLocation !== null && file_exists($configuredLocation))
+            {
+                return file_get_contents($configuredLocation);
+            }
+
+            return file_get_contents(self::getDocumentResource('privacy'));
+        }
+
+        /**
+         * Retrieves the content of the Terms of Service document.
+         *
+         * @return string The content of the Terms of Service file. The method checks a configured location first,
+         *                and falls back to a default resource if the configured file is unavailable.
+         */
+        public static function getTermsOfService(): string
+        {
+            $configuredLocation = Configuration::getRegistrationConfiguration()->getTermsOfServiceDocument();
+            if($configuredLocation !== null && file_exists($configuredLocation))
+            {
+                return file_get_contents($configuredLocation);
+            }
+
+            return file_get_contents(self::getDocumentResource('tos'));
+        }
+
+        /**
+         * Retrieves the community guidelines document content.
+         *
+         * @return string The content of the community guidelines document, either from a configured location
+         *                or a default resource if the configured location is unavailable.
+         */
+        public static function getCommunityGuidelines(): string
+        {
+            $configuredLocation = Configuration::getRegistrationConfiguration()->getCommunityGuidelinesDocument();
+            if($configuredLocation !== null && file_exists($configuredLocation))
+            {
+                return file_get_contents($configuredLocation);
+            }
+
+            return file_get_contents(self::getDocumentResource('community'));
+        }
+
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Resources/database/authentication_otp.sql b/src/Socialbox/Classes/Resources/database/authentication_otp.sql
new file mode 100644
index 0000000..4e32763
--- /dev/null
+++ b/src/Socialbox/Classes/Resources/database/authentication_otp.sql
@@ -0,0 +1,18 @@
+create table authentication_otp
+(
+    peer_uuid varchar(36)                           not null comment 'The Peer UUID associated with this record'
+        primary key comment 'The Peer UUID unique Index',
+    secret    mediumtext                            not null comment 'The encrypted secret for the OTP',
+    updated   timestamp default current_timestamp() not null comment 'The Timestamp for when the record was last updated',
+    constraint authentication_otp_peer_uuid_uindex
+        unique (peer_uuid) comment 'The Peer UUID unique Index',
+    constraint authentication_otp_registered_peers_uuid_fk
+        foreign key (peer_uuid) references peers (uuid)
+            on update cascade on delete cascade
+)
+    comment 'Table for housing encrypted OTP secrets for for verification';
+
+create index authentication_otp_updated_index
+    on authentication_otp (updated)
+    comment 'The index for the updated column';
+
diff --git a/src/Socialbox/Classes/Resources/database/authentication_passwords.sql b/src/Socialbox/Classes/Resources/database/authentication_passwords.sql
new file mode 100644
index 0000000..54a3d28
--- /dev/null
+++ b/src/Socialbox/Classes/Resources/database/authentication_passwords.sql
@@ -0,0 +1,18 @@
+create table authentication_passwords
+(
+    peer_uuid varchar(36)                           not null comment 'The primary unique index of the peer uuid'
+        primary key,
+    hash      mediumtext                            not null comment 'The encrypted hash of the password',
+    updated   timestamp default current_timestamp() not null comment 'The Timestamp for when this record was last updated',
+    constraint authentication_passwords_peer_uuid_uindex
+        unique (peer_uuid) comment 'The primary unique index of the peer uuid',
+    constraint authentication_passwords_registered_peers_uuid_fk
+        foreign key (peer_uuid) references peers (uuid)
+            on update cascade on delete cascade
+)
+    comment 'Table for housing authentication passwords for registered peers';
+
+create index authentication_passwords_updated_index
+    on authentication_passwords (updated)
+    comment 'The index of the of the updated column of the record';
+
diff --git a/src/Socialbox/Classes/Resources/database/captcha_images.sql b/src/Socialbox/Classes/Resources/database/captcha_images.sql
new file mode 100644
index 0000000..e4c00a5
--- /dev/null
+++ b/src/Socialbox/Classes/Resources/database/captcha_images.sql
@@ -0,0 +1,24 @@
+create table captcha_images
+(
+    uuid      varchar(36)                 default uuid()              not null comment 'The Unique index for the UUID column'
+        primary key,
+    peer_uuid varchar(36)                                             not null comment 'The UUID of the peer that is associated with this captcha challenge',
+    status    enum ('UNSOLVED', 'SOLVED') default 'UNSOLVED'          not null comment 'The status of the current captcha',
+    answer    varchar(8)                                              null comment 'The current answer for the captcha',
+    answered  timestamp                                               null comment 'The Timestamp for when this captcha was answered',
+    created   timestamp                   default current_timestamp() not null comment 'The Timestamp for when this captcha record was created',
+    constraint captchas_peer_uuid_uindex
+        unique (peer_uuid) comment 'The Primary Unique Index for the peer UUID',
+    constraint captchas_registered_peers_uuid_fk
+        foreign key (peer_uuid) references peers (uuid)
+            on update cascade on delete cascade
+);
+
+create index captchas_status_index
+    on captcha_images (status)
+    comment 'The Index for the captcha status';
+
+create index captchas_uuid_index
+    on captcha_images (uuid)
+    comment 'The Unique index for the UUID column';
+
diff --git a/src/Socialbox/Classes/Resources/database/channel_com.sql b/src/Socialbox/Classes/Resources/database/channel_com.sql
new file mode 100644
index 0000000..ab75fd7
--- /dev/null
+++ b/src/Socialbox/Classes/Resources/database/channel_com.sql
@@ -0,0 +1,32 @@
+create table channel_com
+(
+    uuid         varchar(36) default uuid()              not null comment 'The UUID of the message',
+    channel_uuid varchar(36)                             not null comment 'The UUID of the encryption channel used',
+    recipient    enum ('SENDER', 'RECEIVER')             not null comment 'The recipient of the message',
+    message      text                                    not null comment 'The encrypted message content',
+    signature    varchar(64)                             not null comment 'The signature of the decrypted message',
+    received     tinyint(1)  default 0                   not null comment 'True if the message was received by the recipient',
+    timestamp    timestamp   default current_timestamp() not null comment 'The timestamp of the mssage being sent',
+    primary key (uuid, channel_uuid) comment 'The Unique Pair Index for the channel UUID and message UUID',
+    constraint channel_com_uuid_channel_uuid_uindex
+        unique (uuid, channel_uuid) comment 'The Unique Pair Index for the channel UUID and message UUID',
+    constraint channel_com_uuid_channel_uuid_uindex_2
+        unique (uuid, channel_uuid) comment 'The Unique Index Pair for the channel UUID and message UUID',
+    constraint channel_com_encryption_channels_uuid_fk
+        foreign key (channel_uuid) references encryption_channels (uuid)
+            on update cascade on delete cascade
+)
+    comment 'Table for housing communication messages over encryption channels';
+
+create index channel_com_received_index
+    on channel_com (received)
+    comment 'The index for the received column';
+
+create index channel_com_recipient_index
+    on channel_com (recipient)
+    comment 'The index for the recipient column';
+
+create index channel_com_timestamp_index
+    on channel_com (timestamp)
+    comment 'The index for the Timestamp column';
+
diff --git a/src/Socialbox/Classes/Resources/database/contact_known_keys.sql b/src/Socialbox/Classes/Resources/database/contact_known_keys.sql
new file mode 100644
index 0000000..164dc48
--- /dev/null
+++ b/src/Socialbox/Classes/Resources/database/contact_known_keys.sql
@@ -0,0 +1,22 @@
+create table contacts_known_keys
+(
+    contact_uuid   varchar(36)                           not null comment 'The Unique Universal Identifier of the personal contact that this record is associated with',
+    signature_uuid varchar(36)                           not null comment 'The Unique Universal Identifier for the signature key',
+    signature_name varchar(64)                           not null comment 'The name of the signing key',
+    signature_key  varchar(32)                           not null comment 'The public signing key',
+    expires        timestamp                             null comment 'The Timestamp for when this key expires, null means never',
+    created        timestamp                             not null comment 'The Timestamp for when this key was created',
+    trusted_on     timestamp default current_timestamp() not null comment 'The Timestamp for when the peer trusted this key',
+    primary key (contact_uuid, signature_uuid),
+    constraint contacts_known_keys_signature_uuid_contact_uuid_uindex
+        unique (signature_uuid, contact_uuid) comment 'The Unique Signature Index Pair for the contact UUID and key UUID',
+    constraint contacts_known_keys_contacts_uuid_fk
+        foreign key (contact_uuid) references contacts (uuid)
+            on update cascade on delete cascade
+)
+    comment 'Table for housing known keys associated with personal contact records';
+
+create index contacts_known_keys_contact_uuid_index
+    on contacts_known_keys (contact_uuid)
+    comment 'The Index of the contact UUID';
+
diff --git a/src/Socialbox/Classes/Resources/database/contacts.sql b/src/Socialbox/Classes/Resources/database/contacts.sql
new file mode 100644
index 0000000..5c766bb
--- /dev/null
+++ b/src/Socialbox/Classes/Resources/database/contacts.sql
@@ -0,0 +1,18 @@
+create table contacts
+(
+    uuid                 varchar(36)                           default uuid()              not null comment 'The contact UUID for the record'
+        primary key comment 'The Primary Unique Universal Identifier for the contact record',
+    peer_uuid            varchar(36)                                                       not null comment 'The Peer UUID',
+    contact_peer_address varchar(256)                                                      not null comment 'The contact peer address',
+    relationship         enum ('MUTUAL', 'TRUSTED', 'BLOCKED') default 'MUTUAL'            not null comment 'The relationship between the two peers, MUTUAL=The contact peer is recognized',
+    created              timestamp                             default current_timestamp() not null comment 'The Timestamp for when this contact was created',
+    constraint contacts_uuid_uindex
+        unique (uuid) comment 'The Primary Unique Universal Identifier for the contact record',
+    constraint peer_contacts_peer_uuid_contact_peer_address_uindex
+        unique (peer_uuid, contact_peer_address) comment 'The Unique Peer UUID & Contact Peer Address combination pair',
+    constraint peer_contacts_registered_peers_uuid_fk
+        foreign key (peer_uuid) references peers (uuid)
+            on update cascade on delete cascade
+)
+    comment 'Table for housing personal contacts for peers';
+
diff --git a/src/Socialbox/Classes/Resources/database/encryption_channels.sql b/src/Socialbox/Classes/Resources/database/encryption_channels.sql
new file mode 100644
index 0000000..6214c22
--- /dev/null
+++ b/src/Socialbox/Classes/Resources/database/encryption_channels.sql
@@ -0,0 +1,26 @@
+create table encryption_channels_com
+(
+    uuid         varchar(36)                           default uuid()              not null comment 'The Unique Universal Identifier of the message for the encryption channel',
+    channel_uuid varchar(36)                                                       not null comment 'The UUID of the channel that the message belongs to',
+    recipient    enum ('CALLER', 'RECEIVER')                                       not null comment 'The recipient of the message',
+    status       enum ('SENT', 'RECEIVED', 'REJECTED') default 'SENT'              not null comment 'The status of the message, SENT being the default, RECEIVED is when the recipient receives the message successfully and REJECTED is when the message cannot be decrypted, or the checksum failed.',
+    checksum     varchar(64)                                                       not null comment 'The SHA512 hash of the decrypted message contents',
+    data         text                                                              not null comment 'The data of the message',
+    timestamp    timestamp                             default current_timestamp() not null comment 'The Timestamp of the message',
+    primary key (uuid, channel_uuid) comment 'The Unique Primary Index Pair for the channel_uuid and uuid of the message',
+    constraint encryption_channels_com_uuid_channel_uuid_uindex
+        unique (uuid, channel_uuid) comment 'The Unique Primary Index Pair for the channel_uuid and uuid of the message',
+    constraint encryption_channels_com_encryption_channels_uuid_fk
+        foreign key (channel_uuid) references encryption_channels (uuid)
+            on update cascade on delete cascade
+)
+    comment 'The table for housing communication messages sent over encryption channels';
+
+create index encryption_channels_com_recipient_index
+    on encryption_channels_com (recipient)
+    comment 'The index of the recipient column used for indexing';
+
+create index encryption_channels_com_timestamp_index
+    on encryption_channels_com (timestamp)
+    comment 'The index of the Timestamp column';
+
diff --git a/src/Socialbox/Classes/Resources/database/encryption_channels_com.sql b/src/Socialbox/Classes/Resources/database/encryption_channels_com.sql
new file mode 100644
index 0000000..6214c22
--- /dev/null
+++ b/src/Socialbox/Classes/Resources/database/encryption_channels_com.sql
@@ -0,0 +1,26 @@
+create table encryption_channels_com
+(
+    uuid         varchar(36)                           default uuid()              not null comment 'The Unique Universal Identifier of the message for the encryption channel',
+    channel_uuid varchar(36)                                                       not null comment 'The UUID of the channel that the message belongs to',
+    recipient    enum ('CALLER', 'RECEIVER')                                       not null comment 'The recipient of the message',
+    status       enum ('SENT', 'RECEIVED', 'REJECTED') default 'SENT'              not null comment 'The status of the message, SENT being the default, RECEIVED is when the recipient receives the message successfully and REJECTED is when the message cannot be decrypted, or the checksum failed.',
+    checksum     varchar(64)                                                       not null comment 'The SHA512 hash of the decrypted message contents',
+    data         text                                                              not null comment 'The data of the message',
+    timestamp    timestamp                             default current_timestamp() not null comment 'The Timestamp of the message',
+    primary key (uuid, channel_uuid) comment 'The Unique Primary Index Pair for the channel_uuid and uuid of the message',
+    constraint encryption_channels_com_uuid_channel_uuid_uindex
+        unique (uuid, channel_uuid) comment 'The Unique Primary Index Pair for the channel_uuid and uuid of the message',
+    constraint encryption_channels_com_encryption_channels_uuid_fk
+        foreign key (channel_uuid) references encryption_channels (uuid)
+            on update cascade on delete cascade
+)
+    comment 'The table for housing communication messages sent over encryption channels';
+
+create index encryption_channels_com_recipient_index
+    on encryption_channels_com (recipient)
+    comment 'The index of the recipient column used for indexing';
+
+create index encryption_channels_com_timestamp_index
+    on encryption_channels_com (timestamp)
+    comment 'The index of the Timestamp column';
+
diff --git a/src/Socialbox/Classes/Resources/database/external_sessions.sql b/src/Socialbox/Classes/Resources/database/external_sessions.sql
new file mode 100644
index 0000000..11e2035
--- /dev/null
+++ b/src/Socialbox/Classes/Resources/database/external_sessions.sql
@@ -0,0 +1,22 @@
+create table external_sessions
+(
+    domain                          varchar(256)                                                            not null comment 'The unique domain name that this session belongs to'
+        primary key comment 'The Unique Primary index for the external session',
+    rpc_endpoint                    text                                                                    not null comment 'The RPC endpoint of the external connection',
+    session_uuid                    varchar(36)                                                             not null comment 'The UUID of the session to the external server',
+    transport_encryption_algorithm  enum ('xchacha20', 'chacha20', 'aes256gcm') default 'xchacha20'         not null comment 'The transport encryption algorithm used',
+    server_keypair_expires          int                                                                     not null comment 'The Timestamp for when the server keypair expires',
+    server_public_signing_key       varchar(64)                                                             not null comment 'The public signing key of the server resolved from DNS records',
+    server_public_encryption_key    varchar(64)                                                             not null comment 'The public encryption key of the server for this session',
+    host_public_encryption_key      varchar(64)                                                             not null comment 'The public encryption key for the host',
+    host_private_encryption_key     varchar(64)                                                             not null comment 'The private encryption key for host',
+    private_shared_secret           varchar(64)                                                             not null comment 'The private shared secret obtained from the DHE procedure',
+    host_transport_encryption_key   varchar(64)                                                             not null comment 'The transport encryption key for the host',
+    server_transport_encryption_key varchar(64)                                                             not null comment 'The transport encryption key for the server',
+    last_accessed                   timestamp                                   default current_timestamp() not null comment 'The Timestamp for when the record was last accessed',
+    created                         timestamp                                   default current_timestamp() not null comment 'The Timestamp for when this record was created',
+    constraint external_sessions_domain_uindex
+        unique (domain) comment 'The Unique Primary index for the external session'
+)
+    comment 'Table for housing external sessions to external servers';
+
diff --git a/src/Socialbox/Classes/Resources/database/password_authentication.sql b/src/Socialbox/Classes/Resources/database/password_authentication.sql
deleted file mode 100644
index 90bc79a..0000000
--- a/src/Socialbox/Classes/Resources/database/password_authentication.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-create table password_authentication
-(
-    peer_uuid varchar(36)                           not null comment 'The Primary unique Index for the peer UUID'
-        primary key,
-    value     varchar(128)                          not null comment 'The hash value of the pasword',
-    updated   timestamp default current_timestamp() not null comment 'The Timestamp for when this record was last updated',
-    constraint password_authentication_peer_uuid_uindex
-        unique (peer_uuid) comment 'The Primary unique Index for the peer UUID',
-    constraint password_authentication_registered_peers_uuid_fk
-        foreign key (peer_uuid) references registered_peers (uuid)
-            on update cascade on delete cascade
-)
-    comment 'Table for housing password authentications associated with peers';
-
-create index password_authentication_updated_index
-    on password_authentication (updated)
-    comment 'The Indefor the updated timestamp';
-
diff --git a/src/Socialbox/Classes/Resources/database/peer_information.sql b/src/Socialbox/Classes/Resources/database/peer_information.sql
new file mode 100644
index 0000000..f650ca7
--- /dev/null
+++ b/src/Socialbox/Classes/Resources/database/peer_information.sql
@@ -0,0 +1,19 @@
+create table peer_information
+(
+    peer_uuid      varchar(36)                                                                                                                            not null comment 'The Unique Universal Identifier for the peer',
+    property_name  enum ('DISPLAY_NAME', 'DISPLAY_PICTURE', 'FIRST_NAME', 'MIDDLE_NAME', 'LAST_NAME', 'EMAIL_ADDRESS', 'PHONE_NUMBER', 'BIRTHDAY', 'URL') not null comment 'The name of the property',
+    property_value varchar(256)                                                                                                                           not null comment 'The value of the property associated with the peer',
+    privacy_state  enum ('PUBLIC', 'PRIVATE', 'CONTACTS', 'TRUSTED') default 'PRIVATE'                                                                    not null comment 'The privacy setting for the information property',
+    primary key (property_name, peer_uuid),
+    constraint peer_information_peer_uuid_property_name_uindex
+        unique (peer_uuid, property_name) comment 'The Unique Index for the the peer uuid & property name combination',
+    constraint peer_information_registered_peers_uuid_fk
+        foreign key (peer_uuid) references peers (uuid)
+            on update cascade on delete cascade
+)
+    comment 'Table for housing peer information';
+
+create index peer_information_peer_uuid_index
+    on peer_information (peer_uuid)
+    comment 'The index for the peer uuid';
+
diff --git a/src/Socialbox/Classes/Resources/database/peers.sql b/src/Socialbox/Classes/Resources/database/peers.sql
new file mode 100644
index 0000000..0d7662c
--- /dev/null
+++ b/src/Socialbox/Classes/Resources/database/peers.sql
@@ -0,0 +1,37 @@
+create table peers
+(
+    uuid     varchar(36)  default uuid()              not null comment 'The Primary index for the peer uuid'
+        primary key,
+    username varchar(255)                             not null comment 'The Unique username associated with the peer',
+    server   varchar(255) default 'host'              not null comment 'The server that this peer is registered to',
+    flags    text                                     null comment 'Comma seprted flags associated with the peer',
+    enabled  tinyint(1)   default 0                   not null comment 'Boolean column to indicate if this account is Enabled, by default it''s Disabled until the account is verified.',
+    updated  timestamp    default current_timestamp() not null comment 'The Timestamp for when this record was last updated',
+    created  timestamp    default current_timestamp() not null comment 'The Timestamp for when the peer was registered on the network',
+    constraint registered_peers_server_username_uindex
+        unique (server, username) comment 'The Unique Username + Server Index Pair',
+    constraint registered_peers_uuid_uindex
+        unique (uuid) comment 'The Primary index for the peer uuid'
+)
+    comment 'Table for housing registered peers under this network';
+
+create index registered_peers_enabled_index
+    on peers (enabled)
+    comment 'The index of the enabled column for registered peers';
+
+create index registered_peers_registered_index
+    on peers (created)
+    comment 'The Index for the reigstered column of the peer';
+
+create index registered_peers_server_index
+    on peers (server)
+    comment 'The Index for the peer''s server';
+
+create index registered_peers_updated_index
+    on peers (updated)
+    comment 'The Index for the update column';
+
+create index registered_peers_username_index
+    on peers (username)
+    comment 'The index for the registered username';
+
diff --git a/src/Socialbox/Classes/Resources/database/registered_peers.sql b/src/Socialbox/Classes/Resources/database/registered_peers.sql
deleted file mode 100644
index 59e1914..0000000
--- a/src/Socialbox/Classes/Resources/database/registered_peers.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-create table registered_peers
-(
-    uuid       varchar(36) default uuid()              not null comment 'The Primary index for the peer uuid'
-        primary key,
-    username   varchar(255)                            not null comment 'The Unique username associated with the peer',
-    flags      text                                    null comment 'Comma seprted flags associated with the peer',
-    registered timestamp   default current_timestamp() not null comment 'The Timestamp for when the peer was registered on the network',
-    constraint registered_peers_pk_2
-        unique (username) comment 'The unique username for the peer',
-    constraint registered_peers_username_uindex
-        unique (username) comment 'The unique username for the peer',
-    constraint registered_peers_uuid_uindex
-        unique (uuid) comment 'The Primary index for the peer uuid'
-)
-    comment 'Table for housing registered peers under this network';
-
-create index registered_peers_registered_index
-    on registered_peers (registered)
-    comment 'The Index for the reigstered column of the peer';
-
diff --git a/src/Socialbox/Classes/Resources/database/resolved_dns_records.sql b/src/Socialbox/Classes/Resources/database/resolved_dns_records.sql
new file mode 100644
index 0000000..57f95bf
--- /dev/null
+++ b/src/Socialbox/Classes/Resources/database/resolved_dns_records.sql
@@ -0,0 +1,19 @@
+create table resolved_dns_records
+(
+    domain       varchar(512)                          not null comment 'Unique Index for the server domain'
+        primary key,
+    rpc_endpoint text                                  not null comment 'The endpoint of the RPC server',
+    public_key   text                                  not null comment 'The Public Key of the server',
+    expires      bigint                                not null comment 'The Unix Timestamp for when the server''s keypair expires',
+    updated      timestamp default current_timestamp() not null comment 'The Timestamp for when this record was last updated',
+    constraint resolved_dns_records_domain_uindex
+        unique (domain) comment 'Unique Index for the server domain',
+    constraint resolved_dns_records_pk
+        unique (domain) comment 'Unique Index for the server domain'
+)
+    comment 'A table for housing DNS resolutions';
+
+create index resolved_dns_records_updated_index
+    on resolved_dns_records (updated)
+    comment 'The index for the updated column';
+
diff --git a/src/Socialbox/Classes/Resources/database/sessions.sql b/src/Socialbox/Classes/Resources/database/sessions.sql
index 6c247b4..397a44d 100644
--- a/src/Socialbox/Classes/Resources/database/sessions.sql
+++ b/src/Socialbox/Classes/Resources/database/sessions.sql
@@ -1,21 +1,31 @@
 create table sessions
 (
-    uuid                    varchar(36)                          default uuid()              not null comment 'The Unique Primary index for the session UUID'
+    uuid                            varchar(36)                                          default uuid()              not null comment 'The Unique Primary index for the session UUID'
         primary key,
-    authenticated_peer_uuid varchar(36)                                                      null comment 'The peer the session is authenticated as, null if the session isn''t authenticated',
-    public_key              blob                                                             not null comment 'The client''s public key provided when creating the session',
-    state                   enum ('ACTIVE', 'EXPIRED', 'CLOSED') default 'ACTIVE'            not null comment 'The status of the session',
-    created                 timestamp                            default current_timestamp() not null comment 'The Timestamp for when the session was last created',
-    last_request            timestamp                                                        null comment 'The Timestamp for when the last request was made using this session',
+    peer_uuid                       varchar(36)                                                                      not null comment 'The peer the session is identified as, null if the session isn''t identified as a peer',
+    client_name                     varchar(256)                                                                     not null comment 'The name of the client that is using this session',
+    client_version                  varchar(16)                                                                      not null comment 'The version of the client',
+    authenticated                   tinyint(1)                                           default 0                   not null comment 'Indicates if the session is currently authenticated as the peer',
+    client_public_signing_key       varchar(64)                                                                      not null comment 'The client''s public signing key used for signing decrypted messages',
+    client_public_encryption_key    varchar(64)                                                                      not null comment 'The Public Key of the client''s encryption key',
+    server_public_encryption_key    varchar(64)                                                                      not null comment 'The server''s public encryption key for this session',
+    server_private_encryption_key   varchar(64)                                                                      not null comment 'The server''s private encryption key for this session',
+    private_shared_secret           varchar(64)                                                                      null comment 'The shared secret encryption key between the Client & Server',
+    client_transport_encryption_key varchar(64)                                                                      null comment 'The encryption key for sending messages to the client',
+    server_transport_encryption_key varchar(64)                                                                      null comment 'The encryption key for sending messages to the server',
+    state                           enum ('AWAITING_DHE', 'ACTIVE', 'CLOSED', 'EXPIRED') default 'AWAITING_DHE'      not null comment 'The status of the session',
+    flags                           text                                                                             null comment 'The current flags that is set to the session',
+    created                         timestamp                                            default current_timestamp() not null comment 'The Timestamp for when the session was last created',
+    last_request                    timestamp                                                                        null comment 'The Timestamp for when the last request was made using this session',
     constraint sessions_uuid_uindex
         unique (uuid) comment 'The Unique Primary index for the session UUID',
     constraint sessions_registered_peers_uuid_fk
-        foreign key (authenticated_peer_uuid) references registered_peers (uuid)
+        foreign key (peer_uuid) references peers (uuid)
             on update cascade on delete cascade
 );
 
 create index sessions_authenticated_peer_index
-    on sessions (authenticated_peer_uuid)
+    on sessions (peer_uuid)
     comment 'The Index for the authenticated peer column';
 
 create index sessions_created_index
diff --git a/src/Socialbox/Classes/Resources/database/signing_keys.sql b/src/Socialbox/Classes/Resources/database/signing_keys.sql
new file mode 100644
index 0000000..9184a57
--- /dev/null
+++ b/src/Socialbox/Classes/Resources/database/signing_keys.sql
@@ -0,0 +1,32 @@
+create table signing_keys
+(
+    peer_uuid  varchar(36)                                            not null comment 'The UUID of the peer',
+    uuid       varchar(36)                default uuid()              not null comment 'The UUID of the key record',
+    name       varchar(64)                                            not null comment 'Optional. User provided name for the key',
+    public_key varchar(64)                                            not null comment 'The Public Signature Key',
+    state      enum ('ACTIVE', 'EXPIRED') default 'ACTIVE'            not null comment 'The state of the public key',
+    expires    timestamp                                              null comment 'The Timestamp for when this key expires, null = Never expires',
+    created    timestamp                  default current_timestamp() not null comment 'The Timestamp for when the signing key record was created',
+    primary key (peer_uuid, uuid) comment 'The Unique Index pair for the signing key name and the UUID of the peer',
+    constraint signing_keys_peer_uuid_uuid_uindex
+        unique (peer_uuid, uuid) comment 'The Unique Index pair for the signing key name and the UUID of the peer',
+    constraint signing_keys_pk
+        unique (peer_uuid, uuid) comment 'The Unique Index pair for the signing key name and the UUID of the peer',
+    constraint signing_keys_registered_peers_uuid_fk
+        foreign key (peer_uuid) references peers (uuid)
+            on update cascade on delete cascade
+)
+    comment 'Table for housing public signing keys for peers on the network';
+
+create index signing_keys_peer_uuid_index
+    on signing_keys (peer_uuid)
+    comment 'The primary index for the peer UUID column';
+
+create index signing_keys_state_index
+    on signing_keys (state)
+    comment 'Signing key state index';
+
+create index signing_keys_uuid_index
+    on signing_keys (uuid)
+    comment 'The index for the signing key namee';
+
diff --git a/src/Socialbox/Classes/Resources/database/variables.sql b/src/Socialbox/Classes/Resources/database/variables.sql
index 29b865d..48dbd01 100644
--- a/src/Socialbox/Classes/Resources/database/variables.sql
+++ b/src/Socialbox/Classes/Resources/database/variables.sql
@@ -1,11 +1,12 @@
 create table variables
 (
-    name        varchar(255)                           not null comment 'The name of the variable'
-        primary key comment 'The unique index for the variable name',
-    value       text                                   null comment 'The value of the variable',
-    `read_only` tinyint(1) default 0                   not null comment 'Boolean indicator if the variable is read only',
-    created     timestamp  default current_timestamp() not null comment 'The Timestamp for when this record was created',
-    updated     timestamp                              null comment 'The Timestamp for when this record was last updated',
+    name      varchar(255)                           not null comment 'The unique index for the variable name'
+        primary key,
+    value     text                                   null comment 'The value of the variable',
+    read_only tinyint(1) default 0                   not null comment 'Boolean indicator if the variable is read only',
+    created   timestamp  default current_timestamp() not null comment 'The Timestamp for when this record was created',
+    updated   timestamp                              null comment 'The Timestamp for when this record was last updated',
     constraint variables_name_uindex
         unique (name) comment 'The unique index for the variable name'
-);
\ No newline at end of file
+);
+
diff --git a/src/Socialbox/Classes/Resources/documents/community_guidelines.html b/src/Socialbox/Classes/Resources/documents/community_guidelines.html
new file mode 100644
index 0000000..2e08c36
--- /dev/null
+++ b/src/Socialbox/Classes/Resources/documents/community_guidelines.html
@@ -0,0 +1 @@
+<h1>Community Guidelines</h1>
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Resources/documents/privacy.html b/src/Socialbox/Classes/Resources/documents/privacy.html
new file mode 100644
index 0000000..e1cae66
--- /dev/null
+++ b/src/Socialbox/Classes/Resources/documents/privacy.html
@@ -0,0 +1,2 @@
+<h1>Privacy Policy Document</h1>
+<p>This is where the privacy policy document would reside in</p>
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Resources/documents/tos.html b/src/Socialbox/Classes/Resources/documents/tos.html
new file mode 100644
index 0000000..721e8dc
--- /dev/null
+++ b/src/Socialbox/Classes/Resources/documents/tos.html
@@ -0,0 +1,2 @@
+<h1>Terms of Service Document</h1>
+<p>This is where the Terms of Service document would reside</p>
\ No newline at end of file
diff --git a/src/Socialbox/Classes/RpcClient.php b/src/Socialbox/Classes/RpcClient.php
index 31dbcc0..f65c850 100644
--- a/src/Socialbox/Classes/RpcClient.php
+++ b/src/Socialbox/Classes/RpcClient.php
@@ -2,87 +2,915 @@
 
     namespace Socialbox\Classes;
 
-    use Socialbox\Classes\ServerResolver;
+    use InvalidArgumentException;
+    use Socialbox\Enums\StandardError;
     use Socialbox\Enums\StandardHeaders;
+    use Socialbox\Enums\Types\RequestType;
+    use Socialbox\Exceptions\CryptographyException;
+    use Socialbox\Exceptions\DatabaseOperationException;
     use Socialbox\Exceptions\ResolutionException;
-    use Socialclient\Exceptions\RpcRequestException;
+    use Socialbox\Exceptions\RpcException;
+    use Socialbox\Objects\Client\EncryptionChannelSecret;
+    use Socialbox\Objects\Client\ExportedSession;
+    use Socialbox\Objects\Client\SignatureKeyPair;
+    use Socialbox\Objects\KeyPair;
+    use Socialbox\Objects\PeerAddress;
+    use Socialbox\Objects\RpcRequest;
+    use Socialbox\Objects\RpcResult;
+    use Socialbox\Objects\Standard\ServerInformation;
 
     class RpcClient
     {
+        private \LogLib2\Logger $logger;
+
         private const string CLIENT_NAME = 'Socialbox PHP';
         private const string CLIENT_VERSION = '1.0';
-        private const string CONTENT_TYPE = 'application/json';
-
-        private string $domain;
-        private string $endpoint;
-        private string $serverPublicKey;
 
+        private PeerAddress $identifiedAs;
+        private string $serverPublicSigningKey;
+        private string $serverPublicEncryptionKey;
+        private KeyPair $clientSigningKeyPair;
+        private KeyPair $clientEncryptionKeyPair;
+        private string $privateSharedSecret;
+        private string $clientTransportEncryptionKey;
+        private string $serverTransportEncryptionKey;
+        private ServerInformation $serverInformation;
+        private string $rpcEndpoint;
+        private string $remoteServer;
+        private string $sessionUuid;
+        private ?string $defaultSigningKey;
+        private array $signingKeys;
+        /**
+         * @var EncryptionChannelSecret[]
+         */
+        private array $encryptionChannelSecrets;
 
         /**
-         * @throws ResolutionException
+         * Constructs a new instance with the specified peer address.
+         *
+         * @param string|PeerAddress $identifiedAs The peer address to be used for the instance (eg; johndoe@example.com)
+         * @param string|null $server Optional. The domain of the server to connect to if different from the identified
+         * @param ExportedSession|null $exportedSession Optional. An exported session to be used to re-connect.
+         * @throws CryptographyException If there is an error in the cryptographic operations.
+         * @throws ResolutionException If there is an error in the resolution process.
+         * @throws RpcException If there is an error in the RPC request or if no response is received.
+         * @throws DatabaseOperationException If there is an error in the database operation.
          */
-        public function __construct(string $domain)
+        public function __construct(string|PeerAddress $identifiedAs, ?string $server=null, ?ExportedSession $exportedSession=null)
         {
-            $resolved = ServerResolver::resolveDomain($domain);
+            $this->logger = new \LogLib2\Logger('net.nosial.socialbox');
 
-            $this->domain = $domain;
-            $this->endpoint = $resolved->getEndpoint();
-            $this->serverPublicKey = $resolved->getPublicKey();
-            $this->clientPrivateKey = null;
+            // If an exported session is provided, no need to re-connect.
+            // Just use the session details provided.
+            if($exportedSession !== null)
+            {
+                // Check if the server keypair has expired from the exported session
+                if($exportedSession->getServerKeypairExpires() > 0 && time() > $exportedSession->getServerKeypairExpires())
+                {
+                    throw new RpcException('The server keypair has expired, a new session must be created');
+                }
+
+                $this->identifiedAs = PeerAddress::fromAddress($exportedSession->getPeerAddress());
+                $this->rpcEndpoint = $exportedSession->getRpcEndpoint();
+                $this->remoteServer = $exportedSession->getRemoteServer();
+                $this->sessionUuid = $exportedSession->getSessionUuid();
+                $this->serverPublicSigningKey = $exportedSession->getServerPublicSigningKey();
+                $this->serverPublicEncryptionKey = $exportedSession->getServerPublicEncryptionKey();
+                $this->clientSigningKeyPair = new KeyPair($exportedSession->getClientPublicSigningKey(), $exportedSession->getClientPrivateSigningKey());
+                $this->clientEncryptionKeyPair = new KeyPair($exportedSession->getClientPublicEncryptionKey(), $exportedSession->getClientPrivateEncryptionKey());
+                $this->privateSharedSecret = $exportedSession->getPrivateSharedSecret();
+                $this->clientTransportEncryptionKey = $exportedSession->getClientTransportEncryptionKey();
+                $this->serverTransportEncryptionKey = $exportedSession->getServerTransportEncryptionKey();
+                $this->signingKeys = $exportedSession->getSigningKeys();
+                $this->defaultSigningKey = $exportedSession->getDefaultSigningKey();
+                $this->encryptionChannelSecrets = $exportedSession->getEncryptionChannelSecrets();
+
+                // Still solve the server information
+                $this->serverInformation = self::getServerInformation();
+
+                // Check if the active keypair has expired
+                if($this->serverInformation->getServerKeypairExpires() > 0 && time() > $this->serverInformation->getServerKeypairExpires())
+                {
+                    // TODO: Could be auto-resolved
+                    throw new RpcException('The server keypair has expired but the server has not provided a new keypair, contact the server administrator');
+                }
+
+                // Check if the transport encryption algorithm has changed
+                if($this->serverInformation->getTransportEncryptionAlgorithm() !== $exportedSession->getTransportEncryptionAlgorithm())
+                {
+                    // TODO: Could be auto-resolved
+                    throw new RpcException('The server has changed its transport encryption algorithm, a new session must be created, old algorithm: ' . $exportedSession->getTransportEncryptionAlgorithm() . ', new algorithm: ' . $this->serverInformation->getTransportEncryptionAlgorithm());
+                }
+
+                return;
+            }
+
+            // If the peer address is a string, we need to convert it to a PeerAddress object
+            if(is_string($identifiedAs))
+            {
+                $identifiedAs = PeerAddress::fromAddress($identifiedAs);
+            }
+
+            // Set the initial properties
+            $this->signingKeys = [];
+            $this->encryptionChannelSecrets = [];
+            $this->defaultSigningKey = null;
+            $this->identifiedAs = $identifiedAs;
+            $this->remoteServer = $server ?? $identifiedAs->getDomain();
+
+            // Resolve the domain and get the server's Public Key & RPC Endpoint
+            $resolvedServer = ServerResolver::resolveDomain($this->remoteServer, false);
+
+            // Import the RPC Endpoint & the server's public key.
+            $this->serverPublicSigningKey = $resolvedServer->getPublicSigningKey();
+            $this->rpcEndpoint = $resolvedServer->getRpcEndpoint();
+
+            if(empty($this->serverPublicSigningKey))
+            {
+                throw new ResolutionException('Failed to resolve domain: No public key found for the server');
+            }
+
+            // Resolve basic server information
+            $this->serverInformation = self::getServerInformation();
+
+            // Check if the server keypair has expired
+            if($this->serverInformation->getServerKeypairExpires() > 0 && time() > $this->serverInformation->getServerKeypairExpires())
+            {
+                throw new RpcException('The server keypair has expired but the server has not provided a new keypair, contact the server administrator');
+            }
+
+            // If the username is `host` and the domain is the same as this server's domain, we use our signing keypair
+            // Essentially this is a special case for the server to contact another server
+            if($this->identifiedAs->isHost())
+            {
+                $this->clientSigningKeyPair = new KeyPair(Configuration::getCryptographyConfiguration()->getHostPublicKey(), Configuration::getCryptographyConfiguration()->getHostPrivateKey());
+            }
+            // Otherwise we generate a random signing keypair
+            else
+            {
+                $this->clientSigningKeyPair = Cryptography::generateSigningKeyPair();
+            }
+
+            // Always use a random encryption keypair
+            $this->clientEncryptionKeyPair = Cryptography::generateEncryptionKeyPair();
+
+            // Create a session with the server, with the method we obtain the Session UUID
+            // And the server's public encryption key.
+            $this->createSession();
+
+            // Generate a transport encryption key on our end using the server's preferred algorithm
+            $this->clientTransportEncryptionKey = Cryptography::generateEncryptionKey($this->serverInformation->getTransportEncryptionAlgorithm());
+
+            // Preform the DHE so that transport encryption keys can be exchanged
+            $this->sendDheExchange();
         }
 
-        public function getDomain(): string
+        /**
+         * Initiates a new session with the server and retrieves the session UUID.
+         *
+         * @throws RpcException If the session cannot be created, if the server does not provide a valid response,
+         *                      or critical headers like encryption public key are missing in the server's response.
+         * @return void
+         */
+        private function createSession(): void
         {
-            return $this->domain;
-        }
+            $ch = curl_init();
+            $headers = [
+                StandardHeaders::REQUEST_TYPE->value . ': ' . RequestType::INITIATE_SESSION->value,
+                StandardHeaders::CLIENT_NAME->value . ': ' . self::CLIENT_NAME,
+                StandardHeaders::CLIENT_VERSION->value . ': ' . self::CLIENT_VERSION,
+                StandardHeaders::IDENTIFY_AS->value . ': ' . $this->identifiedAs->getAddress(),
+                // Always provide our generated encrypted public key
+                StandardHeaders::ENCRYPTION_PUBLIC_KEY->value . ': ' . $this->clientEncryptionKeyPair->getPublicKey()
+            ];
 
-        public function getEndpoint(): string
-        {
-            return $this->endpoint;
-        }
-
-        public function getServerPublicKey(): string
-        {
-            return $this->serverPublicKey;
-        }
-
-        public function sendRequest(array $data)
-        {
-            $ch = curl_init($this->endpoint);
+            // If we're not connecting as the host, we need to provide our public key
+            // Otherwise, the server will obtain the public key itself from DNS records rather than trusting the client
+            if(!$this->identifiedAs->isHost())
+            {
+                $headers[] = StandardHeaders::SIGNING_PUBLIC_KEY->value . ': ' . $this->clientSigningKeyPair->getPublicKey();
+            }
 
+            $responseHeaders = [];
+            curl_setopt($ch, CURLOPT_URL, $this->rpcEndpoint);
+            curl_setopt($ch, CURLOPT_HTTPGET, true);
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-            curl_setopt($ch, CURLOPT_POST, true);
-            curl_setopt($ch, CURLOPT_POSTFIELDS, Utilities::jsonEncode($data));
-            curl_setopt($ch, CURLOPT_HTTPHEADER, [
-                Utilities::generateHeader(StandardHeaders::CLIENT_NAME, self::CLIENT_NAME),
-                Utilities::generateHeader(StandardHeaders::CLIENT_VERSION, self::CLIENT_VERSION),
-                Utilities::generateHeader(StandardHeaders::CONTENT_TYPE, self::CONTENT_TYPE)
-            ]);
-            curl_setopt($ch, CURLOPT_HEADER, true);
+            // Capture the response headers to get the encryption public key
+            curl_setopt($ch, CURLOPT_HEADERFUNCTION, function($curl, $header) use (&$responseHeaders)
+            {
+                $len = strlen($header);
+                $header = explode(':', $header, 2);
+                if (count($header) < 2) // ignore invalid headers
+                {
+                    return $len;
+                }
+
+                $responseHeaders[strtolower(trim($header[0]))][] = trim($header[1]);
+                return $len;
+            });
+            curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+
+            $this->logger->debug(sprintf('Creating session with %s', $this->rpcEndpoint));
+            $this->logger->debug(sprintf('Headers: %s', json_encode($headers)));
+            $this->logger->debug(sprintf('Client Encryption Public Key: %s', $this->clientEncryptionKeyPair->getPublicKey()));
+            $this->logger->debug(sprintf('Client Signing Public Key: %s', $this->clientSigningKeyPair->getPublicKey()));
+            $this->logger->debug(sprintf('Identified As: %s', $this->identifiedAs->getAddress()));
 
             $response = curl_exec($ch);
 
-            if (curl_errno($ch))
+            // If the response is false, the request failed
+            if($response === false)
             {
-                $statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-
-                // Separate headers and body
-                $header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
-                $response_body = substr($response, $header_size);
-
                 curl_close($ch);
-
-                // Throw exception with response body as message and status code as code
-                throw new RpcRequestException($response_body, $statusCode);
+                throw new RpcException(sprintf('Failed to create the session at %s, no response received', $this->rpcEndpoint));
             }
 
-            $statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+            // If the response code is not 201, the request failed
+            $responseCode = curl_getinfo($ch, CURLINFO_RESPONSE_CODE);
+            if($responseCode !== 201)
+            {
+                curl_close($ch);
 
-            // Separate headers and body
-            $header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
-            $response_headers = substr($response, 0, $header_size);
-            $response_body = substr($response, $header_size);
+                if(empty($response))
+                {
+                    throw new RpcException(sprintf('Failed to create the session at %s, server responded with ' . $responseCode, $this->rpcEndpoint));
+                }
+
+                throw new RpcException(sprintf('Failed to create the session at %s, server responded with ' . $responseCode . ': ' . $response, $this->rpcEndpoint));
+            }
+
+            // If the response is empty, the server did not provide a session UUID
+            if(empty($response))
+            {
+                curl_close($ch);
+                throw new RpcException(sprintf('Failed to create the session at %s, server did not return a session UUID', $this->rpcEndpoint));
+            }
+
+            // Get the Encryption Public Key from the server's response headers
+            $serverPublicEncryptionKey = $responseHeaders[strtolower(StandardHeaders::ENCRYPTION_PUBLIC_KEY->value)][0] ?? null;
+
+            // null check
+            if($serverPublicEncryptionKey === null)
+            {
+                curl_close($ch);
+                throw new RpcException('Failed to create session at %s, the server did not return a public encryption key');
+            }
+
+            $this->logger->debug(sprintf('Server Encryption Public Key: %s', $serverPublicEncryptionKey));
+
+            // Validate the server's encryption public key
+            if(!Cryptography::validatePublicEncryptionKey($serverPublicEncryptionKey))
+            {
+                curl_close($ch);
+                throw new RpcException('The server did not provide a valid encryption public key');
+            }
+
+            // If the server did not provide an encryption public key, the response is invalid
+            // We can't preform the DHE without the server's encryption key.
+            if ($serverPublicEncryptionKey === null)
+            {
+                curl_close($ch);
+                throw new RpcException('The server did not provide a signature for the response');
+            }
 
             curl_close($ch);
+            $this->logger->debug(sprintf('Session UUID: %s', $response));
+
+            // Set the server's encryption key
+            $this->serverPublicEncryptionKey = $serverPublicEncryptionKey;
+            // Set the session UUID
+            $this->sessionUuid = $response;
+        }
+
+        /**
+         * Sends a Diffie-Hellman Ephemeral (DHE) exchange request to the server.
+         *
+         * @throws RpcException If the encryption or the request fails.
+         */
+        private function sendDheExchange(): void
+        {
+            // First preform the DHE
+            try
+            {
+                $this->privateSharedSecret = Cryptography::performDHE($this->serverPublicEncryptionKey, $this->clientEncryptionKeyPair->getPrivateKey());
+            }
+            catch(CryptographyException $e)
+            {
+                throw new RpcException('Failed to preform DHE: ' . $e->getMessage(), StandardError::CRYPTOGRAPHIC_ERROR->value, $e);
+            }
+
+            // Request body should contain the encrypted key, the client's public key, and the session UUID
+            // Upon success the server should return 204 without a body
+            try
+            {
+                $encryptedKey = Cryptography::encryptShared($this->clientTransportEncryptionKey, $this->privateSharedSecret);
+                $signature = Cryptography::signMessage($this->clientTransportEncryptionKey, $this->clientSigningKeyPair->getPrivateKey());
+            }
+            catch (CryptographyException $e)
+            {
+                throw new RpcException('Failed to encrypt DHE exchange data', StandardError::CRYPTOGRAPHIC_ERROR->value, $e);
+            }
+
+            $ch = curl_init();
+            curl_setopt($ch, CURLOPT_URL, $this->rpcEndpoint);
+            curl_setopt($ch, CURLOPT_POST, true);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+            curl_setopt($ch, CURLOPT_HTTPHEADER, [
+                StandardHeaders::REQUEST_TYPE->value . ': ' . RequestType::DHE_EXCHANGE->value,
+                StandardHeaders::SESSION_UUID->value . ': ' . $this->sessionUuid,
+                StandardHeaders::SIGNATURE->value . ': ' . $signature
+            ]);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $encryptedKey);
+
+            $response = curl_exec($ch);
+
+            if($response === false)
+            {
+                curl_close($ch);
+                throw new RpcException('Failed to send DHE exchange, no response received', StandardError::CRYPTOGRAPHIC_ERROR->value);
+            }
+
+            $responseCode = curl_getinfo($ch, CURLINFO_RESPONSE_CODE);
+            if($responseCode !== 200)
+            {
+                curl_close($ch);
+                throw new RpcException('Failed to send DHE exchange, server responded with ' . $responseCode . ': ' . $response, StandardError::CRYPTOGRAPHIC_ERROR->value);
+            }
+
+            try
+            {
+                $this->serverTransportEncryptionKey = Cryptography::decryptShared($response, $this->privateSharedSecret);
+            }
+            catch(CryptographyException $e)
+            {
+                throw new RpcException('Failed to decrypt DHE exchange data', 0, $e);
+            }
+            finally
+            {
+                curl_close($ch);
+            }
+        }
+
+        /**
+         * Sends an RPC request with the given JSON data.
+         *
+         * @param string $jsonData The JSON data to be sent in the request.
+         * @param string|null $identifiedAs Optional. The username to identify as, usually the requesting peer. Required for server-to-server communication.
+         * @return RpcResult[] An array of RpcResult objects.
+         * @throws RpcException If the request fails, the response is invalid, or the decryption/signature verification fails.
+         */
+        public function sendRawRequest(string $jsonData, ?string $identifiedAs=null): array
+        {
+            try
+            {
+                $encryptedData = Cryptography::encryptMessage(
+                    message: $jsonData,
+                    encryptionKey: $this->serverTransportEncryptionKey,
+                    algorithm: $this->serverInformation->getTransportEncryptionAlgorithm()
+                );
+
+                $signature = Cryptography::signMessage(
+                    message: $jsonData,
+                    privateKey: $this->clientSigningKeyPair->getPrivateKey(),
+                );
+            }
+            catch (CryptographyException $e)
+            {
+                throw new RpcException('Failed to encrypt request data: ' . $e->getMessage(), 0, $e);
+            }
+
+            $ch = curl_init();
+            $returnHeaders = [];
+            $headers = [
+                StandardHeaders::REQUEST_TYPE->value . ': ' . RequestType::RPC->value,
+                StandardHeaders::SESSION_UUID->value . ': ' . $this->sessionUuid,
+                StandardHeaders::SIGNATURE->value . ': ' . $signature
+            ];
+
+            if($identifiedAs)
+            {
+                $headers[] = StandardHeaders::IDENTIFY_AS->value . ': ' . $identifiedAs;
+            }
+
+            curl_setopt($ch, CURLOPT_URL, $this->rpcEndpoint);
+            curl_setopt($ch, CURLOPT_POST, true);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+            curl_setopt($ch, CURLOPT_HEADERFUNCTION, function($curl, $header) use (&$returnHeaders)
+            {
+                $len = strlen($header);
+                $header = explode(':', $header, 2);
+                if (count($header) < 2) // ignore invalid returnHeaders
+                {
+                    return $len;
+                }
+
+                $returnHeaders[strtolower(trim($header[0]))][] = trim($header[1]);
+                return $len;
+            });
+            curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $encryptedData);
+
+            $this->logger->debug(sprintf('Sending RPC request to %s', $this->rpcEndpoint));
+            $this->logger->debug(sprintf('Headers: %s', json_encode($headers)));
+            $this->logger->debug(sprintf('Encrypted Data Size: %d', strlen($encryptedData)));
+            $this->logger->debug(sprintf('Request Signature: %s', $signature));
+
+            $response = curl_exec($ch);
+
+            if ($response === false)
+            {
+                curl_close($ch);
+                throw new RpcException('Failed to send request, no response received');
+            }
+
+            $responseCode = curl_getinfo($ch, CURLINFO_RESPONSE_CODE);
+            $responseString = $response;
+
+            if (!Utilities::isSuccessCodes($responseCode))
+            {
+                curl_close($ch);
+                if (!empty($responseString))
+                {
+                    throw new RpcException($responseString);
+                }
+
+                throw new RpcException('Failed to send request (Empty Response): ' . $responseCode);
+            }
+
+            if ($responseCode == 204)
+            {
+                curl_close($ch);
+                return [];
+            }
+
+            if (empty($responseString))
+            {
+                curl_close($ch);
+                throw new RpcException('The request was successful but the server did not indicate an empty response');
+            }
+
+            curl_close($ch);
+            $this->logger->debug(sprintf('Encrypted Response Size: %d', strlen($responseString)));
+
+            try
+            {
+                $decryptedResponse = Cryptography::decryptMessage(
+                    encryptedMessage: $responseString,
+                    encryptionKey: $this->clientTransportEncryptionKey,
+                    algorithm: $this->serverInformation->getTransportEncryptionAlgorithm()
+                );
+                $this->logger->debug(sprintf('Decrypted Response: %s', $decryptedResponse));
+            }
+            catch (CryptographyException $e)
+            {
+                throw new RpcException('Failed to decrypt response: ' . $e->getMessage(), 0, $e);
+            }
+
+            $signature = $returnHeaders[strtolower(StandardHeaders::SIGNATURE->value)][0] ?? null;
+            $this->logger->debug(sprintf('Response Signature: %s', $signature));
+            if ($signature === null)
+            {
+                throw new RpcException('The server did not provide a signature for the response');
+            }
+
+            try
+            {
+                if(!Cryptography::verifyMessage(
+                    message: $decryptedResponse,
+                    signature: $signature,
+                    publicKey: $this->serverPublicSigningKey,
+                ))
+                {
+                    throw new RpcException('Failed to verify the response signature');
+                }
+            }
+            catch (CryptographyException $e)
+            {
+                throw new RpcException('Failed to verify the response signature: ' . $e->getMessage(), 0, $e);
+            }
+
+            $decoded = json_decode($decryptedResponse, true);
+            if(isset($decoded['id']))
+            {
+                return [new RpcResult($decoded)];
+            }
+            else
+            {
+                $results = [];
+                foreach ($decoded as $responseMap)
+                {
+                    $results[] = new RpcResult($responseMap);
+                }
+                return $results;
+            }
+        }
+
+        /**
+         * Retrieves server information by making an RPC request.
+         *
+         * @return ServerInformation The parsed server information received in the response.
+         * @throws RpcException If the request fails, no response is received, or the server returns an error status code or invalid data.
+         */
+        public function getServerInformation(): ServerInformation
+        {
+            $ch = curl_init();
+            $headers = [
+                StandardHeaders::REQUEST_TYPE->value . ': ' . RequestType::INFO->value,
+                StandardHeaders::CLIENT_NAME->value . ': ' . self::CLIENT_NAME,
+                StandardHeaders::CLIENT_VERSION->value . ': ' . self::CLIENT_VERSION,
+            ];
+
+            curl_setopt($ch, CURLOPT_URL, $this->rpcEndpoint);
+            curl_setopt($ch, CURLOPT_HTTPGET, true);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+            curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+
+            $this->logger->debug(sprintf('Getting server information from %s', $this->rpcEndpoint));
+            $this->logger->debug(sprintf('Headers: %s', json_encode($headers)));
+            $response = curl_exec($ch);
+
+            if($response === false)
+            {
+                curl_close($ch);
+                throw new RpcException(sprintf('Failed to get server information at %s, no response received', $this->rpcEndpoint));
+            }
+
+            $responseCode = curl_getinfo($ch, CURLINFO_RESPONSE_CODE);
+            if($responseCode !== 200)
+            {
+                curl_close($ch);
+
+                if(empty($response))
+                {
+                    throw new RpcException(sprintf('Failed to get server information at %s, server responded with ' . $responseCode, $this->rpcEndpoint));
+                }
+            }
+
+            curl_close($ch);
+            return ServerInformation::fromArray(json_decode($response, true));
+        }
+
+        /**
+         * Sends an RPC request and retrieves the corresponding RPC response.
+         *
+         * @param RpcRequest $request The RPC request to be sent.
+         * @param bool $throwException Optional. Whether to throw an exception if the response contains an error.
+         * @param string|null $identifiedAs Optional. The username to identify as, usually the requesting peer. Required for server-to-server communication.
+         * @return RpcResult The received RPC response.
+         * @throws RpcException If no response is received from the request.
+         */
+        public function sendRequest(RpcRequest $request, bool $throwException=true, ?string $identifiedAs=null): RpcResult
+        {
+            $response = $this->sendRawRequest(json_encode($request->toArray()), $identifiedAs);
+
+            if (count($response) === 0)
+            {
+                throw new RpcException('Failed to send request, no response received');
+            }
+
+            if($throwException)
+            {
+                if($response[0]->getError() !== null)
+                {
+                    throw $response[0]->getError()->toRpcException();
+                }
+            }
+
+            return $response[0];
+        }
+
+        /**
+         * Sends a batch of requests to the server, processes them into an appropriate format,
+         * and handles the response.
+         *
+         * @param RpcRequest[] $requests An array of RpcRequest objects to be sent to the server.
+         * @param string|null $identifiedAs Optional. The username to identify as, usually the requesting peer. Required for server-to-server communication.
+         * @return RpcResult[] An array of RpcResult objects received from the server.
+         * @throws RpcException If no response is received from the server.
+         */
+        public function sendRequests(array $requests, ?string $identifiedAs=null): array
+        {
+            $parsedRequests = [];
+            foreach ($requests as $request)
+            {
+                $parsedRequests[] = $request->toArray();
+            }
+
+            $responses = $this->sendRawRequest(json_encode($parsedRequests), $identifiedAs);
+
+            if (count($responses) === 0)
+            {
+                return [];
+            }
+
+            return $responses;
+        }
+
+        /**
+         * Retrieves the peer address identified for the instance.
+         *
+         * @return PeerAddress The identified peer address.
+         */
+        public function getIdentifiedAs(): PeerAddress
+        {
+            return $this->identifiedAs;
+        }
+
+        /**
+         * Retrieves the server's public signing key.
+         *
+         * @return string The server's public signing key.
+         */
+        public function getServerPublicSigningKey(): string
+        {
+            return $this->serverPublicSigningKey;
+        }
+
+        /**
+         * Retrieves the server's public encryption key.
+         *
+         * @return string The public encryption key of the server.
+         */
+        public function getServerPublicEncryptionKey(): string
+        {
+            return $this->serverPublicEncryptionKey;
+        }
+
+        /**
+         * Retrieves the client's signing key pair.
+         *
+         * @return KeyPair The client's signing key pair.
+         */
+        public function getClientSigningKeyPair(): KeyPair
+        {
+            return $this->clientSigningKeyPair;
+        }
+
+        /**
+         * Retrieves the client encryption key pair configured for the instance.
+         *
+         * @return KeyPair The client encryption key pair.
+         */
+        public function getClientEncryptionKeyPair(): KeyPair
+        {
+            return $this->clientEncryptionKeyPair;
+        }
+
+        /**
+         * Retrieves the private shared secret configured for the instance.
+         *
+         * @return string The private shared secret value.
+         */
+        public function getPrivateSharedSecret(): string
+        {
+            return $this->privateSharedSecret;
+        }
+
+        /**
+         * Retrieves the client transport encryption key configured for the instance.
+         *
+         * @return string The client transport encryption key value.
+         */
+        public function getClientTransportEncryptionKey(): string
+        {
+            return $this->clientTransportEncryptionKey;
+        }
+
+        /**
+         * Retrieves the server transport encryption key.
+         *
+         * @return string The server transport encryption key.
+         */
+        public function getServerTransportEncryptionKey(): string
+        {
+            return $this->serverTransportEncryptionKey;
+        }
+
+        /**
+         * Retrieves the RPC endpoint configured for the instance.
+         *
+         * @return string The RPC endpoint value.
+         */
+        public function getRpcEndpoint(): string
+        {
+            return $this->rpcEndpoint;
+        }
+
+        /**
+         * Retrieves the remote server address configured for the instance.
+         *
+         * @return string The remote server address.
+         */
+        public function getRemoteServer(): string
+        {
+            return $this->remoteServer;
+        }
+
+        /**
+         * Retrieves the session UUID associated with the instance.
+         *
+         * @return string The session UUID value.
+         */
+        public function getSessionUuid(): string
+        {
+            return $this->sessionUuid;
+        }
+
+        /**
+         * Returns the signing keys associated with the current instance.
+         *
+         * @return SignatureKeyPair[] The signing keys.
+         */
+        public function getSigningKeys(): array
+        {
+            return $this->signingKeys;
+        }
+
+        /**
+         * Adds a new signing key to the current instance.
+         *
+         * @param SignatureKeyPair $key The signing key to be added.
+         * @return void
+         */
+        protected function addSigningKey(SignatureKeyPair $key): void
+        {
+            $this->signingKeys[$key->getUuid()] = $key;
+
+            if($this->defaultSigningKey === null)
+            {
+                $this->defaultSigningKey = $key->getUuid();
+            }
+        }
+
+        /**
+         * @param string $uuid
+         * @return bool
+         */
+        public function signingKeyExists(string $uuid): bool
+        {
+            return isset($this->signingKeys[$uuid]);
+        }
+
+        /**
+         * Removes a signing key from the current instance.
+         *
+         * @param string $uuid The UUID of the signing key to be removed.
+         * @return void
+         */
+        protected function removeSigningKey(string $uuid): void
+        {
+            unset($this->signingKeys[$uuid]);
+
+            if($this->defaultSigningKey === $uuid)
+            {
+                $this->defaultSigningKey = null;
+            }
+        }
+
+        /**
+         * Retrieves the signing key associated with the specified UUID.
+         *
+         * @param string $uuid The UUID of the signing key to be retrieved.
+         * @return SignatureKeyPair|null The signing key associated with the UUID, or null if not found.
+         */
+        public function getSigningKey(string $uuid): ?SignatureKeyPair
+        {
+            return $this->signingKeys[$uuid] ?? null;
+        }
+
+        /**
+         * Deletes a signing key from the current instance.
+         *
+         * @param string $uuid The UUID of the signing key to be deleted.
+         * @return void
+         */
+        public function deleteSigningKey(string $uuid): void
+        {
+            unset($this->signingKeys[$uuid]);
+        }
+
+        /**
+         * Retrieves the default signing key associated with the current instance.
+         *
+         * @return SignatureKeyPair|null The default signing key.
+         */
+        public function getDefaultSigningKey(): ?SignatureKeyPair
+        {
+            return $this->signingKeys[$this->defaultSigningKey] ?? null;
+        }
+
+        /**
+         * Sets the default signing key for the current instance.
+         *
+         * @param string $uuid The UUID of the signing key to be set as default.
+         * @return void
+         */
+        public function setDefaultSigningKey(string $uuid): void
+        {
+            if(!isset($this->signingKeys[$uuid]))
+            {
+                throw new InvalidArgumentException('The specified signing key does not exist');
+            }
+
+            $this->defaultSigningKey = $uuid;
+        }
+
+        /**
+         * Retrieves the encryption channel keys associated with the current instance.
+         *
+         * @return EncryptionChannelSecret[] The encryption channel keys.
+         */
+        public function getEncryptionChannelSecrets(): array
+        {
+            return $this->encryptionChannelSecrets;
+        }
+
+        public function getEncryptionChannelSecret(string $channelUuid): ?EncryptionChannelSecret
+        {
+            return $this->encryptionChannelSecrets[$channelUuid] ?? null;
+        }
+
+        /**
+         * Adds a new encryption channel key to the current instance.
+         *
+         * @param EncryptionChannelSecret $key The encryption channel key to be added.
+         * @return void
+         */
+        public function addEncryptionChannelSecret(EncryptionChannelSecret $key): void
+        {
+            $this->encryptionChannelSecrets[$key->getChannelUuid()] = $key;
+        }
+
+        /**
+         * Removes an encryption channel key from the current instance.
+         *
+         * @param string $channelUuid The UUID of the encryption channel key to be removed.
+         * @return void
+         */
+        public function removeEncryptionChannelKey(string $channelUuid): void
+        {
+            unset($this->encryptionChannelSecrets[$channelUuid]);
+        }
+
+        /**
+         * Retrieves the encryption channel key associated with the specified UUID.
+         *
+         * @param string $channelUuid The UUID of the encryption channel key to be retrieved.
+         * @return EncryptionChannelSecret|null The encryption channel key associated with the UUID, or null if not found.
+         */
+        public function getEncryptionChannelKey(string $channelUuid): ?EncryptionChannelSecret
+        {
+            return $this->encryptionChannelSecrets[$channelUuid] ?? null;
+        }
+
+        /**
+         * Checks if an encryption channel key exists with the specified UUID.
+         *
+         * @param string $channelUuid The UUID of the encryption channel key to check.
+         * @return bool True if the encryption channel key exists, false otherwise.
+         */
+        public function encryptionChannelKeyExists(string $channelUuid): bool
+        {
+            return isset($this->encryptionChannelSecrets[$channelUuid]);
+        }
+
+        /**
+         * Deletes an encryption channel key from the current instance.
+         *
+         * @param string $channelUuid The UUID of the encryption channel key to be deleted.
+         * @return void
+         */
+        public function deleteEncryptionChannelKey(string $channelUuid): void
+        {
+            unset($this->encryptionChannelSecrets[$channelUuid]);
+        }
+
+        /**
+         * Exports the current session details into an ExportedSession object.
+         *
+         * @return ExportedSession The exported session containing session-specific details.
+         */
+        public function exportSession(): ExportedSession
+        {
+            return new ExportedSession([
+                'peer_address' => $this->identifiedAs->getAddress(),
+                'rpc_endpoint' => $this->rpcEndpoint,
+                'remote_server' => $this->remoteServer,
+                'session_uuid' => $this->sessionUuid,
+                'transport_encryption_algorithm' => $this->serverInformation->getTransportEncryptionAlgorithm(),
+                'server_keypair_expires' => $this->serverInformation->getServerKeypairExpires(),
+                'server_public_signing_key' => $this->serverPublicSigningKey,
+                'server_public_encryption_key' => $this->serverPublicEncryptionKey,
+                'client_public_signing_key' => $this->clientSigningKeyPair->getPublicKey(),
+                'client_private_signing_key' => $this->clientSigningKeyPair->getPrivateKey(),
+                'client_public_encryption_key' => $this->clientEncryptionKeyPair->getPublicKey(),
+                'client_private_encryption_key' => $this->clientEncryptionKeyPair->getPrivateKey(),
+                'private_shared_secret' => $this->privateSharedSecret,
+                'client_transport_encryption_key' => $this->clientTransportEncryptionKey,
+                'server_transport_encryption_key' => $this->serverTransportEncryptionKey,
+                'default_signing_key' => $this->defaultSigningKey,
+                'signing_keys' => array_map(fn(SignatureKeyPair $key) => $key->toArray(), $this->signingKeys),
+                'encryption_channel_secrets' => array_map(fn(EncryptionChannelSecret $key) => $key->toArray(), $this->encryptionChannelSecrets)
+            ]);
         }
     }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/RpcHandler.php b/src/Socialbox/Classes/RpcHandler.php
deleted file mode 100644
index df24724..0000000
--- a/src/Socialbox/Classes/RpcHandler.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-
-namespace Socialbox\Classes;
-
-use InvalidArgumentException;
-use RuntimeException;
-use Socialbox\Enums\StandardHeaders;
-use Socialbox\Exceptions\CryptographyException;
-use Socialbox\Exceptions\DatabaseOperationException;
-use Socialbox\Exceptions\RpcException;
-use Socialbox\Exceptions\StandardException;
-use Socialbox\Managers\SessionManager;
-use Socialbox\Objects\ClientRequest;
-use Socialbox\Objects\RpcRequest;
-
-class RpcHandler
-{
-    /**
-     * Gets the incoming ClientRequest object, validates if the request is valid & if a session UUID is provided
-     * checks if the request signature matches the client's provided public key.
-     *
-     * @return ClientRequest The parsed ClientRequest object
-     * @throws RpcException Thrown if the request is invalid
-     */
-    public static function getClientRequest(): ClientRequest
-    {
-        if($_SERVER['REQUEST_METHOD'] !== 'POST')
-        {
-            throw new RpcException('Invalid Request Method, expected POST', 400);
-        }
-
-        try
-        {
-            $headers = Utilities::getRequestHeaders();
-            foreach(StandardHeaders::getRequiredHeaders() as $header)
-            {
-                if (!isset($headers[$header]))
-                {
-                    throw new RpcException("Missing required header: $header", 400);
-                }
-
-                // Validate the headers
-                switch(StandardHeaders::tryFrom($header))
-                {
-                    case StandardHeaders::CLIENT_VERSION:
-                        if($headers[$header] !== '1.0')
-                        {
-                            throw new RpcException(sprintf("Unsupported Client Version: %s", $headers[$header]));
-                        }
-                        break;
-
-                    case StandardHeaders::CONTENT_TYPE:
-                        if(!str_contains($headers[$header], 'application/json'))
-                        {
-                            throw new RpcException(sprintf("Invalid Content-Type header: Expected application/json, got %s", $headers[$header]), 400);
-                        }
-                        break;
-
-                    case StandardHeaders::FROM_PEER:
-                        if(!Validator::validatePeerAddress($headers[$header]))
-                        {
-                            throw new RpcException("Invalid From-Peer header: " . $headers[$header], 400);
-                        }
-                        break;
-
-                    default:
-                        break;
-                }
-            }
-        }
-        catch(RuntimeException $e)
-        {
-            throw new RpcException("Failed to parse request: " . $e->getMessage(), 400, $e);
-        }
-
-        $clientRequest = new ClientRequest($headers, self::getRpcRequests(), self::getRequestHash());
-
-        // Verify the session & request signature
-        if($clientRequest->getSessionUuid() !== null)
-        {
-            // If no signature is provided, it must be required if the client is providing a Session UUID
-            if($clientRequest->getSignature() === null)
-            {
-                throw new RpcException(sprintf('Unauthorized request, signature required for session based requests'), 401);
-            }
-
-            try
-            {
-                $session = SessionManager::getSession($clientRequest->getSessionUuid());
-
-                // Verify the signature of the request
-                if(!Cryptography::verifyContent($clientRequest->getHash(), $clientRequest->getSignature(), $session->getPublicKey()))
-                {
-                    throw new RpcException('Request signature check failed', 400);
-                }
-            }
-            catch(StandardException $e)
-            {
-                throw new RpcException($e->getMessage(), 400);
-            }
-            catch(CryptographyException $e)
-            {
-                throw new RpcException('Request signature check failed (Cryptography Error)', 400, $e);
-            }
-            catch(DatabaseOperationException $e)
-            {
-                throw new RpcException('Failed to verify session', 500, $e);
-            }
-        }
-
-        return $clientRequest;
-    }
-
-    /**
-     * Returns the request hash by hashing the request body using SHA256
-     *
-     * @return string Returns the request hash in SHA256 representation
-     */
-    private static function getRequestHash(): string
-    {
-        return hash('sha1', file_get_contents('php://input'));
-    }
-
-    /**
-     * Handles a POST request, returning an array of RpcRequest objects
-     * expects a JSON encoded body with either a single RpcRequest object or an array of RpcRequest objects
-     *
-     * @return RpcRequest[] The parsed RpcRequest objects
-     * @throws RpcException Thrown if the request is invalid
-     */
-    private static function getRpcRequests(): array
-    {
-        try
-        {
-            // Decode the request body
-            $body = Utilities::jsonDecode(file_get_contents('php://input'));
-        }
-        catch(InvalidArgumentException $e)
-        {
-            throw new RpcException("Invalid JSON in request body: " . $e->getMessage(), 400, $e);
-        }
-
-        if(isset($body['method']))
-        {
-            // If it only contains a method, we assume it's a single request
-            return [self::parseRequest($body)];
-        }
-
-        // Otherwise, we assume it's an array of requests
-        return array_map(fn($request) => self::parseRequest($request), $body);
-    }
-
-    /**
-     * Parses the raw request data into an RpcRequest object
-     *
-     * @param array $data The raw request data
-     * @return RpcRequest The parsed RpcRequest object
-     * @throws RpcException If the request is invalid
-     */
-    private static function parseRequest(array $data): RpcRequest
-    {
-        if(!isset($data['method']))
-        {
-            throw new RpcException("Missing 'method' key in request", 400);
-        }
-
-        if(isset($data['id']))
-        {
-            if(!is_string($data['id']))
-            {
-                throw new RpcException("Invalid 'id' key in request: Expected string", 400);
-            }
-
-            if(strlen($data['id']) === 0)
-            {
-                throw new RpcException("Invalid 'id' key in request: Expected non-empty string", 400);
-            }
-
-            if(strlen($data['id']) > 8)
-            {
-                throw new RpcException("Invalid 'id' key in request: Expected string of length <= 8", 400);
-            }
-        }
-
-        if(isset($data['parameters']))
-        {
-            if(!is_array($data['parameters']))
-            {
-                throw new RpcException("Invalid 'parameters' key in request: Expected array", 400);
-            }
-        }
-
-        return new RpcRequest($data['method'], $data['id'] ?? null, $data['parameters'] ?? null);
-    }
-}
\ No newline at end of file
diff --git a/src/Socialbox/Classes/ServerResolver.php b/src/Socialbox/Classes/ServerResolver.php
index 58bf1ff..d2be2cf 100644
--- a/src/Socialbox/Classes/ServerResolver.php
+++ b/src/Socialbox/Classes/ServerResolver.php
@@ -1,52 +1,154 @@
 <?php
 
-namespace Socialbox\Classes;
+    namespace Socialbox\Classes;
 
-use Socialbox\Exceptions\ResolutionException;
-use Socialbox\Objects\ResolvedServer;
+    use InvalidArgumentException;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\ResolutionException;
+    use Socialbox\Managers\ResolvedDnsRecordsManager;
+    use Socialbox\Objects\DnsRecord;
 
-class ServerResolver
-{
-    /**
-     * Resolves a given domain to fetch the RPC endpoint and public key from its DNS TXT records.
-     *
-     * @param string $domain The domain to be resolved.
-     * @return ResolvedServer An instance of ResolvedServer containing the endpoint and public key.
-     * @throws ResolutionException If the DNS TXT records cannot be resolved or if required information is missing.
-     */
-    public static function resolveDomain(string $domain): ResolvedServer
+    class ServerResolver
     {
-        $txtRecords = dns_get_record($domain, DNS_TXT);
+        private static array $mockedRecords = [];
 
-        if ($txtRecords === false)
+        /**
+         * Resolves a domain by retrieving and parsing its DNS TXT records.
+         * Optionally checks a database for cached resolution data before performing a DNS query.
+         *
+         * @param string $domain The domain name to resolve.
+         * @param bool $useDatabase Whether to check the database for cached resolution data; defaults to true.
+         * @return DnsRecord The parsed DNS record for the given domain.
+         * @throws ResolutionException If the DNS TXT records cannot be retrieved or parsed.
+         * @throws DatabaseOperationException If an error occurs while interacting with the database. (Only if $useDatabase is true)
+         */
+        public static function resolveDomain(string $domain, bool $useDatabase=true): DnsRecord
         {
-            throw new ResolutionException(sprintf("Failed to resolve DNS TXT records for %s", $domain));
-        }
-
-        $endpoint = null;
-        $publicKey = null;
-        foreach ($txtRecords as $txt)
-        {
-            if (isset($txt['txt']) && str_starts_with($txt['txt'], 'socialbox='))
+            // Return the mocked record if the mocking record is set
+            if(isset(self::$mockedRecords[$domain]))
             {
-                $endpoint = substr($txt['txt'], strlen('socialbox='));
+                return self::$mockedRecords[$domain];
             }
-            elseif (isset($txt['txt']) && str_starts_with($txt['txt'], 'socialbox-key='))
+
+            // Return the mocked record from the configuration if one is set
+            if(isset(Configuration::getInstanceConfiguration()->getDnsMocks()[$domain]))
             {
-                $publicKey = substr($txt['txt'], strlen('socialbox-key='));
+                return DnsHelper::parseTxt(Configuration::getInstanceConfiguration()->getDnsMocks()[$domain]);
+            }
+
+            // Check the database if enabled
+            if ($useDatabase)
+            {
+                // Return from the database cache if one exists
+                // TODO: Implement renewal here
+                $resolvedServer = ResolvedDnsRecordsManager::getDnsRecord($domain);
+                if ($resolvedServer !== null)
+                {
+                    return $resolvedServer;
+                }
+            }
+
+            // Resolve DNS & Records
+            $txtRecords = self::dnsGetTxtRecords($domain);
+            if ($txtRecords === false)
+            {
+                throw new ResolutionException(sprintf("Failed to resolve DNS TXT records for %s", $domain));
+            }
+            $fullRecord = self::concatenateTxtRecords($txtRecords);
+
+            try
+            {
+                // Parse the TXT record using DnsHelper
+                $record = DnsHelper::parseTxt($fullRecord);
+
+                // Cache the resolved server record in the database
+                if($useDatabase)
+                {
+                    ResolvedDnsRecordsManager::addResolvedServer($domain, $record);
+                }
+
+                return $record;
+            }
+            catch (InvalidArgumentException $e)
+            {
+                throw new ResolutionException(sprintf("Failed to find valid SocialBox record for %s: %s", $domain, $e->getMessage()));
             }
         }
 
-        if ($endpoint === null)
+        /**
+         * Retrieves the TXT records for a given domain using the dns_get_record function.
+         *
+         * @param string $domain The domain name to fetch TXT records for.
+         * @return array|false An array of DNS TXT records on success, or false on failure.
+         */
+        private static function dnsGetTxtRecords(string $domain): array|false
         {
-            throw new ResolutionException(sprintf("Failed to resolve RPC endpoint for %s", $domain));
+            return @dns_get_record($domain, DNS_TXT);
         }
 
-        if ($publicKey === null)
+        /**
+         * Concatenates an array of TXT records into a single string, filtering for SocialBox records.
+         *
+         * @param array $txtRecords An array of TXT records, where each record is expected to have a 'txt' key.
+         * @return string A concatenated string of all relevant TXT records.
+         */
+        private static function concatenateTxtRecords(array $txtRecords): string
         {
-            throw new ResolutionException(sprintf("Failed to resolve public key for %s", $domain));
+            $fullRecordBuilder = '';
+            foreach ($txtRecords as $txt)
+            {
+                if (isset($txt['txt']))
+                {
+                    $record = trim($txt['txt'], '" ');
+                    // Only include records that start with v=socialbox
+                    if (stripos($record, 'v=socialbox') === 0)
+                    {
+                        $fullRecordBuilder .= $record;
+                    }
+                }
+            }
+            return $fullRecordBuilder;
         }
 
-        return new ResolvedServer($endpoint, $publicKey);
-    }
-}
\ No newline at end of file
+        /**
+         * Retrieves the mocked records.
+         *
+         * @return array The list of mocked records.
+         */
+        public static function getMockedRecords(): array
+        {
+            return self::$mockedRecords;
+        }
+
+        /**
+         * Adds a mock DNS record for a specific domain.
+         *
+         * @param string $domain The domain name for which the DNS record is being mocked.
+         * @param DnsRecord $record The DNS record to be associated with the specified domain.
+         * @return void
+         */
+        public static function addMock(string $domain, DnsRecord|string $record): void
+        {
+            if(isset(self::$mockedRecords[$domain]))
+            {
+                return;
+            }
+
+            if(is_string($record))
+            {
+                $record = DnsHelper::parseTxt($record);
+            }
+
+            self::$mockedRecords[$domain] = $record;
+        }
+
+        /**
+         * Clears all mocked records by resetting the mocked records array.
+         *
+         * @return void
+         */
+        public static function clearMockedRecords(): void
+        {
+            self::$mockedRecords = [];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookAddContact.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookAddContact.php
new file mode 100644
index 0000000..4e4f7e4
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookAddContact.php
@@ -0,0 +1,85 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\AddressBook;
+
+    use InvalidArgumentException;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Enums\Types\ContactRelationshipType;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\ContactManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\PeerAddress;
+    use Socialbox\Objects\RpcRequest;
+    use Socialbox\Socialbox;
+
+    class AddressBookAddContact extends Method
+    {
+        /**
+         * Adds a contact to the authenticated peer's address book, returns True if the contact was added
+         * false if the contact already exists.
+         *
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('peer'))
+            {
+                throw new MissingRpcArgumentException('peer');
+            }
+
+            try
+            {
+                $address = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
+            }
+            catch(InvalidArgumentException $e)
+            {
+                throw new InvalidRpcArgumentException('peer', $e);
+            }
+
+            if($rpcRequest->containsParameter('relationship') && $rpcRequest->getParameter('relationship') !== null)
+            {
+                $relationship = ContactRelationshipType::tryFrom(strtoupper($rpcRequest->getParameter('relationship')));
+                if($relationship === null)
+                {
+                    throw new InvalidRpcArgumentException('relationship');
+                }
+            }
+            else
+            {
+                $relationship = ContactRelationshipType::MUTUAL;
+            }
+
+            try
+            {
+                $peer = $request->getPeer();
+                if($peer->getAddress() == $address)
+                {
+                    return $rpcRequest->produceError(StandardError::FORBIDDEN, 'Cannot add self as contact');
+                }
+
+                // Resolve the peer, this would throw a StandardException if something goes wrong
+                Socialbox::resolvePeer($address);
+
+                // Check if the contact already exists
+                if(ContactManager::isContact($peer, $address))
+                {
+                    return $rpcRequest->produceResponse(false);
+                }
+
+                // Create the contact
+                ContactManager::createContact($peer, $address, $relationship);
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to add contact', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            // Return success
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookContactExists.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookContactExists.php
new file mode 100644
index 0000000..9758ce2
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookContactExists.php
@@ -0,0 +1,51 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\AddressBook;
+
+    use InvalidArgumentException;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\ContactManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\PeerAddress;
+    use Socialbox\Objects\RpcRequest;
+
+    class AddressBookContactExists extends Method
+    {
+        /**
+         * Returns True if the contact exists in the address book, False otherwise.
+         *
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('peer'))
+            {
+                throw new MissingRpcArgumentException('peer');
+            }
+
+            try
+            {
+                $address = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
+            }
+            catch(InvalidArgumentException $e)
+            {
+                throw new InvalidRpcArgumentException('peer', $e);
+            }
+
+            try
+            {
+                $peer = $request->getPeer();
+                return $rpcRequest->produceResponse(ContactManager::isContact($peer, $address));
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to check if the contact exists', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookDeleteContact.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookDeleteContact.php
new file mode 100644
index 0000000..b891b92
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookDeleteContact.php
@@ -0,0 +1,62 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\AddressBook;
+
+    use InvalidArgumentException;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\ContactManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\PeerAddress;
+    use Socialbox\Objects\RpcRequest;
+
+    class AddressBookDeleteContact extends Method
+    {
+        /**
+         * Deletes a contact from the authenticated peer's address book, returns True if the contact was deleted
+         * false if the contact does not exist.
+         *
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('peer'))
+            {
+                throw new MissingRpcArgumentException('peer');
+            }
+
+            try
+            {
+                $address = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
+            }
+            catch(InvalidArgumentException $e)
+            {
+                throw new InvalidRpcArgumentException('peer', $e);
+            }
+
+            try
+            {
+                // Check if the contact already exists
+                $peer = $request->getPeer();
+                if(!ContactManager::isContact($peer, $address))
+                {
+                    return $rpcRequest->produceResponse(false);
+                }
+
+                // Create the contact
+                ContactManager::deleteContact($peer, $address);
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to remove contact', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            // Return success
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookGetContact.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookGetContact.php
new file mode 100644
index 0000000..5443d29
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookGetContact.php
@@ -0,0 +1,56 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\AddressBook;
+
+    use InvalidArgumentException;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\ContactManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\PeerAddress;
+    use Socialbox\Objects\RpcRequest;
+
+    class AddressBookGetContact extends Method
+    {
+        /**
+         * Returns the contact information for the given peer address.
+         *
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('peer'))
+            {
+                throw new MissingRpcArgumentException('peer');
+            }
+
+            try
+            {
+                $address = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
+            }
+            catch(InvalidArgumentException $e)
+            {
+                throw new InvalidRpcArgumentException('peer', $e);
+            }
+
+            try
+            {
+                if(!ContactManager::isContact($request->getPeer(), $address))
+                {
+                    // Return empty response if the contact does not exist
+                    return $rpcRequest->produceResponse();
+                }
+
+                $rpcRequest->produceResponse(ContactManager::getStandardContact($request->getPeer(), $address));
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to get contact', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookGetContacts.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookGetContacts.php
new file mode 100644
index 0000000..483bfc2
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookGetContacts.php
@@ -0,0 +1,58 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\AddressBook;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\ContactManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class AddressBookGetContacts extends Method
+    {
+        /**
+         * Returns the contacts in the address book.
+         *
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            $limit = Configuration::getPoliciesConfiguration()->getGetContactsLimit();
+            if($rpcRequest->containsParameter('limit', true))
+            {
+                $limit = (int)$rpcRequest->getParameter('limit');
+                if($limit <= 0)
+                {
+                    throw new InvalidRpcArgumentException('limit', 'Invalid limit, must be greater than 0');
+                }
+
+                $limit = min($limit, Configuration::getPoliciesConfiguration()->getGetContactsLimit());
+            }
+
+            $page = 0;
+            if($rpcRequest->containsParameter('page', true))
+            {
+                $page = (int)$rpcRequest->getParameter('page');
+                if($page < 0)
+                {
+                    throw new InvalidRpcArgumentException('page', 'Invalid page, must be greater than or equal to 0');
+                }
+
+                $page = max($page, 0);
+            }
+
+            try
+            {
+                return $rpcRequest->produceResponse(ContactManager::getStandardContacts($request->getPeer(), $limit, $page));
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to get contacts', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookRevokeSignature.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookRevokeSignature.php
new file mode 100644
index 0000000..849cf79
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookRevokeSignature.php
@@ -0,0 +1,88 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\AddressBook;
+
+    use InvalidArgumentException;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\ContactManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\PeerAddress;
+    use Socialbox\Objects\RpcRequest;
+    use Symfony\Component\Uid\Uuid;
+
+    class AddressBookRevokeSignature extends Method
+    {
+        /**
+         * @inheritDoc
+         * @noinspection DuplicatedCode
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('peer'))
+            {
+                throw new MissingRpcArgumentException('peer');
+            }
+
+            try
+            {
+                $address = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
+            }
+            catch(InvalidArgumentException $e)
+            {
+                throw new InvalidRpcArgumentException('peer', $e);
+            }
+
+            if(!$rpcRequest->containsParameter('signature_uuid'))
+            {
+                throw new MissingRpcArgumentException('signature_uuid');
+            }
+
+            try
+            {
+                $signatureUuid = Uuid::fromString($rpcRequest->getParameter('signature_uuid'));
+            }
+            catch(InvalidArgumentException $e)
+            {
+                throw new InvalidRpcArgumentException('signature_uuid', $e);
+            }
+
+            try
+            {
+                // Check if the contact already exists
+                $peer = $request->getPeer();
+                $contact = ContactManager::getContact($peer, $address);
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to check contact state with calling peer', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($contact === null)
+            {
+                return $rpcRequest->produceResponse(false);
+            }
+
+            try
+            {
+                if(!ContactManager::contactSigningKeyUuidExists($contact, $signatureUuid))
+                {
+                    return $rpcRequest->produceResponse(false);
+                }
+
+                ContactManager::removeContactSigningKey($contact, $signatureUuid);
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to remove contact signature', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            // Return success
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookTrustSignature.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookTrustSignature.php
new file mode 100644
index 0000000..da68386
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookTrustSignature.php
@@ -0,0 +1,105 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\AddressBook;
+
+    use InvalidArgumentException;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\ContactManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\PeerAddress;
+    use Socialbox\Objects\RpcRequest;
+    use Socialbox\Socialbox;
+    use Symfony\Component\Uid\Uuid;
+
+    class AddressBookTrustSignature extends Method
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('peer'))
+            {
+                throw new MissingRpcArgumentException('peer');
+            }
+
+            try
+            {
+                $address = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
+            }
+            catch(InvalidArgumentException $e)
+            {
+                throw new InvalidRpcArgumentException('peer', $e);
+            }
+
+            if(!$rpcRequest->containsParameter('signature_uuid'))
+            {
+                throw new MissingRpcArgumentException('signature_uuid');
+            }
+
+            try
+            {
+                $signatureUuid = Uuid::fromString($rpcRequest->getParameter('signature_uuid'));
+            }
+            catch(InvalidArgumentException $e)
+            {
+                throw new InvalidRpcArgumentException('signature_uuid', $e);
+            }
+
+            $signingKey = Socialbox::resolvePeerSignature($address, $signatureUuid);
+
+            try
+            {
+                // Check if the contact already exists
+                $peer = $request->getPeer();
+                if(!ContactManager::isContact($peer, $address))
+                {
+                    ContactManager::createContact($peer, $address);
+                }
+
+                $contact = ContactManager::getContact($peer, $address);
+                if(ContactManager::contactGetSigningKeysCount($contact) > Configuration::getPoliciesConfiguration()->getMaxContactSigningKeys())
+                {
+                    return $rpcRequest->produceError(StandardError::FORBIDDEN, 'The contact has exceeded the maximum amount of trusted signatures');
+                }
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to check contact state with calling peer', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($signingKey === null)
+            {
+                return $rpcRequest->produceError(StandardError::NOT_FOUND, 'The requested signature key was not found');
+            }
+
+            try
+            {
+                if(ContactManager::contactSigningKeyUuidExists($contact, $signingKey->getUuid()))
+                {
+                    return $rpcRequest->produceResponse(false);
+                }
+
+                if(ContactManager::contactSigningKeyExists($contact, $signingKey->getPublicKey()))
+                {
+                    return $rpcRequest->produceResponse(false);
+                }
+
+                ContactManager::addContactSigningKey($contact, $signingKey);
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to trust contact signature', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            // Return success
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookUpdateRelationship.php b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookUpdateRelationship.php
new file mode 100644
index 0000000..b170085
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/AddressBook/AddressBookUpdateRelationship.php
@@ -0,0 +1,70 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\AddressBook;
+
+    use InvalidArgumentException;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Enums\Types\ContactRelationshipType;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\ContactManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\PeerAddress;
+    use Socialbox\Objects\RpcRequest;
+
+    class AddressBookUpdateRelationship extends Method
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('peer'))
+            {
+                throw new MissingRpcArgumentException('peer');
+            }
+
+            try
+            {
+                $address = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
+            }
+            catch(InvalidArgumentException $e)
+            {
+                throw new InvalidRpcArgumentException('peer', $e);
+            }
+
+            if(!$rpcRequest->containsParameter('relationship'))
+            {
+                throw new MissingRpcArgumentException('relationship');
+            }
+            $relationship = ContactRelationshipType::tryFrom(strtoupper($rpcRequest->getParameter('relationship')));
+            if($relationship === null)
+            {
+                throw new InvalidRpcArgumentException('relationship');
+            }
+
+            try
+            {
+                // Check if the contact already exists
+                $peer = $request->getPeer();
+                if(!ContactManager::isContact($peer, $address))
+                {
+                    return $rpcRequest->produceError(StandardError::FORBIDDEN, 'Contact does not exist');
+                }
+
+                // Create the contact
+                ContactManager::updateContactRelationship($peer, $address, $relationship);
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to update contact relationship', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            // Return success
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Authenticate.php b/src/Socialbox/Classes/StandardMethods/Authenticate.php
deleted file mode 100644
index b3eaf19..0000000
--- a/src/Socialbox/Classes/StandardMethods/Authenticate.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Socialbox\Classes\StandardMethods;
-
-use Socialbox\Abstracts\Method;
-use Socialbox\Enums\FirstLevelAuthentication;
-use Socialbox\Enums\StandardError;
-use Socialbox\Interfaces\SerializableInterface;
-use Socialbox\Objects\ClientRequest;
-use Socialbox\Objects\RpcRequest;
-use Socialbox\Objects\RpcResponse;
-
-class Authenticate extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
-    {
-        if(!isset($rpcRequest->getParameters()['type']))
-        {
-            return $rpcRequest->produceError(StandardError::RPC_INVALID_ARGUMENTS, 'Missing required parameter \'type\'');
-        }
-
-        if(strlen($rpcRequest->getParameters()['type']) == 0)
-        {
-            return $rpcRequest->produceError(StandardError::RPC_INVALID_ARGUMENTS, 'Parameter \'type\' cannot be empty');
-        }
-
-        return match (FirstLevelAuthentication::tryFrom($rpcRequest->getParameters()['type']))
-        {
-            FirstLevelAuthentication::PASSWORD => self::handlePassword($request),
-
-            default => $rpcRequest->produceError(StandardError::UNSUPPORTED_AUTHENTICATION_TYPE,
-                sprintf('Unsupported authentication type: %s', $rpcRequest->getParameters()['type'])
-            ),
-        };
-    }
-
-    /**
-     * Handles the password authentication phase for the peer
-     *
-     * @param ClientRequest $request
-     * @return SerializableInterface
-     */
-    private static function handlePassword(ClientRequest $request): SerializableInterface
-    {
-
-    }
-}
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Core/GetAllowedMethods.php b/src/Socialbox/Classes/StandardMethods/Core/GetAllowedMethods.php
new file mode 100644
index 0000000..49ca7c1
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Core/GetAllowedMethods.php
@@ -0,0 +1,39 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Core;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Enums\StandardMethods;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class GetAllowedMethods extends Method
+    {
+        /**
+         * Returns a list of allowed methods for the current session.
+         *
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            $allowedMethods = [];
+
+            try
+            {
+                foreach(StandardMethods::getAllowedMethods($request) as $method)
+                {
+                    $allowedMethods[] = $method->value;
+                }
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to retrieve allowed methods due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse($allowedMethods);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Core/GetSelf.php b/src/Socialbox/Classes/StandardMethods/Core/GetSelf.php
new file mode 100644
index 0000000..bd2ec5b
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Core/GetSelf.php
@@ -0,0 +1,32 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Core;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\PeerInformationManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class GetSelf extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            try
+            {
+                $selfPeer = $request->getPeer();
+                return $rpcRequest->produceResponse($selfPeer->toStandardPeer(PeerInformationManager::getFields($selfPeer)));
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Unable to resolve self peer', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Core/GetSessionState.php b/src/Socialbox/Classes/StandardMethods/Core/GetSessionState.php
new file mode 100644
index 0000000..ec52024
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Core/GetSessionState.php
@@ -0,0 +1,29 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Core;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class GetSessionState extends Method
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            try
+            {
+                return $rpcRequest->produceResponse($request->getSession()->toStandardSessionState());
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to retrieve session state due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Core/Ping.php b/src/Socialbox/Classes/StandardMethods/Core/Ping.php
new file mode 100644
index 0000000..c870d89
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Core/Ping.php
@@ -0,0 +1,19 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Core;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class Ping extends Method
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Core/ResolvePeer.php b/src/Socialbox/Classes/StandardMethods/Core/ResolvePeer.php
new file mode 100644
index 0000000..5c728e2
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Core/ResolvePeer.php
@@ -0,0 +1,59 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Core;
+
+    use InvalidArgumentException;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\ReservedUsernames;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\PeerAddress;
+    use Socialbox\Objects\RpcRequest;
+    use Socialbox\Socialbox;
+
+    class ResolvePeer extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            // Check if the required 'peer' parameter is set.
+            if(!$rpcRequest->containsParameter('peer'))
+            {
+                throw new MissingRpcArgumentException('peer');
+            }
+
+            // Parse the peer address
+            try
+            {
+                $peerAddress = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
+            }
+            catch(InvalidArgumentException $e)
+            {
+                throw new StandardRpcException('Peer Address Error: ' . $e->getMessage(), StandardError::RPC_INVALID_ARGUMENTS, $e);
+            }
+
+            // Check if host is making the request & the identifier is not empty
+            try
+            {
+                $identifyAs = null;
+                if ($request->getPeer()->getUsername() == ReservedUsernames::HOST && $request->getIdentifyAs() != null)
+                {
+                    $identifyAs = $request->getIdentifyAs();
+                }
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to retrieve peer information', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            // Resolve the peer using the server's peer resolver, this will resolve both internal peers and external peers
+            return $rpcRequest->produceResponse(Socialbox::resolvePeer($peerAddress, $identifyAs));
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Core/ResolveSignature.php b/src/Socialbox/Classes/StandardMethods/Core/ResolveSignature.php
new file mode 100644
index 0000000..002d264
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Core/ResolveSignature.php
@@ -0,0 +1,47 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Core;
+
+    use Exception;
+    use InvalidArgumentException;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Validator;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\PeerAddress;
+    use Socialbox\Objects\RpcRequest;
+    use Socialbox\Socialbox;
+    use Symfony\Component\Uid\Uuid;
+
+    class ResolveSignature extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            // Check if the required 'peer' parameter is set.
+            if(!$rpcRequest->containsParameter('peer'))
+            {
+                throw new MissingRpcArgumentException('peer');
+            }
+
+            if(!$rpcRequest->containsParameter('signature_uuid'))
+            {
+                throw new MissingRpcArgumentException('signature_uuid');
+            }
+            elseif(!Validator::validateUuid($rpcRequest->getParameter('signature_uuid')))
+            {
+                throw new InvalidRpcArgumentException('signature_uuid', 'Invalid UUID V4');
+            }
+
+            return $rpcRequest->produceResponse(Socialbox::resolvePeerSignature(
+                $rpcRequest->getParameter('peer'), $rpcRequest->getParameter('signature_uuid')
+            ));
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Core/VerifySignature.php b/src/Socialbox/Classes/StandardMethods/Core/VerifySignature.php
new file mode 100644
index 0000000..f8e2633
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Core/VerifySignature.php
@@ -0,0 +1,87 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Core;
+
+    use InvalidArgumentException;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Cryptography;
+    use Socialbox\Classes\Validator;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\PeerAddress;
+    use Socialbox\Objects\RpcRequest;
+    use Socialbox\Socialbox;
+
+    class VerifySignature extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            // Check if the required 'peer' parameter is set.
+            if(!$rpcRequest->containsParameter('peer'))
+            {
+                throw new MissingRpcArgumentException('peer');
+            }
+
+            if(!$rpcRequest->containsParameter('signature_uuid'))
+            {
+                throw new MissingRpcArgumentException('signature_uuid');
+            }
+            elseif(!Validator::validateUuid($rpcRequest->getParameter('signature_uuid')))
+            {
+                throw new InvalidRpcArgumentException('signature_uuid', 'Invalid UUID V4');
+            }
+
+            if(!$rpcRequest->containsParameter('signature'))
+            {
+                throw new MissingRpcArgumentException('signature');
+            }
+
+            if(!$rpcRequest->containsParameter('sha512'))
+            {
+                throw new MissingRpcArgumentException('sha512');
+            }
+            elseif(!Cryptography::validateSha512($rpcRequest->getParameter('sha512')))
+            {
+                throw new InvalidRpcArgumentException('sha512', 'Invalid SHA512');
+            }
+
+            // Parse the peer address
+            try
+            {
+                $peerAddress = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
+            }
+            catch(InvalidArgumentException $e)
+            {
+                throw new InvalidRpcArgumentException('peer', $e);
+            }
+
+            if($rpcRequest->containsParameter('time'))
+            {
+                if(!is_numeric($rpcRequest->getParameter('time')))
+                {
+                    throw new InvalidRpcArgumentException('time', 'Invalid timestamp, must be a Unix Timestamp');
+                }
+
+                return $rpcRequest->produceResponse(Socialbox::verifyTimedSignature(
+                    signingPeer: $peerAddress,
+                    signatureUuid: $rpcRequest->getParameter('signature_uuid'),
+                    signature: $rpcRequest->getParameter('signature'),
+                    messageHash: $rpcRequest->getParameter('sha512'),
+                    signatureTime: (int)$rpcRequest->getParameter('time')
+                )->value);
+            }
+
+            return $rpcRequest->produceResponse(Socialbox::verifySignature(
+                signingPeer: $peerAddress,
+                signatureUuid: $rpcRequest->getParameter('signature_uuid'),
+                signature: $rpcRequest->getParameter('signature'),
+                messageHash: $rpcRequest->getParameter('sha512'),
+            )->value);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/CreateSession.php b/src/Socialbox/Classes/StandardMethods/CreateSession.php
deleted file mode 100644
index 9d9dcfe..0000000
--- a/src/Socialbox/Classes/StandardMethods/CreateSession.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace Socialbox\Classes\StandardMethods;
-
-use InvalidArgumentException;
-use Socialbox\Abstracts\Method;
-use Socialbox\Enums\StandardError;
-use Socialbox\Exceptions\DatabaseOperationException;
-use Socialbox\Interfaces\SerializableInterface;
-use Socialbox\Managers\SessionManager;
-use Socialbox\Objects\ClientRequest;
-use Socialbox\Objects\RpcRequest;
-
-class CreateSession extends Method
-{
-    /**
-     * Executes the session creation process based on the provided public key.
-     *
-     * @param ClientRequest $request The client request object.
-     * @param RpcRequest $rpcRequest The RPC request containing parameters for execution.
-     * @return SerializableInterface|null Returns a response with the session UUID or an error.
-     */
-    public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
-    {
-        if(!$rpcRequest->containsParameter('public_key'))
-        {
-            return $rpcRequest->produceError(StandardError::RPC_INVALID_ARGUMENTS, 'Missing parameter \'public_key\'');
-        }
-
-        try
-        {
-            $uuid = SessionManager::createSession($rpcRequest->getParameter('public_key'));
-        }
-        catch(DatabaseOperationException $e)
-        {
-            return $rpcRequest->produceError(StandardError::INTERNAL_SERVER_ERROR, 'There was an error while trying to create a new session: ' . $e->getMessage());
-        }
-        catch(InvalidArgumentException $e)
-        {
-            return $rpcRequest->produceError(StandardError::RPC_INVALID_ARGUMENTS, $e->getMessage());
-        }
-
-        return $rpcRequest->produceResponse([
-            'uuid' => $uuid
-        ]);
-    }
-}
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionAcceptChannel.php b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionAcceptChannel.php
new file mode 100644
index 0000000..7972aed
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionAcceptChannel.php
@@ -0,0 +1,209 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\EncryptionChannel;
+
+    use Exception;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Cryptography;
+    use Socialbox\Classes\Logger;
+    use Socialbox\Classes\Validator;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Enums\Status\EncryptionChannelStatus;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\RpcException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\EncryptionChannelManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+    use Socialbox\Socialbox;
+
+    class EncryptionAcceptChannel extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            try
+            {
+                if ($request->isExternal())
+                {
+                    return self::handleExternal($request, $rpcRequest);
+                }
+
+                return self::handleInternal($request, $rpcRequest);
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('An error occurred while checking the request type', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+        }
+
+        /**
+         * @param ClientRequest $request
+         * @param RpcRequest $rpcRequest
+         * @return SerializableInterface|null
+         * @throws StandardRpcException
+         */
+        private static function handleInternal(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('channel_uuid'))
+            {
+                throw new MissingRpcArgumentException('channel_uuid');
+            }
+            elseif(!Validator::validateUuid($rpcRequest->getParameter('channel_uuid')))
+            {
+                throw new InvalidRpcArgumentException('channel_uuid', 'The given channel uuid is not a valid UUID V4');
+            }
+
+            if(!$rpcRequest->containsParameter('public_encryption_key'))
+            {
+                throw new MissingRpcArgumentException('public_encryption_key');
+            }
+            elseif(!Cryptography::validatePublicEncryptionKey('public_encryption_key'))
+            {
+                throw new InvalidRpcArgumentException('public_encryption_key', 'The given public encryption key is invalid');
+            }
+
+            try
+            {
+                $receivingPeer = $request->getPeer();
+                $encryptionChannel = EncryptionChannelManager::getChannel($rpcRequest->getParameter('channel_uuid'));
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('There was an error while trying to obtain the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($encryptionChannel === null)
+            {
+                return $rpcRequest->produceError(StandardError::NOT_FOUND, 'The requested encryption channel was not found');
+            }
+            elseif($encryptionChannel->getReceivingPeerAddress()->getAddress() !== $receivingPeer->getAddress())
+            {
+                return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The requested encryption channel is not accessible');
+            }
+            elseif($encryptionChannel->getStatus() !== EncryptionChannelStatus::AWAITING_RECEIVER)
+            {
+                return $rpcRequest->produceError(StandardError::FORBIDDEN, 'The encryption channel is not awaiting the receiver');
+            }
+
+            if($encryptionChannel->getCallingPeerAddress()->isExternal())
+            {
+                try
+                {
+                    $rpcClient = Socialbox::getExternalSession($encryptionChannel->getCallingPeerAddress()->getDomain());
+                    $rpcClient->encryptionAcceptChannel(
+                        channelUuid: $rpcRequest->getParameter('channel_uuid'),
+                        publicEncryptionKey: $rpcRequest->getParameter('public_encryption_key'),
+                        identifiedAs: $receivingPeer->getAddress()
+                    );
+                }
+                catch(Exception $e)
+                {
+                    try
+                    {
+                        EncryptionChannelManager::declineChannel($rpcRequest->getParameter('channel_uuid'), true);
+                    }
+                    catch(DatabaseOperationException $e)
+                    {
+                        Logger::getLogger()->error('Error declining channel as server', $e);
+                    }
+
+                    if($e instanceof RpcException)
+                    {
+                        throw StandardRpcException::fromRpcException($e);
+                    }
+
+                    throw new StandardRpcException('There was an error while trying to notify the external server of the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+                }
+            }
+
+            try
+            {
+                EncryptionChannelManager::acceptChannel(
+                    channelUuid: $rpcRequest->getParameter('channel_uuid'),
+                    publicEncryptionKey: $rpcRequest->getParameter('public_encryption_key')
+                );
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('There was an error while trying to accept the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse(true);
+        }
+
+        /**
+         * @param ClientRequest $request
+         * @param RpcRequest $rpcRequest
+         * @return SerializableInterface|null
+         * @throws StandardRpcException
+         */
+        private static function handleExternal(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if($request->getIdentifyAs() === null)
+            {
+                return $rpcRequest->produceError(StandardError::BAD_REQUEST, 'Missing required header IdentifyAs');
+            }
+
+            if(!$rpcRequest->containsParameter('channel_uuid'))
+            {
+                throw new MissingRpcArgumentException('channel_uuid');
+            }
+            elseif(!Validator::validateUuid($rpcRequest->getParameter('channel_uuid')))
+            {
+                throw new InvalidRpcArgumentException('channel_uuid', 'The given channel uuid is not a valid UUID V4');
+            }
+
+            if(!$rpcRequest->containsParameter('public_encryption_key'))
+            {
+                throw new MissingRpcArgumentException('public_encryption_key');
+            }
+            elseif(!Cryptography::validatePublicEncryptionKey('public_encryption_key'))
+            {
+                throw new InvalidRpcArgumentException('public_encryption_key', 'The given public encryption key is invalid');
+            }
+
+            try
+            {
+                $receivingPeer = Socialbox::resolvePeer($request->getIdentifyAs());
+                $encryptionChannel = EncryptionChannelManager::getChannel($rpcRequest->getParameter('channel_uuid'));
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('There was an error while trying to obtain the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($encryptionChannel === null)
+            {
+                return $rpcRequest->produceError(StandardError::NOT_FOUND, 'The requested encryption channel was not found');
+            }
+            elseif($encryptionChannel->getReceivingPeerAddress() !== $receivingPeer->getPeerAddress())
+            {
+                return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The requested encryption channel is not accessible');
+            }
+            elseif($encryptionChannel->getStatus() !== EncryptionChannelStatus::AWAITING_RECEIVER)
+            {
+                return $rpcRequest->produceError(StandardError::FORBIDDEN, 'The encryption channel is not awaiting the receiver');
+            }
+
+            try
+            {
+                EncryptionChannelManager::acceptChannel(
+                    channelUuid: $rpcRequest->getParameter('channel_uuid'),
+                    publicEncryptionKey: $rpcRequest->getParameter('public_encryption_key')
+                );
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('There was an error while trying to accept the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionChannelAcknowledgeMessage.php b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionChannelAcknowledgeMessage.php
new file mode 100644
index 0000000..66c9194
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionChannelAcknowledgeMessage.php
@@ -0,0 +1,221 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\EncryptionChannel;
+
+    use Exception;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Logger;
+    use Socialbox\Classes\Validator;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Enums\Status\EncryptionChannelStatus;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\RpcException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\EncryptionChannelManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\Database\EncryptionChannelRecord;
+    use Socialbox\Objects\RpcRequest;
+    use Socialbox\Socialbox;
+
+    class EncryptionChannelAcknowledgeMessage extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('channel_uuid'))
+            {
+                throw new MissingRpcArgumentException('channel_uuid');
+            }
+            elseif(!Validator::validateUuid($rpcRequest->getParameter('channel_uuid')))
+            {
+                throw new InvalidRpcArgumentException('channel_uuid', 'The given channel uuid is not a valid UUID V4');
+            }
+
+            if(!$rpcRequest->containsParameter('message_uuid'))
+            {
+                throw new MissingRpcArgumentException('message_uuid');
+            }
+            elseif(!is_string($rpcRequest->getParameter('message_uuid')))
+            {
+                throw new InvalidRpcArgumentException('message_uuid', 'Must be type string');
+            }
+            elseif(!Validator::validateUuid($rpcRequest->getParameter('message_uuid')))
+            {
+                throw new InvalidRpcArgumentException('message_uuid', 'Invalid message UUID V4');
+            }
+
+            try
+            {
+                $channelUuid = $rpcRequest->getParameter('channel_uuid');
+                $encryptionChannel = EncryptionChannelManager::getChannel($channelUuid);
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to retrieve the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($encryptionChannel === null)
+            {
+                return $rpcRequest->produceError(StandardError::NOT_FOUND, 'The encryption channel does not exist');
+            }
+
+            try
+            {
+                if ($request->isExternal())
+                {
+                    return self::handleExternal($request, $rpcRequest, $encryptionChannel);
+                }
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to acknowledge the message', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return self::handleInternal($request, $rpcRequest, $encryptionChannel);
+        }
+
+        /**
+         * Handles the external execution of the method.
+         *
+         * @param ClientRequest $request The client request instance.
+         * @param RpcRequest $rpcRequest The RPC request instance.
+         * @param EncryptionChannelRecord $encryptionChannel The encryption channel record.
+         * @return SerializableInterface|null The response to the request.
+         * @throws StandardRpcException If an error occurs.
+         */
+        public static function handleExternal(ClientRequest $request, RpcRequest $rpcRequest, EncryptionChannelRecord $encryptionChannel): ?SerializableInterface
+        {
+            if($request->getIdentifyAs() === null)
+            {
+                return $rpcRequest->produceError(StandardError::BAD_REQUEST, 'The IdentifyAs header is missing');
+            }
+
+            $requestingPeerAddress = $request->getIdentifyAs();
+            if(!$encryptionChannel->isParticipant($requestingPeerAddress))
+            {
+                return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The encryption channel is not accessible');
+            }
+
+            try
+            {
+                $message = EncryptionChannelManager::getMessageRecord($rpcRequest->getParameter('channel_uuid'), $rpcRequest->getParameter('message_uuid'));
+
+                if($message === null)
+                {
+                    return $rpcRequest->produceError(StandardError::NOT_FOUND, 'The message does not exist');
+                }
+
+                if($message->getReceiver($encryptionChannel)->getAddress() !== $requestingPeerAddress)
+                {
+                    return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The message is not for the requesting peer');
+                }
+
+                EncryptionChannelManager::acknowledgeMessage(
+                    $rpcRequest->getParameter('channel_uuid'), $rpcRequest->getParameter('message_uuid')
+                );
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to acknowledge the message', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse(true);
+        }
+
+        /**
+         * Handles the internal execution of the method.
+         *
+         * @param ClientRequest $request The client request instance.
+         * @param RpcRequest $rpcRequest The RPC request instance.
+         * @param EncryptionChannelRecord $encryptionChannel The encryption channel record.
+         * @return SerializableInterface|null The response to the request.
+         * @throws StandardRpcException If an error occurs.
+         */
+        public static function handleInternal(ClientRequest $request, RpcRequest $rpcRequest, EncryptionChannelRecord $encryptionChannel): ?SerializableInterface
+        {
+            try
+            {
+                $requestingPeer = $request->getPeer();
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to retrieve the peer', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($requestingPeer === null)
+            {
+                return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The peer is not authorized');
+            }
+
+            if(!$encryptionChannel->isParticipant($requestingPeer->getAddress()))
+            {
+                return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The encryption channel is not accessible');
+            }
+            elseif($encryptionChannel->getStatus() !== EncryptionChannelStatus::OPENED)
+            {
+                return $rpcRequest->produceError(StandardError::FORBIDDEN, 'The encryption channel is not opened');
+            }
+
+            try
+            {
+                $message = EncryptionChannelManager::getMessageRecord($rpcRequest->getParameter('channel_uuid'), $rpcRequest->getParameter('message_uuid'));
+
+                if($message === null)
+                {
+                    return $rpcRequest->produceError(StandardError::NOT_FOUND, 'The message does not exist');
+                }
+
+                if($message->getReceiver($encryptionChannel)->getAddress() !== $requestingPeer->getAddress())
+                {
+                    return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The message is not for the requesting peer');
+                }
+
+                EncryptionChannelManager::acknowledgeMessage(
+                    $rpcRequest->getParameter('channel_uuid'), $rpcRequest->getParameter('message_uuid')
+                );
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to acknowledge the message', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($message->getOwner($encryptionChannel)->isExternal())
+            {
+                try
+                {
+                    $rpcClient = Socialbox::getExternalSession($message->getOwner($encryptionChannel)->getDomain());
+                    $rpcClient->encryptionChannelAcknowledgeMessage(
+                        channelUuid: $rpcRequest->getParameter('channel_uuid'),
+                        messageUuid: $rpcRequest->getParameter('message_uuid'),
+                        identifiedAs: $requestingPeer->getAddress()
+                    );
+                }
+                catch(Exception $e)
+                {
+                    try
+                    {
+                        EncryptionChannelManager::rejectMessage($rpcRequest->getParameter('channel_uuid'), $rpcRequest->getParameter('message_uuid'), true);
+                    }
+                    catch (DatabaseOperationException $e)
+                    {
+                        Logger::getLogger()->error('Error rejecting message as server', $e);
+                    }
+
+                    if($e instanceof RpcException)
+                    {
+                        throw StandardRpcException::fromRpcException($e);
+                    }
+
+                    throw new StandardRpcException('Failed to acknowledge the message with the external server', StandardError::INTERNAL_SERVER_ERROR, $e);
+                }
+            }
+
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionChannelExists.php b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionChannelExists.php
new file mode 100644
index 0000000..23a5f8e
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionChannelExists.php
@@ -0,0 +1,37 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\EncryptionChannel;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\EncryptionChannelManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class EncryptionChannelExists extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('channel_uuid'))
+            {
+                throw new MissingRpcArgumentException('channel_uuid');
+            }
+
+            try
+            {
+                return $rpcRequest->produceResponse(EncryptionChannelManager::channelUuidExists($rpcRequest->getParameter('channel_uuid')));
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('An error occurred while checking if the channel exists', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionChannelReceive.php b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionChannelReceive.php
new file mode 100644
index 0000000..fa0db4e
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionChannelReceive.php
@@ -0,0 +1,98 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\EncryptionChannel;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Validator;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Enums\Status\EncryptionChannelStatus;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\EncryptionChannelManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class EncryptionChannelReceive extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('channel_uuid'))
+            {
+                throw new MissingRpcArgumentException('channel_uuid');
+            }
+            elseif(!Validator::validateUuid($rpcRequest->getParameter('channel_uuid')))
+            {
+                throw new InvalidRpcArgumentException('channel_uuid', 'The given channel uuid is not a valid UUID V4');
+            }
+
+            try
+            {
+                $channelUuid = $rpcRequest->getParameter('channel_uuid');
+                $encryptionChannel = EncryptionChannelManager::getChannel($channelUuid);
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to retrieve the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($encryptionChannel === null)
+            {
+                return $rpcRequest->produceError(StandardError::NOT_FOUND, 'The encryption channel does not exist');
+            }
+
+            try
+            {
+                $requestingPeer = $request->getPeer();
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to retrieve the peer', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($requestingPeer === null)
+            {
+                return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The peer is not authorized');
+            }
+
+            if(!$encryptionChannel->isParticipant($requestingPeer->getAddress()))
+            {
+                return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The encryption channel is not accessible');
+            }
+            elseif($encryptionChannel->getStatus() !== EncryptionChannelStatus::OPENED)
+            {
+                return $rpcRequest->produceError(StandardError::FORBIDDEN, 'The encryption channel is not opened');
+            }
+
+            $acknowledge = false;
+            if($rpcRequest->containsParameter('acknowledge') && is_bool($rpcRequest->getParameter('acknowledge')) && $rpcRequest->getParameter('acknowledge'))
+            {
+                $acknowledge = true;
+            }
+
+            try
+            {
+
+                $messages = EncryptionChannelManager::receiveData(
+                    $rpcRequest->getParameter('channel_uuid'), $encryptionChannel->determineRecipient($requestingPeer->getAddress(), true)
+                );
+
+                if($acknowledge)
+                {
+                    EncryptionChannelManager::acknowledgeMessagesBatch($rpcRequest->getParameter('channel_uuid'), array_map(fn($message) => $message->getUuid(), $messages));
+                }
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to retrieve the messages', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse(array_map(fn($message) => $message->toStandard(), $messages));
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionChannelRejectMessage.php b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionChannelRejectMessage.php
new file mode 100644
index 0000000..e929654
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionChannelRejectMessage.php
@@ -0,0 +1,221 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\EncryptionChannel;
+
+    use Exception;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Logger;
+    use Socialbox\Classes\Validator;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Enums\Status\EncryptionChannelStatus;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\RpcException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\EncryptionChannelManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\Database\EncryptionChannelRecord;
+    use Socialbox\Objects\RpcRequest;
+    use Socialbox\Socialbox;
+
+    class EncryptionChannelRejectMessage extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('channel_uuid'))
+            {
+                throw new MissingRpcArgumentException('channel_uuid');
+            }
+            elseif(!Validator::validateUuid($rpcRequest->getParameter('channel_uuid')))
+            {
+                throw new InvalidRpcArgumentException('channel_uuid', 'The given channel uuid is not a valid UUID V4');
+            }
+
+            if(!$rpcRequest->containsParameter('message_uuid'))
+            {
+                throw new MissingRpcArgumentException('message_uuid');
+            }
+            elseif(!is_string($rpcRequest->getParameter('message_uuid')))
+            {
+                throw new InvalidRpcArgumentException('message_uuid', 'Must be type string');
+            }
+            elseif(!Validator::validateUuid($rpcRequest->getParameter('message_uuid')))
+            {
+                throw new InvalidRpcArgumentException('message_uuid', 'Invalid message UUID V4');
+            }
+
+            try
+            {
+                $channelUuid = $rpcRequest->getParameter('channel_uuid');
+                $encryptionChannel = EncryptionChannelManager::getChannel($channelUuid);
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to retrieve the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($encryptionChannel === null)
+            {
+                return $rpcRequest->produceError(StandardError::NOT_FOUND, 'The encryption channel does not exist');
+            }
+
+            try
+            {
+                if ($request->isExternal())
+                {
+                    return self::handleExternal($request, $rpcRequest, $encryptionChannel);
+                }
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to reject the message', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return self::handleInternal($request, $rpcRequest, $encryptionChannel);
+        }
+
+        /**
+         * Handles the external execution of the method.
+         *
+         * @param ClientRequest $request The client request instance.
+         * @param RpcRequest $rpcRequest The RPC request instance.
+         * @param EncryptionChannelRecord $encryptionChannel The encryption channel record.
+         * @return SerializableInterface|null The response to the request.
+         * @throws StandardRpcException If an error occurs.
+         */
+        public static function handleExternal(ClientRequest $request, RpcRequest $rpcRequest, EncryptionChannelRecord $encryptionChannel): ?SerializableInterface
+        {
+            if($request->getIdentifyAs() === null)
+            {
+                return $rpcRequest->produceError(StandardError::BAD_REQUEST, 'The IdentifyAs header is missing');
+            }
+
+            $requestingPeerAddress = $request->getIdentifyAs();
+            if(!$encryptionChannel->isParticipant($requestingPeerAddress))
+            {
+                return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The encryption channel is not accessible');
+            }
+
+            try
+            {
+                $message = EncryptionChannelManager::getMessageRecord($rpcRequest->getParameter('channel_uuid'), $rpcRequest->getParameter('message_uuid'));
+
+                if($message === null)
+                {
+                    return $rpcRequest->produceError(StandardError::NOT_FOUND, 'The message does not exist');
+                }
+
+                if($message->getReceiver($encryptionChannel)->getAddress() !== $requestingPeerAddress)
+                {
+                    return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The message is not for the requesting peer');
+                }
+
+                EncryptionChannelManager::rejectMessage(
+                    $rpcRequest->getParameter('channel_uuid'), $rpcRequest->getParameter('message_uuid')
+                );
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to reject the message', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse(true);
+        }
+
+        /**
+         * Handles the internal execution of the method.
+         *
+         * @param ClientRequest $request The client request instance.
+         * @param RpcRequest $rpcRequest The RPC request instance.
+         * @param EncryptionChannelRecord $encryptionChannel The encryption channel record.
+         * @return SerializableInterface|null The response to the request.
+         * @throws StandardRpcException If an error occurs.
+         */
+        public static function handleInternal(ClientRequest $request, RpcRequest $rpcRequest, EncryptionChannelRecord $encryptionChannel): ?SerializableInterface
+        {
+            try
+            {
+                $requestingPeer = $request->getPeer();
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to retrieve the peer', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($requestingPeer === null)
+            {
+                return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The peer is not authorized');
+            }
+
+            if(!$encryptionChannel->isParticipant($requestingPeer->getAddress()))
+            {
+                return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The encryption channel is not accessible');
+            }
+            elseif($encryptionChannel->getStatus() !== EncryptionChannelStatus::OPENED)
+            {
+                return $rpcRequest->produceError(StandardError::FORBIDDEN, 'The encryption channel is not opened');
+            }
+
+            try
+            {
+                $message = EncryptionChannelManager::getMessageRecord($rpcRequest->getParameter('channel_uuid'), $rpcRequest->getParameter('message_uuid'));
+
+                if($message === null)
+                {
+                    return $rpcRequest->produceError(StandardError::NOT_FOUND, 'The message does not exist');
+                }
+
+                if($message->getReceiver($encryptionChannel)->getAddress() !== $requestingPeer->getAddress())
+                {
+                    return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The message is not for the requesting peer');
+                }
+
+                EncryptionChannelManager::acknowledgeMessage(
+                    $rpcRequest->getParameter('channel_uuid'), $rpcRequest->getParameter('message_uuid')
+                );
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to acknowledge the message', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($message->getOwner($encryptionChannel)->isExternal())
+            {
+                try
+                {
+                    $rpcClient = Socialbox::getExternalSession($message->getOwner($encryptionChannel)->getDomain());
+                    $rpcClient->encryptionChannelRejectMessage(
+                        channelUuid: $rpcRequest->getParameter('channel_uuid'),
+                        messageUuid: $rpcRequest->getParameter('message_uuid'),
+                        identifiedAs: $requestingPeer->getAddress()
+                    );
+                }
+                catch(Exception $e)
+                {
+                    try
+                    {
+                        EncryptionChannelManager::rejectMessage($rpcRequest->getParameter('channel_uuid'), $rpcRequest->getParameter('message_uuid'), true);
+                    }
+                    catch (DatabaseOperationException $e)
+                    {
+                        Logger::getLogger()->error('Error rejecting message as server', $e);
+                    }
+
+                    if($e instanceof RpcException)
+                    {
+                        throw StandardRpcException::fromRpcException($e);
+                    }
+
+                    throw new StandardRpcException('Failed to acknowledge the message with the external server', StandardError::INTERNAL_SERVER_ERROR, $e);
+                }
+            }
+
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionChannelSend.php b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionChannelSend.php
new file mode 100644
index 0000000..14f7a83
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionChannelSend.php
@@ -0,0 +1,237 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\EncryptionChannel;
+
+    use Exception;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Cryptography;
+    use Socialbox\Classes\Validator;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Enums\Status\EncryptionChannelStatus;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\RpcException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\EncryptionChannelManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+    use Socialbox\Socialbox;
+    use Symfony\Component\Uid\Uuid;
+
+    class EncryptionChannelSend extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('channel_uuid'))
+            {
+                throw new MissingRpcArgumentException('channel_uuid');
+            }
+            elseif(!Validator::validateUuid($rpcRequest->getParameter('channel_uuid')))
+            {
+                throw new InvalidRpcArgumentException('channel_uuid', 'The given channel uuid is not a valid UUID V4');
+            }
+
+            try
+            {
+                if ($request->isExternal())
+                {
+                    return self::executeExternal($request, $rpcRequest);
+                }
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('An error occurred while checking the request type', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return self::executeInternal($request, $rpcRequest);
+        }
+
+        /**
+         * @param ClientRequest $request
+         * @param RpcRequest $rpcRequest
+         * @return SerializableInterface
+         * @throws StandardRpcException
+         */
+        private static function executeInternal(ClientRequest $request, RpcRequest $rpcRequest): SerializableInterface
+        {
+            try
+            {
+                $channelUuid = $rpcRequest->getParameter('channel_uuid');
+                $encryptionChannel = EncryptionChannelManager::getChannel($channelUuid);
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to retrieve the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($encryptionChannel === null)
+            {
+                return $rpcRequest->produceError(StandardError::NOT_FOUND, 'The encryption channel does not exist');
+            }
+
+            try
+            {
+                $requestingPeer = $request->getPeer();
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to retrieve the peer', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($requestingPeer === null)
+            {
+                return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The peer is not authorized');
+            }
+
+            if(!$encryptionChannel->isParticipant($requestingPeer->getAddress()))
+            {
+                return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The encryption channel is not accessible');
+            }
+            elseif($encryptionChannel->getStatus() !== EncryptionChannelStatus::OPENED)
+            {
+                return $rpcRequest->produceError(StandardError::FORBIDDEN, 'The encryption channel is not opened');
+            }
+
+            if(!$rpcRequest->containsParameter('checksum'))
+            {
+                throw new MissingRpcArgumentException('checksum');
+            }
+            elseif(!Cryptography::validateSha512($rpcRequest->getParameter('checksum')))
+            {
+                throw new InvalidRpcArgumentException('checksum', 'The given checksum is not a valid SHA-512 checksum');
+            }
+
+            if(!$rpcRequest->containsParameter('data'))
+            {
+                throw new MissingRpcArgumentException('data');
+            }
+
+            try
+            {
+                $messageUuid = Uuid::v4()->toRfc4122();
+                $messageTimestamp = time();
+
+                EncryptionChannelManager::sendMessage(
+                    channelUuid: $channelUuid,
+                    recipient: $encryptionChannel->determineRecipient($requestingPeer->getAddress()),
+                    checksum: $rpcRequest->getParameter('checksum'),
+                    data: $rpcRequest->getParameter('data'),
+                    messageUuid: $messageUuid,
+                    messageTimestamp: $messageTimestamp
+                );
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to send the message', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($encryptionChannel->determineReceiver($requestingPeer->getAddress())->isExternal())
+            {
+                try
+                {
+                    $rpcClient = Socialbox::getExternalSession($encryptionChannel->determineReceiver($requestingPeer->getAddress())->getDomain());
+                    $rpcClient->encryptionChannelSend(
+                        channelUuid: $rpcRequest->getParameter('channel_uuid'),
+                        checksum: $rpcRequest->getParameter('checksum'),
+                        data: $rpcRequest->getParameter('data'),
+                        identifiedAs: $requestingPeer->getAddress(),
+                        messageUuid: $messageUuid,
+                        timestamp: $messageTimestamp
+                    );
+                }
+                catch(Exception $e)
+                {
+                    if($e instanceof RpcException)
+                    {
+                        throw StandardRpcException::fromRpcException($e);
+                    }
+
+                    throw new StandardRpcException('There was an error while trying to notify the external server of the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+                }
+            }
+
+            return $rpcRequest->produceResponse();
+        }
+
+        /**
+         * @param ClientRequest $request
+         * @param RpcRequest $rpcRequest
+         * @return SerializableInterface
+         * @throws StandardRpcException
+         */
+        private static function executeExternal(ClientRequest $request, RpcRequest $rpcRequest): SerializableInterface
+        {
+            if($request->getIdentifyAs() === null)
+            {
+                return $rpcRequest->produceError(StandardError::BAD_REQUEST, 'The IdentifyAs header is required');
+            }
+
+            try
+            {
+                $channelUuid = $rpcRequest->getParameter('channel_uuid');
+                $encryptionChannel = EncryptionChannelManager::getChannel($channelUuid);
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to retrieve the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($encryptionChannel === null)
+            {
+                return $rpcRequest->produceError(StandardError::NOT_FOUND, 'The encryption channel does not exist');
+            }
+            elseif(!$encryptionChannel->isParticipant($request->getIdentifyAs()))
+            {
+                return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The encryption channel is not accessible');
+            }
+
+            if(!$rpcRequest->containsParameter('checksum'))
+            {
+                throw new MissingRpcArgumentException('checksum');
+            }
+
+            if(!$rpcRequest->containsParameter('data'))
+            {
+                throw new MissingRpcArgumentException('data');
+            }
+
+            if(!$rpcRequest->containsParameter('message_uuid'))
+            {
+                throw new MissingRpcArgumentException('message_uuid');
+            }
+
+            if(!$rpcRequest->containsParameter('timestamp'))
+            {
+                throw new MissingRpcArgumentException('timestamp');
+            }
+            elseif(!is_int($rpcRequest->getParameter('timestamp')))
+            {
+                throw new InvalidRpcArgumentException('timestamp', 'The given timestamp must be type integer');
+            }
+
+            try
+            {
+                EncryptionChannelManager::sendMessage(
+                    channelUuid: $channelUuid,
+                    recipient: $encryptionChannel->determineRecipient($request->getIdentifyAs()),
+                    checksum: $rpcRequest->getParameter('checksum'),
+                    data: $rpcRequest->getParameter('data'),
+                    messageUuid: $rpcRequest->getParameter('message_uuid'),
+                    messageTimestamp: (int)$rpcRequest->getParameter('timestamp')
+                );
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to send the message', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+            
+
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionCloseChannel.php b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionCloseChannel.php
new file mode 100644
index 0000000..159348c
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionCloseChannel.php
@@ -0,0 +1,170 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\EncryptionChannel;
+
+    use Exception;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Logger;
+    use Socialbox\Classes\Validator;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Enums\Status\EncryptionChannelStatus;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\RpcException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\EncryptionChannelManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+    use Socialbox\Socialbox;
+
+    class EncryptionCloseChannel extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('channel_uuid'))
+            {
+                throw new MissingRpcArgumentException('channel_uuid');
+            }
+            elseif(!Validator::validateUuid($rpcRequest->getParameter('channel_uuid')))
+            {
+                throw new InvalidRpcArgumentException('channel_uuid', 'The given channel uuid is not a valid UUID V4');
+            }
+
+            if($request->isExternal())
+            {
+                return self::handleExternal($request, $rpcRequest);
+            }
+
+            return self::handleInternal($request, $rpcRequest);
+        }
+
+        /**
+         * @param ClientRequest $request
+         * @param RpcRequest $rpcRequest
+         * @return SerializableInterface|null
+         * @throws StandardRpcException
+         */
+        private static function handleInternal(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+
+            try
+            {
+                $requestingPeer = $request->getPeer();
+                $encryptionChannel = EncryptionChannelManager::getChannel($rpcRequest->getParameter('channel_uuid'));
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('There was an error while trying to obtain the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($encryptionChannel === null)
+            {
+                return $rpcRequest->produceError(StandardError::NOT_FOUND, 'The requested encryption channel was not found');
+            }
+            elseif(!$encryptionChannel->isParticipant($requestingPeer->getAddress()))
+            {
+                return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The requested encryption channel is not accessible');
+            }
+            elseif($encryptionChannel->getStatus() === EncryptionChannelStatus::CLOSED)
+            {
+                return $rpcRequest->produceResponse(false);
+            }
+
+            try
+            {
+                EncryptionChannelManager::closeChannel($encryptionChannel->getUuid());
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('An error occurred while trying to close the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            $externalPeer = $encryptionChannel->getExternalPeer();
+            if($externalPeer !== null)
+            {
+                try
+                {
+                    $rpcClient = Socialbox::getExternalSession($encryptionChannel->getCallingPeerAddress()->getDomain());
+                    $rpcClient->encryptionCloseChannel(
+                        channelUuid: $rpcRequest->getParameter('channel_uuid'),
+                        identifiedAs: $requestingPeer->getAddress()
+                    );
+                }
+                catch(Exception $e)
+                {
+                    try
+                    {
+                        EncryptionChannelManager::declineChannel($rpcRequest->getParameter('channel_uuid'), true);
+                    }
+                    catch(DatabaseOperationException $e)
+                    {
+                        Logger::getLogger()->error('Error declining channel as server', $e);
+                    }
+
+                    if($e instanceof RpcException)
+                    {
+                        throw StandardRpcException::fromRpcException($e);
+                    }
+
+                    throw new StandardRpcException('There was an error while trying to notify the external server of the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+                }
+            }
+
+            return $rpcRequest->produceResponse(true);
+        }
+
+        /**
+         * @param ClientRequest $request
+         * @param RpcRequest $rpcRequest
+         * @return SerializableInterface|null
+         * @throws StandardRpcException
+         */
+        private static function handleExternal(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if($request->getIdentifyAs() === null)
+            {
+                throw new StandardRpcException('The IdentifyAs field is required for external requests', StandardError::UNAUTHORIZED);
+            }
+
+            try
+            {
+                $encryptionChannel = EncryptionChannelManager::getChannel($rpcRequest->getParameter('channel_uuid'));
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('An error occurred while trying to obtain the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($encryptionChannel === null)
+            {
+                return $rpcRequest->produceError(StandardError::NOT_FOUND, 'The requested encryption channel was not found');
+            }
+
+            if(!$encryptionChannel->isParticipant($request->getIdentifyAs()))
+            {
+                return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The requested encryption channel is not accessible');
+            }
+
+            if($encryptionChannel->getStatus() === EncryptionChannelStatus::CLOSED)
+            {
+                return $rpcRequest->produceResponse(false);
+            }
+
+            try
+            {
+                EncryptionChannelManager::closeChannel($encryptionChannel->getUuid());
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('An error occurred while trying to close the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionCreateChannel.php b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionCreateChannel.php
new file mode 100644
index 0000000..9f5b7af
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionCreateChannel.php
@@ -0,0 +1,263 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\EncryptionChannel;
+
+    use Exception;
+    use InvalidArgumentException;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Cryptography;
+    use Socialbox\Classes\Logger;
+    use Socialbox\Classes\Validator;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\RpcException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\EncryptionChannelManager;
+    use Socialbox\Managers\RegisteredPeerManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\PeerAddress;
+    use Socialbox\Objects\RpcRequest;
+    use Socialbox\Socialbox;
+
+    class EncryptionCreateChannel extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            try
+            {
+                if ($request->isExternal())
+                {
+                    return self::handleExternal($request, $rpcRequest);
+                }
+
+                return self::handleInternal($request, $rpcRequest);
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('An error occurred while checking the request type', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+        }
+
+        /**
+         * @param ClientRequest $request
+         * @param RpcRequest $rpcRequest
+         * @return SerializableInterface|null
+         * @throws StandardRpcException
+         */
+        private static function handleInternal(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('receiving_peer'))
+            {
+                throw new MissingRpcArgumentException('receiving_peer');
+            }
+            elseif(!Validator::validatePeerAddress($rpcRequest->getParameter('receiving_peer')))
+            {
+                throw new InvalidRpcArgumentException('receiving_peer', 'Invalid Receiving Peer Address');
+            }
+
+            if(!$rpcRequest->containsParameter('public_encryption_key'))
+            {
+                throw new MissingRpcArgumentException('public_encryption_key');
+            }
+            elseif(!Cryptography::validatePublicEncryptionKey($rpcRequest->getParameter('public_encryption_key')))
+            {
+                throw new InvalidRpcArgumentException('public_encryption_key', 'The given public encryption key is invalid');
+            }
+
+            $receivingPeerAddress = PeerAddress::fromAddress($rpcRequest->getParameter('receiving_peer'));
+            Socialbox::resolvePeer($receivingPeerAddress);
+
+            try
+            {
+                $callingPeer = $request->getPeer();
+                $callingPeerAddress = PeerAddress::fromAddress($callingPeer->getAddress());
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('There was an error while trying to obtain the calling peer', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            try
+            {
+                $uuid = EncryptionChannelManager::createChannel(
+                    callingPeer: $callingPeerAddress,
+                    receivingPeer: $receivingPeerAddress,
+                    callingPublicEncryptionKey: $rpcRequest->getParameter('public_encryption_ke')
+                );
+            }
+            catch(InvalidArgumentException $e)
+            {
+                throw new InvalidRpcArgumentException(null, $e);
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('There was an error while trying to create a new encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            // If the receiver is in an external server, we must notify the external server as a client
+            if($receivingPeerAddress->isExternal())
+            {
+                // Obtain the RPC Client, if for any reason it fails; we set the encryption channel as declined.
+                try
+                {
+                    $rpcClient = Socialbox::getExternalSession($receivingPeerAddress->getDomain());
+                    $externalUuid = $rpcClient->encryptionCreateChannel(
+                        receivingPeer: $receivingPeerAddress,
+                        publicEncryptionKey: $rpcRequest->getParameter('public_encryption_key'),
+                        channelUuid: $uuid,
+                        identifiedAs: $callingPeerAddress
+                    );
+                }
+                catch(Exception $e)
+                {
+                    try
+                    {
+                        EncryptionChannelManager::declineChannel($uuid, true);
+                    }
+                    catch(DatabaseOperationException $e)
+                    {
+                        Logger::getLogger()->error('Error declining channel as server', $e);
+                    }
+
+                    if($e instanceof RpcException)
+                    {
+                        throw StandardRpcException::fromRpcException($e);
+                    }
+
+                    throw new StandardRpcException('There was an error while trying to notify the external server of the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+                }
+
+                // Check for sanity reasons
+                if($externalUuid !== $uuid)
+                {
+                    try
+                    {
+                        EncryptionChannelManager::declineChannel($uuid, true);
+                    }
+                    catch(DatabaseOperationException $e)
+                    {
+                        Logger::getLogger()->error('Error declining channel as server', $e);
+                    }
+
+                    throw new StandardRpcException('The external server did not return the correct UUID', StandardError::UUID_MISMATCH);
+                }
+            }
+
+            return null;
+        }
+
+        /**
+         * @param ClientRequest $request
+         * @param RpcRequest $rpcRequest
+         * @return SerializableInterface|null
+         * @throws StandardRpcException
+         */
+        private static function handleExternal(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if($request->getIdentifyAs() === null)
+            {
+                return $rpcRequest->produceError(StandardError::BAD_REQUEST, 'Missing IdentifyAs request header');
+            }
+
+            $callingPeer = $request->getIdentifyAs();
+            Socialbox::resolvePeer($callingPeer);
+
+            if(!$rpcRequest->containsParameter('receiving_peer'))
+            {
+                throw new MissingRpcArgumentException('receiving_peer');
+            }
+            elseif(!Validator::validatePeerAddress($rpcRequest->getParameter('receiving_peer')))
+            {
+                throw new InvalidRpcArgumentException('receiving_peer', 'Invalid Receiving Peer Address');
+            }
+
+            if(!$rpcRequest->containsParameter('public_encryption_key'))
+            {
+                throw new MissingRpcArgumentException('public_encryption_key');
+            }
+            elseif(!Cryptography::validatePublicEncryptionKey($rpcRequest->getParameter('public_encryption_key')))
+            {
+                throw new InvalidRpcArgumentException('public_encryption_key', 'The given public encryption key is invalid');
+            }
+
+            // Check for an additional required parameter 'channel_uuid'
+            if(!$rpcRequest->containsParameter('channel_uuid'))
+            {
+                throw new MissingRpcArgumentException('channel_uuid');
+            }
+            elseif(!Validator::validateUuid($rpcRequest->getParameter('channel_uuid')))
+            {
+                throw new InvalidRpcArgumentException('channel_uuid', 'The given UUID is not a valid UUID v4 format');
+            }
+
+            // Check if the UUID already is used on this server
+            try
+            {
+                if(EncryptionChannelManager::channelUuidExists($rpcRequest->getParameter('channel_uuid')))
+                {
+                    return $rpcRequest->produceError(StandardError::UUID_CONFLICT, 'The given UUID already exists with another existing encryption channel on this server');
+                }
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('There was an error while checking the existence of the channel UUID', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            $receivingPeerAddress = PeerAddress::fromAddress($rpcRequest->getParameter('receiving_peer'));
+            if($receivingPeerAddress->isExternal())
+            {
+                return $rpcRequest->produceError(StandardError::PEER_NOT_FOUND, 'The receiving peer does not belong to this server');
+            }
+
+            try
+            {
+                $receivingPeer = RegisteredPeerManager::getPeerByAddress($rpcRequest->getParameter('receiving_peer'));
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('There was an error while trying to obtain the receiving peer', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($receivingPeer === null)
+            {
+                return $rpcRequest->produceError(StandardError::PEER_NOT_FOUND, 'The receiving peer does not exist on this server');
+            }
+
+            try
+            {
+                $uuid = EncryptionChannelManager::createChannel(
+                    callingPeer: $callingPeer,
+                    receivingPeer: $receivingPeerAddress,
+                    callingPublicEncryptionKey: $rpcRequest->getParameter('public_encryption_key'),
+                    channelUUid: $rpcRequest->getParameter('channel_uuid')
+                );
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('There was an error while trying to create the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($uuid !== $rpcRequest->getParameter('channel_uuid'))
+            {
+                try
+                {
+                    EncryptionChannelManager::declineChannel($rpcRequest->getParameter('channel_uuid'), true);
+                }
+                catch(DatabaseOperationException $e)
+                {
+                    Logger::getLogger()->error('There was an error while trying to decline the encryption channel as a server', $e);
+                }
+
+                return $rpcRequest->produceError(StandardError::UUID_MISMATCH, 'The created UUID in the server does not match the UUID that was received');
+            }
+
+            return $rpcRequest->produceResponse($uuid);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionDeclineChannel.php b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionDeclineChannel.php
new file mode 100644
index 0000000..a93b3fa
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionDeclineChannel.php
@@ -0,0 +1,187 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\EncryptionChannel;
+
+    use Exception;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Logger;
+    use Socialbox\Classes\Validator;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Enums\Status\EncryptionChannelStatus;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\RpcException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\EncryptionChannelManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+    use Socialbox\Socialbox;
+
+    class EncryptionDeclineChannel extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            try
+            {
+                if ($request->isExternal())
+                {
+                    return self::handleExternal($request, $rpcRequest);
+                }
+
+                return self::handleInternal($request, $rpcRequest);
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('An error occurred while checking the request type', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+        }
+
+        /**
+         * @param ClientRequest $request
+         * @param RpcRequest $rpcRequest
+         * @return SerializableInterface|null
+         * @throws StandardRpcException
+         */
+        private static function handleInternal(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('channel_uuid'))
+            {
+                throw new MissingRpcArgumentException('channel_uuid');
+            }
+            elseif(!Validator::validateUuid($rpcRequest->getParameter('channel_uuid')))
+            {
+                throw new InvalidRpcArgumentException('channel_uuid', 'The given channel uuid is not a valid UUID V4');
+            }
+
+            try
+            {
+                $receivingPeer = $request->getPeer();
+                $encryptionChannel = EncryptionChannelManager::getChannel($rpcRequest->getParameter('channel_uuid'));
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('There was an error while trying to obtain the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($encryptionChannel === null)
+            {
+                return $rpcRequest->produceError(StandardError::NOT_FOUND, 'The requested encryption channel was not found');
+            }
+            elseif($encryptionChannel->getReceivingPeerAddress()->getAddress() !== $receivingPeer->getAddress())
+            {
+                return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The requested encryption channel is not accessible');
+            }
+            elseif($encryptionChannel->getStatus() !== EncryptionChannelStatus::AWAITING_RECEIVER)
+            {
+                return $rpcRequest->produceError(StandardError::FORBIDDEN, 'The encryption channel is not awaiting the receiver');
+            }
+
+            if($encryptionChannel->getCallingPeerAddress()->isExternal())
+            {
+                try
+                {
+                    $rpcClient = Socialbox::getExternalSession($encryptionChannel->getCallingPeerAddress()->getDomain());
+                    $rpcClient->encryptionDeclineChannel(
+                        channelUuid: $rpcRequest->getParameter('channel_uuid'),
+                        identifiedAs: $receivingPeer->getAddress()
+                    );
+                }
+                catch(Exception $e)
+                {
+                    try
+                    {
+                        EncryptionChannelManager::declineChannel($rpcRequest->getParameter('channel_uuid'), true);
+                    }
+                    catch(DatabaseOperationException $e)
+                    {
+                        Logger::getLogger()->error('Error declining channel as server', $e);
+                    }
+
+                    if($e instanceof RpcException)
+                    {
+                        throw StandardRpcException::fromRpcException($e);
+                    }
+
+                    throw new StandardRpcException('There was an error while trying to notify the external server of the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+                }
+            }
+
+            try
+            {
+                EncryptionChannelManager::declineChannel(
+                    channelUuid: $rpcRequest->getParameter('channel_uuid')
+                );
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('There was an error while trying to decline the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse(true);
+        }
+
+        /**
+         * @param ClientRequest $request
+         * @param RpcRequest $rpcRequest
+         * @return SerializableInterface|null
+         * @throws StandardRpcException
+         */
+        private static function handleExternal(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if($request->getIdentifyAs() === null)
+            {
+                return $rpcRequest->produceError(StandardError::BAD_REQUEST, 'Missing required header IdentifyAs');
+            }
+
+            if(!$rpcRequest->containsParameter('channel_uuid'))
+            {
+                throw new MissingRpcArgumentException('channel_uuid');
+            }
+            elseif(!Validator::validateUuid($rpcRequest->getParameter('channel_uuid')))
+            {
+                throw new InvalidRpcArgumentException('channel_uuid', 'The given channel uuid is not a valid UUID V4');
+            }
+
+            try
+            {
+                $receivingPeer = Socialbox::resolvePeer($request->getIdentifyAs());
+                $encryptionChannel = EncryptionChannelManager::getChannel($rpcRequest->getParameter('channel_uuid'));
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('There was an error while trying to obtain the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($encryptionChannel === null)
+            {
+                return $rpcRequest->produceError(StandardError::NOT_FOUND, 'The requested encryption channel was not found');
+            }
+            elseif($encryptionChannel->getReceivingPeerAddress() !== $receivingPeer->getPeerAddress())
+            {
+                return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The requested encryption channel is not accessible');
+            }
+            elseif($encryptionChannel->getStatus() !== EncryptionChannelStatus::AWAITING_RECEIVER)
+            {
+                return $rpcRequest->produceError(StandardError::FORBIDDEN, 'The encryption channel is not awaiting the receiver');
+            }
+
+            try
+            {
+                EncryptionChannelManager::declineChannel(
+                    channelUuid: $rpcRequest->getParameter('channel_uuid')
+                );
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('There was an error while trying to decline the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionGetChannel.php b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionGetChannel.php
new file mode 100644
index 0000000..ccae0eb
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionGetChannel.php
@@ -0,0 +1,55 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\EncryptionChannel;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Validator;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\EncryptionChannelManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class EncryptionGetChannel extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('channel_uuid'))
+            {
+                throw new MissingRpcArgumentException('channel_uuid');
+            }
+            elseif(!Validator::validateUuid($rpcRequest->getParameter('channel_uuid')))
+            {
+                throw new InvalidRpcArgumentException('channel_uuid', 'The given channel uuid is not a valid UUID V4');
+            }
+
+            try
+            {
+                $requestingPeer = $request->getPeer();
+                $encryptionChannel = EncryptionChannelManager::getChannel($rpcRequest->getParameter('channel_uuid'));
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('There was an error while trying to obtain the encryption channel', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($encryptionChannel === null)
+            {
+                return $rpcRequest->produceError(StandardError::NOT_FOUND, 'The requested encryption channel was not found');
+            }
+            elseif(!$encryptionChannel->isParticipant($requestingPeer->getAddress()))
+            {
+                return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The requested encryption channel is not accessible');
+            }
+
+            return $rpcRequest->produceResponse($encryptionChannel->toStandard());
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Ping.php b/src/Socialbox/Classes/StandardMethods/Ping.php
deleted file mode 100644
index c0b8007..0000000
--- a/src/Socialbox/Classes/StandardMethods/Ping.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Socialbox\Classes\StandardMethods;
-
-use Socialbox\Abstracts\Method;
-use Socialbox\Interfaces\SerializableInterface;
-use Socialbox\Objects\ClientRequest;
-use Socialbox\Objects\RpcRequest;
-
-class Ping extends Method
-{
-    /**
-     * @inheritDoc
-     */
-    public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
-    {
-        return $rpcRequest->produceResponse(true);
-    }
-}
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/ServerDocuments/AcceptCommunityGuidelines.php b/src/Socialbox/Classes/StandardMethods/ServerDocuments/AcceptCommunityGuidelines.php
new file mode 100644
index 0000000..66dbb6e
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/ServerDocuments/AcceptCommunityGuidelines.php
@@ -0,0 +1,50 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\ServerDocuments;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\Flags\SessionFlags;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\SessionManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class AcceptCommunityGuidelines extends Method
+    {
+
+        /**
+         * Executes the process of accepting the community guidelines.
+         *
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            try
+            {
+                $session = $request->getSession();
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to retrieve session', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+            if(!$session->flagExists(SessionFlags::VER_COMMUNITY_GUIDELINES))
+            {
+                return $rpcRequest->produceError(StandardError::FORBIDDEN, 'Community guidelines has already been accepted');
+            }
+
+            try
+            {
+                // Check & update the session flow
+                SessionManager::updateFlow($session, [SessionFlags::VER_COMMUNITY_GUIDELINES]);
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to update session flow', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/ServerDocuments/AcceptPrivacyPolicy.php b/src/Socialbox/Classes/StandardMethods/ServerDocuments/AcceptPrivacyPolicy.php
new file mode 100644
index 0000000..681b06f
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/ServerDocuments/AcceptPrivacyPolicy.php
@@ -0,0 +1,50 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\ServerDocuments;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\Flags\SessionFlags;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\SessionManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class AcceptPrivacyPolicy extends Method
+    {
+        /**
+         * Executes the process of accepting the privacy policy.
+         *
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            try
+            {
+                $session = $request->getSession();
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to retrieve session', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if(!$session->flagExists(SessionFlags::VER_PRIVACY_POLICY))
+            {
+                return $rpcRequest->produceError(StandardError::FORBIDDEN, 'Privacy policy has already been accepted');
+            }
+
+            try
+            {
+                // Check & update the session flow
+                SessionManager::updateFlow($session, [SessionFlags::VER_PRIVACY_POLICY]);
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to update session flow', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/ServerDocuments/AcceptTermsOfService.php b/src/Socialbox/Classes/StandardMethods/ServerDocuments/AcceptTermsOfService.php
new file mode 100644
index 0000000..7605f7f
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/ServerDocuments/AcceptTermsOfService.php
@@ -0,0 +1,50 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\ServerDocuments;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\Flags\SessionFlags;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\SessionManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class AcceptTermsOfService extends Method
+    {
+        /**
+         * Executes the process of accepting the terms of service.
+         *
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            try
+            {
+                $session = $request->getSession();
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to retrieve session', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if(!$session->flagExists(SessionFlags::VER_TERMS_OF_SERVICE))
+            {
+                return $rpcRequest->produceError(StandardError::METHOD_NOT_ALLOWED, 'Terms of service has already been accepted');
+            }
+
+            try
+            {
+                // Check & update the session flow
+                SessionManager::updateFlow($session, [SessionFlags::VER_TERMS_OF_SERVICE]);
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to update session flow', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/ServerDocuments/GetCommunityGuidelines.php b/src/Socialbox/Classes/StandardMethods/ServerDocuments/GetCommunityGuidelines.php
new file mode 100644
index 0000000..0b32e38
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/ServerDocuments/GetCommunityGuidelines.php
@@ -0,0 +1,27 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\ServerDocuments;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Classes\Resources;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+    use Socialbox\Objects\Standard\ServerDocument;
+
+    class GetCommunityGuidelines extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            return $rpcRequest->produceResponse(new ServerDocument([
+                'last_updated' => Configuration::getRegistrationConfiguration()->getCommunityGuidelinesDate(),
+                'title' => 'Community Guidelines',
+                'content' => Resources::getCommunityGuidelines()
+            ]));
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/ServerDocuments/GetPrivacyPolicy.php b/src/Socialbox/Classes/StandardMethods/ServerDocuments/GetPrivacyPolicy.php
new file mode 100644
index 0000000..ffb0eb6
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/ServerDocuments/GetPrivacyPolicy.php
@@ -0,0 +1,27 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\ServerDocuments;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Classes\Resources;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+    use Socialbox\Objects\Standard\ServerDocument;
+
+    class GetPrivacyPolicy extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            return $rpcRequest->produceResponse(new ServerDocument([
+                'last_updated' => Configuration::getRegistrationConfiguration()->getPrivacyPolicyDate(),
+                'title' => 'Privacy Policy',
+                'content' => Resources::getPrivacyPolicy()
+            ]));
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/ServerDocuments/GetTermsOfService.php b/src/Socialbox/Classes/StandardMethods/ServerDocuments/GetTermsOfService.php
new file mode 100644
index 0000000..525ada4
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/ServerDocuments/GetTermsOfService.php
@@ -0,0 +1,27 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\ServerDocuments;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Classes\Resources;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+    use Socialbox\Objects\Standard\ServerDocument;
+
+    class GetTermsOfService extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            return $rpcRequest->produceResponse(new ServerDocument([
+                'last_updated' => Configuration::getRegistrationConfiguration()->getTermsOfServiceDate(),
+                'title' => 'Terms of Service',
+                'content' => Resources::getTermsOfService()
+            ]));
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Settings/SettingsAddInformationField.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsAddInformationField.php
new file mode 100644
index 0000000..30b5978
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsAddInformationField.php
@@ -0,0 +1,151 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Settings;
+
+    use Exception;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\Flags\SessionFlags;
+    use Socialbox\Enums\PrivacyState;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Enums\Types\InformationFieldName;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\PeerInformationManager;
+    use Socialbox\Managers\SessionManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class SettingsAddInformationField extends Method
+    {
+        /**
+         * @inheritDoc
+         * @noinspection DuplicatedCode
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            // Field parameter is required
+            if(!$rpcRequest->containsParameter('field'))
+            {
+                throw new MissingRpcArgumentException('field');
+            }
+            $fieldName = InformationFieldName::tryFrom(strtoupper($rpcRequest->getParameter('field')));
+            if($fieldName === null)
+            {
+                throw new InvalidRpcArgumentException('field');
+            }
+
+            // Value parameter is required
+            if(!$rpcRequest->containsParameter('value'))
+            {
+                throw new MissingRpcArgumentException('value');
+            }
+            $value = $rpcRequest->getParameter('value');
+            if(!$fieldName->validate($value))
+            {
+                throw new InvalidRpcArgumentException('value');
+            }
+
+            // Privacy parameter is optional
+            $privacy = null;
+            if($rpcRequest->containsParameter('privacy') && $rpcRequest->getParameter('privacy') !== null)
+            {
+                $privacy = PrivacyState::tryFrom(strtoupper($rpcRequest->getParameter('privacy')));
+                if($privacy === null)
+                {
+                    throw new InvalidRpcArgumentException('privacy');
+                }
+            }
+
+            try
+            {
+                $peer = $request->getPeer();
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to retrieve peer information', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            try
+            {
+                if (PeerInformationManager::fieldExists($peer, $fieldName))
+                {
+                    // Return False, because the field already exists
+                    return $rpcRequest->produceResponse(false);
+                }
+
+                PeerInformationManager::addField($peer, $fieldName, $value, $privacy);
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to add the information field', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            // Update the session flow if necessary
+            try
+            {
+                switch($fieldName)
+                {
+                    case InformationFieldName::DISPLAY_NAME:
+                        SessionManager::updateFlow($request->getSession(), [SessionFlags::SET_DISPLAY_NAME]);
+                        break;
+
+                    case InformationFieldName::FIRST_NAME:
+                        SessionManager::updateFlow($request->getSession(), [SessionFlags::SET_FIRST_NAME]);
+                        break;
+
+                    case InformationFieldName::MIDDLE_NAME:
+                        SessionManager::updateFlow($request->getSession(), [SessionFlags::SET_MIDDLE_NAME]);
+                        break;
+
+                    case InformationFieldName::LAST_NAME:
+                        SessionManager::updateFlow($request->getSession(), [SessionFlags::SET_LAST_NAME]);
+                        break;
+
+                    case InformationFieldName::BIRTHDAY:
+                        SessionManager::updateFlow($request->getSession(), [SessionFlags::SET_BIRTHDAY]);
+                        break;
+
+                    case InformationFieldName::PHONE_NUMBER:
+                        SessionManager::updateFlow($request->getSession(), [SessionFlags::SET_PHONE]);
+                        break;
+
+                    case InformationFieldName::EMAIL_ADDRESS:
+                        SessionManager::updateFlow($request->getSession(), [SessionFlags::SET_EMAIL]);
+                        break;
+
+                    case InformationFieldName::URL:
+                        SessionManager::updateFlow($request->getSession(), [SessionFlags::SET_URL]);
+                        break;
+
+                    default:
+                        break;
+                }
+            }
+            catch (Exception $e)
+            {
+                try
+                {
+                    // Rollback the information field otherwise the peer will be stuck with an incomplete session flow
+                    PeerInformationManager::deleteField($peer, $fieldName);
+                }
+                catch (DatabaseOperationException $e)
+                {
+                    // Something is seriously wrong if we can't roll back the information field
+                    throw new StandardRpcException('Failed to rollback the information field', StandardError::INTERNAL_SERVER_ERROR, $e);
+                }
+
+                if($e instanceof StandardRpcException)
+                {
+                    throw $e;
+                }
+
+                throw new StandardRpcException('Failed to update the session flow', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Settings/SettingsAddSignature.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsAddSignature.php
new file mode 100644
index 0000000..cca89cf
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsAddSignature.php
@@ -0,0 +1,68 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Settings;
+
+    use Exception;
+    use InvalidArgumentException;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\SigningKeysManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class SettingsAddSignature extends Method
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('public_key'))
+            {
+                throw new MissingRpcArgumentException('public_key');
+            }
+
+            $expires = null;
+            if($rpcRequest->containsParameter('expires'))
+            {
+                $expires = (int)$rpcRequest->getParameter('expires');
+            }
+            if(!$rpcRequest->containsParameter('name'))
+            {
+                throw new MissingRpcArgumentException('name');
+            }
+
+            $name = null;
+            if($rpcRequest->containsParameter('name'))
+            {
+                $name = $rpcRequest->getParameter('name');
+            }
+
+            try
+            {
+                $peerUuid = $request->getPeer()->getUuid();
+                if(SigningKeysManager::getSigningKeyCount($peerUuid) >= Configuration::getPoliciesConfiguration()->getMaxSigningKeys())
+                {
+                    return $rpcRequest->produceError(StandardError::FORBIDDEN, 'The maximum number of signing keys has been reached, the server\'s configured limit is: ' . Configuration::getPoliciesConfiguration()->getMaxSigningKeys());
+                }
+
+                $uuid = SigningKeysManager::addSigningKey($peerUuid, $rpcRequest->getParameter('public_key'), $name, $expires);
+            }
+            catch(InvalidArgumentException $e)
+            {
+                throw new InvalidRpcArgumentException($e);
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to add the signing key', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse($uuid);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeleteInformationField.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeleteInformationField.php
new file mode 100644
index 0000000..f5f15b8
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeleteInformationField.php
@@ -0,0 +1,122 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Settings;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Enums\Types\InformationFieldName;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\PeerInformationManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class SettingsDeleteInformationField extends Method
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            // Field parameter is required
+            if(!$rpcRequest->containsParameter('field'))
+            {
+                throw new MissingRpcArgumentException('field');
+            }
+            $fieldName = InformationFieldName::tryFrom(strtoupper($rpcRequest->getParameter('field')));
+            if($fieldName === null)
+            {
+                throw new InvalidRpcArgumentException('field');
+            }
+
+            try
+            {
+                if(!PeerInformationManager::fieldExists($request->getPeer(), $fieldName))
+                {
+                    return $rpcRequest->produceResponse(false);
+                }
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to check if the information field exists', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            // Prevent the removal of required fields
+            switch($fieldName)
+            {
+                case InformationFieldName::DISPLAY_NAME:
+                    if(Configuration::getRegistrationConfiguration()->isDisplayNameRequired())
+                    {
+                        return $rpcRequest->produceError(StandardError::FORBIDDEN, 'A display name is required for this server');
+                    }
+                    break;
+
+                case InformationFieldName::FIRST_NAME:
+                    if(Configuration::getRegistrationConfiguration()->isFirstNameRequired())
+                    {
+                        return $rpcRequest->produceError(StandardError::FORBIDDEN, 'A first name is required for this server');
+                    }
+                    break;
+
+                case InformationFieldName::MIDDLE_NAME:
+                    if(Configuration::getRegistrationConfiguration()->isMiddleNameRequired())
+                    {
+                        return $rpcRequest->produceError(StandardError::FORBIDDEN, 'A middle name is required for this server');
+                    }
+                    break;
+
+                case InformationFieldName::LAST_NAME:
+                    if(Configuration::getRegistrationConfiguration()->isLastNameRequired())
+                    {
+                        return $rpcRequest->produceError(StandardError::FORBIDDEN, 'A last name is required for this server');
+                    }
+                    break;
+
+                case InformationFieldName::BIRTHDAY:
+                    if(Configuration::getRegistrationConfiguration()->isBirthdayRequired())
+                    {
+                        return $rpcRequest->produceError(StandardError::FORBIDDEN, 'A birthday is required for this server');
+                    }
+                    break;
+
+                case InformationFieldName::PHONE_NUMBER:
+                    if(Configuration::getRegistrationConfiguration()->isPhoneNumberRequired())
+                    {
+                        return $rpcRequest->produceError(StandardError::FORBIDDEN, 'A phone number is required for this server');
+                    }
+                    break;
+
+                case InformationFieldName::EMAIL_ADDRESS:
+                    if(Configuration::getRegistrationConfiguration()->isEmailAddressRequired())
+                    {
+                        return $rpcRequest->produceError(StandardError::FORBIDDEN, 'An email address is required for this server');
+                    }
+                    break;
+
+                case InformationFieldName::URL:
+                    if(Configuration::getRegistrationConfiguration()->isUrlRequired())
+                    {
+                        return $rpcRequest->produceError(StandardError::FORBIDDEN, 'A URL is required for this server');
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+
+            try
+            {
+                PeerInformationManager::deleteField($request->getPeer(), $fieldName);
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to delete the information field', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeleteOtp.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeleteOtp.php
new file mode 100644
index 0000000..55bef0a
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeleteOtp.php
@@ -0,0 +1,95 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Settings;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Classes\Cryptography;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\CryptographyException;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\OneTimePasswordManager;
+    use Socialbox\Managers\PasswordManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class SettingsDeleteOtp extends Method
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(Configuration::getRegistrationConfiguration()->isOtpRequired())
+            {
+                return $rpcRequest->produceError(StandardError::FORBIDDEN, 'One Time Password is required for this server');
+            }
+
+            try
+            {
+                $peer = $request->getPeer();
+                if (!OneTimePasswordManager::usesOtp($peer->getUuid()))
+                {
+                    return $rpcRequest->produceResponse(false);
+                }
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to check One Time Password due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            try
+            {
+                $usesPassword = PasswordManager::usesPassword($peer);
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to check password usage due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            // Password verification is required to set an OTP if a password is set
+            if($usesPassword)
+            {
+                if(!$rpcRequest->containsParameter('password'))
+                {
+                    throw new InvalidRpcArgumentException('password', 'When a password is set, the current password must be provided to delete an OTP');
+                }
+
+                if(!Cryptography::validateSha512($rpcRequest->getParameter('password')))
+                {
+                    throw new InvalidRpcArgumentException('password', 'The provided password is not a valid SHA-512 hash');
+                }
+
+                try
+                {
+                    if(!PasswordManager::verifyPassword($peer, $rpcRequest->getParameter('password')))
+                    {
+                        return $rpcRequest->produceError(StandardError::FORBIDDEN, 'The provided password is incorrect');
+                    }
+                }
+                catch(CryptographyException $e)
+                {
+                    throw new StandardRpcException($e->getMessage(), StandardError::CRYPTOGRAPHIC_ERROR, $e);
+                }
+                catch(DatabaseOperationException $e)
+                {
+                    throw new StandardRpcException('Failed to verify password due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
+                }
+            }
+
+            try
+            {
+                // Delete the OTP
+                OneTimePasswordManager::deleteOtp($peer);
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to set password due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeletePassword.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeletePassword.php
new file mode 100644
index 0000000..1f45c67
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeletePassword.php
@@ -0,0 +1,78 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Settings;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Classes\Cryptography;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\CryptographyException;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\PasswordManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class SettingsDeletePassword extends Method
+    {
+        /**
+         * Executes the password deletion process, validating the required parameters
+         * and deleting the password if the existing password is correct.
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            // Prevent deletion of password if it is required
+            if(Configuration::getRegistrationConfiguration()->isPasswordRequired())
+            {
+                return $rpcRequest->produceError(StandardError::FORBIDDEN, 'A password is required for this server');
+            }
+
+            // Check if the password parameter is present
+            if(!$rpcRequest->containsParameter('password'))
+            {
+                throw new MissingRpcArgumentException('password');
+            }
+
+            // Validate the password parameter
+            if(!Cryptography::validateSha512($rpcRequest->getParameter('password')))
+            {
+                throw new InvalidRpcArgumentException('password', 'Must be a valid SHA-512 hash');
+            }
+
+            try
+            {
+                // Get the peer
+                $peer = $request->getPeer();
+
+                // Check if the password is set
+                if (!PasswordManager::usesPassword($peer->getUuid()))
+                {
+                    return $rpcRequest->produceError(StandardError::METHOD_NOT_ALLOWED, "Cannot delete password when one isn't already set");
+                }
+
+                // Verify the existing password before deleting it
+                if (!PasswordManager::verifyPassword($peer->getUuid(), $rpcRequest->getParameter('password')))
+                {
+                    return $rpcRequest->produceResponse(false);
+                }
+
+                // Delete the password
+                PasswordManager::deletePassword($peer->getUuid());
+            }
+            catch(CryptographyException)
+            {
+                return $rpcRequest->produceError(StandardError::CRYPTOGRAPHIC_ERROR, 'Failed to delete password due to a cryptographic error');
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to delete password due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            // Success
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeleteSignature.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeleteSignature.php
new file mode 100644
index 0000000..176163c
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsDeleteSignature.php
@@ -0,0 +1,56 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Settings;
+
+    use Exception;
+    use InvalidArgumentException;
+    use ncc\ThirdParty\Symfony\Uid\Uuid;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\SigningKeysManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class SettingsDeleteSignature extends Method
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('uuid'))
+            {
+                throw new MissingRpcArgumentException('uuid');
+            }
+
+            try
+            {
+                $uuid = Uuid::fromString($rpcRequest->getParameter('uuid'));
+            }
+            catch(InvalidArgumentException)
+            {
+                throw new InvalidRpcArgumentException('uuid');
+            }
+
+            try
+            {
+                if(!SigningKeysManager::signingKeyExists($request->getPeer()->getUuid(), $uuid))
+                {
+                    return $rpcRequest->produceResponse(false);
+                }
+
+                SigningKeysManager::deleteSigningKey($request->getPeer()->getUuid(), $uuid);
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to delete the signing key', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetInformationField.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetInformationField.php
new file mode 100644
index 0000000..58bb968
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetInformationField.php
@@ -0,0 +1,50 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Settings;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Enums\Types\InformationFieldName;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\PeerInformationManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class SettingsGetInformationField extends Method
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('field'))
+            {
+                throw new MissingRpcArgumentException('field');
+            }
+            $fieldName = InformationFieldName::tryFrom(strtoupper($rpcRequest->getParameter('field')));
+            if($fieldName === null)
+            {
+                throw new InvalidRpcArgumentException('field');
+            }
+
+            try
+            {
+                $fieldRecord = PeerInformationManager::getField($request->getPeer(), $fieldName);
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to retrieve existing information fields', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($fieldRecord === null)
+            {
+                return $rpcRequest->produceError(StandardError::NOT_FOUND, 'The requested field does not exist');
+            }
+
+            return $rpcRequest->produceResponse($fieldRecord->toInformationFieldState());
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetInformationFields.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetInformationFields.php
new file mode 100644
index 0000000..30e609f
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetInformationFields.php
@@ -0,0 +1,32 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Settings;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\PeerInformationManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class SettingsGetInformationFields extends Method
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            try
+            {
+                $fieldRecords = PeerInformationManager::getFields($request->getPeer());
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to retrieve existing information fields', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse(array_map(fn($result) => $result->toInformationFieldState(), $fieldRecords));
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetSignature.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetSignature.php
new file mode 100644
index 0000000..a31814e
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetSignature.php
@@ -0,0 +1,44 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Settings;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\SigningKeysManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class SettingsGetSignature extends Method
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('uuid') && $rpcRequest->getParameter('uuid') !== null)
+            {
+                throw new MissingRpcArgumentException('uuid');
+            }
+
+            try
+            {
+                $key = SigningKeysManager::getSigningKey($request->getPeer()->getUuid(), $rpcRequest->getParameter('uuid'));
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to get the signing keys', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($key === null)
+            {
+                return $rpcRequest->produceError(StandardError::NOT_FOUND, 'The signing key does not exist');
+            }
+
+            // Return the signing key
+            return $rpcRequest->produceResponse($key->toStandard());
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetSignatures.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetSignatures.php
new file mode 100644
index 0000000..78e7039
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsGetSignatures.php
@@ -0,0 +1,39 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Settings;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\SigningKeysManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class SettingsGetSignatures extends Method
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            try
+            {
+                $keys = SigningKeysManager::getSigningKeys($request->getPeer()->getUuid());
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to get the signing keys', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if(empty($keys))
+            {
+                // Return an empty array if the results are empty
+                return $rpcRequest->produceResponse([]);
+            }
+
+            // Return the signing keys as an array of standard objects
+            return $rpcRequest->produceResponse(array_map(fn($key) => $key->toStandard(), $keys));
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Settings/SettingsInformationFieldExists.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsInformationFieldExists.php
new file mode 100644
index 0000000..3823e81
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsInformationFieldExists.php
@@ -0,0 +1,46 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Settings;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Enums\Types\InformationFieldName;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\PeerInformationManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class SettingsInformationFieldExists extends Method
+    {
+        /**
+         * @inheritDoc
+         * @noinspection DuplicatedCode
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            // Field parameter is required
+            if(!$rpcRequest->containsParameter('field'))
+            {
+                throw new MissingRpcArgumentException('field');
+            }
+            $fieldName = InformationFieldName::tryFrom(strtoupper($rpcRequest->getParameter('field')));
+            if($fieldName === null)
+            {
+                throw new InvalidRpcArgumentException('field');
+            }
+
+            try
+            {
+                return $rpcRequest->produceResponse(PeerInformationManager::fieldExists($request->getPeer(), $fieldName));
+
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to check if the requested information field exists or not', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Settings/SettingsSetOtp.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsSetOtp.php
new file mode 100644
index 0000000..5089d5d
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsSetOtp.php
@@ -0,0 +1,105 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Settings;
+
+    use Exception;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Cryptography;
+    use Socialbox\Enums\Flags\SessionFlags;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\CryptographyException;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\OneTimePasswordManager;
+    use Socialbox\Managers\PasswordManager;
+    use Socialbox\Managers\SessionManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class SettingsSetOtp extends Method
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+
+            try
+            {
+                $peer = $request->getPeer();
+                if (OneTimePasswordManager::usesOtp($peer->getUuid()))
+                {
+                    return $rpcRequest->produceError(StandardError::METHOD_NOT_ALLOWED, "Cannot set One Time Password when one is already set, use 'settingsUpdateOtp' instead");
+                }
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to check One Time Password due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($peer->isEnabled())
+            {
+                try
+                {
+                    // If the peer is disabled, the password is not used because we assume the peer is registering
+                    $usesPassword = PasswordManager::usesPassword($peer);
+                }
+                catch (DatabaseOperationException $e)
+                {
+                    throw new StandardRpcException('Failed to check password usage due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
+                }
+            }
+            else
+            {
+                $usesPassword = false;
+            }
+
+            // Password verification is required to set an OTP if a password is set
+            if($usesPassword)
+            {
+                if(!$rpcRequest->containsParameter('password'))
+                {
+                    throw new MissingRpcArgumentException('password');
+                }
+
+                if(!Cryptography::validateSha512($rpcRequest->getParameter('password')))
+                {
+                    throw new InvalidRpcArgumentException('password', 'The provided password is not a valid SHA-512 hash');
+                }
+
+                try
+                {
+                    if(!PasswordManager::verifyPassword($peer, $rpcRequest->getParameter('password')))
+                    {
+                        return $rpcRequest->produceError(StandardError::FORBIDDEN, 'The provided password is incorrect');
+                    }
+                }
+                catch(CryptographyException $e)
+                {
+                    throw new StandardRpcException($e->getMessage(), StandardError::CRYPTOGRAPHIC_ERROR, $e);
+                }
+                catch(DatabaseOperationException  $e)
+                {
+                    throw new StandardRpcException('Failed to verify password due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
+                }
+            }
+
+            try
+            {
+                // Create a new OTP and return the OTP URI to the client
+                $totpUri = OneTimePasswordManager::createOtp($peer);
+
+                // Remove the SET_PASSWORD flag & update the session flow if necessary
+                SessionManager::updateFlow($request->getSession(), [SessionFlags::SET_OTP]);
+            }
+            catch(Exception $e)
+            {
+                throw new StandardRpcException('Failed to set password due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse($totpUri);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Settings/SettingsSetPassword.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsSetPassword.php
new file mode 100644
index 0000000..54fbaab
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsSetPassword.php
@@ -0,0 +1,68 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Settings;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Cryptography;
+    use Socialbox\Enums\Flags\SessionFlags;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\CryptographyException;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\PasswordManager;
+    use Socialbox\Managers\SessionManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class SettingsSetPassword extends Method
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('password'))
+            {
+                throw new MissingRpcArgumentException('password');
+            }
+
+            if(!Cryptography::validatePasswordHash($rpcRequest->getParameter('password')))
+            {
+                throw new InvalidRpcArgumentException('password', "Must be a valid argon2id hash");
+            }
+
+            try
+            {
+                if (PasswordManager::usesPassword($request->getPeer()->getUuid()))
+                {
+                    return $rpcRequest->produceError(StandardError::METHOD_NOT_ALLOWED, "Cannot set password when one is already set, use 'settingsUpdatePassword' instead");
+                }
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to check password due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            try
+            {
+                // Set the password
+                PasswordManager::setPassword($request->getPeer(), $rpcRequest->getParameter('password'));
+
+                // Remove the SET_PASSWORD flag & update the session flow if necessary
+                SessionManager::updateFlow($request->getSession(), [SessionFlags::SET_PASSWORD]);
+            }
+            catch(CryptographyException $e)
+            {
+                throw new StandardRpcException($e->getMessage(), StandardError::CRYPTOGRAPHIC_ERROR, $e);
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to set password due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Settings/SettingsSignatureExists.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsSignatureExists.php
new file mode 100644
index 0000000..86a7c9d
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsSignatureExists.php
@@ -0,0 +1,50 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Settings;
+
+    use Exception;
+    use InvalidArgumentException;
+    use ncc\ThirdParty\Symfony\Uid\Uuid;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\SigningKeysManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class SettingsSignatureExists extends Method
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('uuid'))
+            {
+                throw new MissingRpcArgumentException('uuid');
+            }
+
+            try
+            {
+                $uuid = Uuid::fromString($rpcRequest->getParameter('uuid'));
+            }
+            catch(InvalidArgumentException)
+            {
+                throw new InvalidRpcArgumentException('uuid');
+            }
+
+            try
+            {
+                return $rpcRequest->produceResponse(SigningKeysManager::signingKeyExists($request->getPeer()->getUuid(), $uuid));
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to check the signing key existence', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Settings/SettingsUpdateInformationField.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsUpdateInformationField.php
new file mode 100644
index 0000000..43cf1e7
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsUpdateInformationField.php
@@ -0,0 +1,65 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Settings;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Enums\Types\InformationFieldName;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\PeerInformationManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class SettingsUpdateInformationField extends Method
+    {
+        /**
+         * @inheritDoc
+         * @noinspection DuplicatedCode
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            // Field parameter is required
+            if(!$rpcRequest->containsParameter('field'))
+            {
+                throw new MissingRpcArgumentException('field');
+            }
+            $fieldName = InformationFieldName::tryFrom(strtoupper($rpcRequest->getParameter('field')));
+            if($fieldName === null)
+            {
+                throw new InvalidRpcArgumentException('field');
+            }
+
+            // Value parameter is required
+            if(!$rpcRequest->containsParameter('value'))
+            {
+                throw new MissingRpcArgumentException('value');
+            }
+            $value = $rpcRequest->getParameter('value');
+            if(!$fieldName->validate($value))
+            {
+                throw new InvalidRpcArgumentException('value');
+            }
+
+            try
+            {
+                $peer = $request->getPeer();
+                if(!PeerInformationManager::fieldExists($peer, $fieldName))
+                {
+                    return $rpcRequest->produceResponse(false);
+                }
+
+                PeerInformationManager::updateField($peer, $fieldName, $value);
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to update the information field', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Settings/SettingsUpdateInformationPrivacy.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsUpdateInformationPrivacy.php
new file mode 100644
index 0000000..0ffc888
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsUpdateInformationPrivacy.php
@@ -0,0 +1,66 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Settings;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\PrivacyState;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Enums\Types\InformationFieldName;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\PeerInformationManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class SettingsUpdateInformationPrivacy extends Method
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            // Field parameter is required
+            if(!$rpcRequest->containsParameter('field'))
+            {
+                throw new MissingRpcArgumentException('field');
+            }
+            $fieldName = InformationFieldName::tryFrom(strtoupper($rpcRequest->getParameter('field')));
+            if($fieldName === null)
+            {
+                throw new InvalidRpcArgumentException('field');
+            }
+
+            // Privacy parameter is required
+            if(!$rpcRequest->containsParameter('privacy'))
+            {
+                throw new MissingRpcArgumentException('privacy');
+            }
+
+            $privacy = PrivacyState::tryFrom(strtoupper($rpcRequest->getParameter('privacy')));
+            if($privacy === null)
+            {
+                throw new InvalidRpcArgumentException('privacy');
+            }
+
+            try
+            {
+                $peer = $request->getPeer();
+                if(!PeerInformationManager::fieldExists($peer, $fieldName))
+                {
+                    return $rpcRequest->produceResponse(false);
+                }
+
+                PeerInformationManager::updatePrivacyState($peer, $fieldName, $privacy);
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to update the information field', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Settings/SettingsUpdatePassword.php b/src/Socialbox/Classes/StandardMethods/Settings/SettingsUpdatePassword.php
new file mode 100644
index 0000000..3127648
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Settings/SettingsUpdatePassword.php
@@ -0,0 +1,89 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Settings;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Cryptography;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\CryptographyException;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\PasswordManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class SettingsUpdatePassword extends Method
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('password'))
+            {
+                throw new MissingRpcArgumentException('password');
+            }
+
+            if(!Cryptography::validatePasswordHash($rpcRequest->getParameter('password')))
+            {
+                throw new InvalidRpcArgumentException('password', 'Must be a valid argon2id hash');
+            }
+
+            if(!$rpcRequest->containsParameter('existing_password'))
+            {
+                throw new MissingRpcArgumentException('existing_password');
+            }
+
+            if(!Cryptography::validateSha512($rpcRequest->getParameter('existing_password')))
+            {
+                throw new InvalidRpcArgumentException('existing_password', 'Must be a valid SHA-512 hash');
+            }
+
+            try
+            {
+                if (!PasswordManager::usesPassword($request->getPeer()->getUuid()))
+                {
+                    return $rpcRequest->produceResponse(false);
+                }
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to check password due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            try
+            {
+                if (!PasswordManager::verifyPassword($request->getPeer()->getUuid(), $rpcRequest->getParameter('existing_password')))
+                {
+                    return $rpcRequest->produceResponse(false);
+                }
+            }
+            catch(CryptographyException $e)
+            {
+                throw new StandardRpcException($e->getMessage(), StandardError::CRYPTOGRAPHIC_ERROR, $e);
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to verify existing password due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            try
+            {
+                // Set the password
+                PasswordManager::updatePassword($request->getPeer(), $rpcRequest->getParameter('password'));
+            }
+            catch(CryptographyException $e)
+            {
+                throw new StandardRpcException($e->getMessage(), StandardError::CRYPTOGRAPHIC_ERROR, $e);
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to set password due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Verification/VerificationAnswerImageCaptcha.php b/src/Socialbox/Classes/StandardMethods/Verification/VerificationAnswerImageCaptcha.php
new file mode 100644
index 0000000..c6a835b
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Verification/VerificationAnswerImageCaptcha.php
@@ -0,0 +1,59 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Verification;
+
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\Flags\SessionFlags;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\CaptchaManager;
+    use Socialbox\Managers\SessionManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class VerificationAnswerImageCaptcha extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('answer'))
+            {
+                throw new MissingRpcArgumentException('answer');
+            }
+
+            try
+            {
+                $session = $request->getSession();
+                if(CaptchaManager::getCaptcha($session->getPeerUuid())?->isExpired())
+                {
+                    return $rpcRequest->produceError(StandardError::EXPIRED, 'The captcha has expired');
+                }
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException("There was an unexpected error while trying to get the captcha", StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            try
+            {
+                $result = CaptchaManager::answerCaptcha($session->getPeerUuid(), $rpcRequest->getParameter('answer'));
+
+                if($result)
+                {
+                    SessionManager::updateFlow($session, [SessionFlags::VER_IMAGE_CAPTCHA]);
+                }
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException("There was an unexpected error while trying to answer the captcha", StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse($result);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Verification/VerificationAuthenticate.php b/src/Socialbox/Classes/StandardMethods/Verification/VerificationAuthenticate.php
new file mode 100644
index 0000000..25ed7c1
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Verification/VerificationAuthenticate.php
@@ -0,0 +1,46 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Verification;
+
+    use Exception;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\Flags\SessionFlags;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\SessionManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class VerificationAuthenticate extends Method
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            try
+            {
+                if(!$request->getPeer()->isExternal())
+                {
+                    return $rpcRequest->produceError(StandardError::FORBIDDEN, 'Only external peers can authenticate using this method');
+                }
+
+                $session = $request->getSession();
+
+                if(!$session->flagExists(SessionFlags::AUTHENTICATION_REQUIRED))
+                {
+                    return $rpcRequest->produceResponse(false);
+                }
+
+                SessionManager::updateFlow($session, [SessionFlags::AUTHENTICATION_REQUIRED]);
+            }
+            catch(Exception $e)
+            {
+                throw new StandardRpcException('An error occurred while authenticating the peer', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+
+            return $rpcRequest->produceResponse(true);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Verification/VerificationGetImageCaptcha.php b/src/Socialbox/Classes/StandardMethods/Verification/VerificationGetImageCaptcha.php
new file mode 100644
index 0000000..a741332
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Verification/VerificationGetImageCaptcha.php
@@ -0,0 +1,74 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Verification;
+
+    use Gregwar\Captcha\CaptchaBuilder;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Enums\Flags\SessionFlags;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\CaptchaManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+    use Socialbox\Objects\Standard\ImageCaptchaVerification;
+
+    class VerificationGetImageCaptcha extends Method
+    {
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            try
+            {
+                $session = $request->getSession();
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('An error occurred while trying to get the session', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            // Check for session conditions
+            if(!$session->flagExists(SessionFlags::VER_IMAGE_CAPTCHA))
+            {
+                return $rpcRequest->produceError(StandardError::METHOD_NOT_ALLOWED, 'Solving an image captcha is not required at this time');
+            }
+
+            try
+            {
+                $peer = $request->getPeer();
+                if(CaptchaManager::captchaExists($peer))
+                {
+                    $captchaRecord = CaptchaManager::getCaptcha($peer);
+                    if($captchaRecord->isExpired())
+                    {
+                        $answer = CaptchaManager::createCaptcha($peer);
+                        $captchaRecord = CaptchaManager::getCaptcha($peer);
+                    }
+                    else
+                    {
+                        $answer = $captchaRecord->getAnswer();
+                    }
+                }
+                else
+                {
+                    $answer = CaptchaManager::createCaptcha($peer);
+                    $captchaRecord = CaptchaManager::getCaptcha($peer);
+                }
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException("There was an unexpected error while trying create the captcha", StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            // Build the captcha
+            // Returns HTML base64 encoded image of the captcha
+            // Important note: Must always be HTML-BASE64 which means it must be prefixed with `data:image/jpeg;base64,`
+            return $rpcRequest->produceResponse(new ImageCaptchaVerification([
+                'expires' => $captchaRecord->getExpires(),
+                'content' => (new CaptchaBuilder($answer))->build()->inline()
+            ]));
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Verification/VerificationOtpAuthentication.php b/src/Socialbox/Classes/StandardMethods/Verification/VerificationOtpAuthentication.php
new file mode 100644
index 0000000..064d346
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Verification/VerificationOtpAuthentication.php
@@ -0,0 +1,65 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Verification;
+
+    use Exception;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Enums\Flags\SessionFlags;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\CryptographyException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\OneTimePasswordManager;
+    use Socialbox\Managers\SessionManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class VerificationOtpAuthentication extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('code'))
+            {
+                throw new MissingRpcArgumentException('code');
+            }
+
+            if(strlen($rpcRequest->getParameter('code')) !== Configuration::getSecurityConfiguration()->getOtpDigits())
+            {
+                throw new InvalidRpcArgumentException('code', 'Invalid OTP code length');
+            }
+
+            $session = $request->getSession();
+            if(!$session->flagExists(SessionFlags::VER_OTP))
+            {
+                return $rpcRequest->produceError(StandardError::METHOD_NOT_ALLOWED, 'One Time Password verification is not required at this time');
+            }
+
+            try
+            {
+                $result = OneTimePasswordManager::verifyOtp($request->getPeer(), $rpcRequest->getParameter('code'));
+
+                if($result)
+                {
+                    // If the OTP is verified, remove the OTP verification flag
+                    SessionManager::updateFlow($session, [SessionFlags::VER_OTP]);
+                }
+            }
+            catch (CryptographyException)
+            {
+                return $rpcRequest->produceResponse(false);
+            }
+            catch (Exception $e)
+            {
+                throw new StandardRpcException('Failed to verify password due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse($result);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/StandardMethods/Verification/VerificationPasswordAuthentication.php b/src/Socialbox/Classes/StandardMethods/Verification/VerificationPasswordAuthentication.php
new file mode 100644
index 0000000..7a8b078
--- /dev/null
+++ b/src/Socialbox/Classes/StandardMethods/Verification/VerificationPasswordAuthentication.php
@@ -0,0 +1,64 @@
+<?php
+
+    namespace Socialbox\Classes\StandardMethods\Verification;
+
+    use Exception;
+    use Socialbox\Abstracts\Method;
+    use Socialbox\Classes\Cryptography;
+    use Socialbox\Enums\Flags\SessionFlags;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\CryptographyException;
+    use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
+    use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\PasswordManager;
+    use Socialbox\Managers\SessionManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\RpcRequest;
+
+    class VerificationPasswordAuthentication extends Method
+    {
+
+        /**
+         * @inheritDoc
+         */
+        public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+        {
+            if(!$rpcRequest->containsParameter('password'))
+            {
+                throw new MissingRpcArgumentException('password');
+            }
+
+            if(!Cryptography::validateSha512($rpcRequest->getParameter('password')))
+            {
+                throw new InvalidRpcArgumentException('password', 'Invalid SHA-512 hash');
+            }
+
+            try
+            {
+                $session = $request->getSession();
+                if(!$session->flagExists(SessionFlags::VER_PASSWORD))
+                {
+                    return $rpcRequest->produceError(StandardError::METHOD_NOT_ALLOWED, 'Password verification is not required at this time');
+                }
+
+                $result = PasswordManager::verifyPassword($request->getPeer()->getUuid(), $rpcRequest->getParameter('password'));
+
+                if($result)
+                {
+                    SessionManager::updateFlow($request->getSession(), [SessionFlags::VER_PASSWORD]);
+                }
+            }
+            catch (CryptographyException)
+            {
+                return $rpcRequest->produceResponse(false);
+            }
+            catch (Exception $e)
+            {
+                throw new StandardRpcException('Failed to verify password due to an internal exception', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return $rpcRequest->produceResponse($result);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Utilities.php b/src/Socialbox/Classes/Utilities.php
index 5f4b44b..ce7c985 100644
--- a/src/Socialbox/Classes/Utilities.php
+++ b/src/Socialbox/Classes/Utilities.php
@@ -1,138 +1,382 @@
 <?php
 
-namespace Socialbox\Classes;
+    namespace Socialbox\Classes;
 
-use InvalidArgumentException;
-use RuntimeException;
-use Socialbox\Enums\StandardHeaders;
+    use Exception;
+    use InvalidArgumentException;
+    use JsonException;
+    use RuntimeException;
+    use Socialbox\Enums\StandardHeaders;
+    use Throwable;
 
-class Utilities
-{
-    /**
-     * Decodes a JSON string into an associative array, throws an exception if the JSON is invalid
-     *
-     * @param string $json The JSON string to decode
-     * @return array The decoded associative array
-     * @throws InvalidArgumentException If the JSON is invalid
-     */
-    public static function jsonDecode(string $json): array
+    class Utilities
     {
-        $decoded = json_decode($json, true);
-
-        if (json_last_error() !== JSON_ERROR_NONE)
+        /**
+         * Decodes a JSON string into an associative array, throws an exception if the JSON is invalid
+         *
+         * @param string $json The JSON string to decode
+         * @return array The decoded associative array
+         * @throws InvalidArgumentException If the JSON is invalid
+         */
+        public static function jsonDecode(string $json): array
         {
-            throw match (json_last_error())
+            $decoded = json_decode($json, true);
+
+            if (json_last_error() !== JSON_ERROR_NONE)
             {
-                JSON_ERROR_DEPTH => new InvalidArgumentException("JSON decoding failed: Maximum stack depth exceeded"),
-                JSON_ERROR_STATE_MISMATCH => new InvalidArgumentException("JSON decoding failed: Underflow or the modes mismatch"),
-                JSON_ERROR_CTRL_CHAR => new InvalidArgumentException("JSON decoding failed: Unexpected control character found"),
-                JSON_ERROR_SYNTAX => new InvalidArgumentException("JSON decoding failed: Syntax error, malformed JSON"),
-                JSON_ERROR_UTF8 => new InvalidArgumentException("JSON decoding failed: Malformed UTF-8 characters, possibly incorrectly encoded"),
-                default => new InvalidArgumentException("JSON decoding failed: Unknown error"),
-            };
-        }
-
-        return $decoded;
-    }
-
-    public static function jsonEncode(mixed $data): string
-    {
-        try
-        {
-            return json_encode($data, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_THROW_ON_ERROR);
-        }
-        catch(\JsonException $e)
-        {
-            throw new \RuntimeException("Failed to encode json input", $e);
-        }
-    }
-
-    /**
-     * Encodes the given data in Base64.
-     *
-     * @param string $data The data to be encoded.
-     * @return string The Base64 encoded string.
-     * @throws InvalidArgumentException if the encoding fails.
-     */
-    public static function base64encode(string $data): string
-    {
-        $encoded = base64_encode($data);
-
-        if (!$encoded)
-        {
-            throw new InvalidArgumentException('Failed to encode data in Base64');
-        }
-
-        return $encoded;
-    }
-
-    /**
-     * Decodes a Base64 encoded string.
-     *
-     * @param string $data The Base64 encoded data to be decoded.
-     * @return string The decoded data.
-     * @throws InvalidArgumentException If decoding fails.
-     */
-    public static function base64decode(string $data): string
-    {
-        $decoded = base64_decode($data, true);
-
-        if ($decoded === false)
-        {
-            throw new InvalidArgumentException('Failed to decode data from Base64');
-        }
-
-        return $decoded;
-    }
-
-    /**
-     * Returns the request headers as an associative array
-     *
-     * @return array
-     */
-    public static function getRequestHeaders(): array
-    {
-        // Check if function getallheaders() exists
-        if (function_exists('getallheaders'))
-        {
-            $headers = getallheaders();
-        }
-        else
-        {
-            // Fallback for servers where getallheaders() is not available
-            $headers = [];
-            foreach ($_SERVER as $key => $value)
-            {
-                if (str_starts_with($key, 'HTTP_'))
+                throw match (json_last_error())
                 {
-                    // Convert header names to the normal HTTP format
-                    $headers[str_replace('_', '-', strtolower(substr($key, 5)))] = $value;
+                    JSON_ERROR_DEPTH => new InvalidArgumentException("JSON decoding failed: Maximum stack depth exceeded"),
+                    JSON_ERROR_STATE_MISMATCH => new InvalidArgumentException("JSON decoding failed: Underflow or the modes mismatch"),
+                    JSON_ERROR_CTRL_CHAR => new InvalidArgumentException("JSON decoding failed: Unexpected control character found"),
+                    JSON_ERROR_SYNTAX => new InvalidArgumentException("JSON decoding failed: Syntax error, malformed JSON"),
+                    JSON_ERROR_UTF8 => new InvalidArgumentException("JSON decoding failed: Malformed UTF-8 characters, possibly incorrectly encoded"),
+                    default => new InvalidArgumentException("JSON decoding failed: Unknown error"),
+                };
+            }
+
+            return $decoded;
+        }
+
+        public static function jsonEncode(mixed $data): string
+        {
+            try
+            {
+                return json_encode($data, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_THROW_ON_ERROR);
+            }
+            catch(JsonException $e)
+            {
+                throw new InvalidArgumentException("Failed to encode json input", $e);
+            }
+        }
+
+        /**
+         * Encodes the given data in Base64.
+         *
+         * @param string $data The data to be encoded.
+         * @return string The Base64 encoded string.
+         * @throws InvalidArgumentException if the encoding fails.
+         */
+        public static function base64encode(string $data): string
+        {
+            $encoded = base64_encode($data);
+
+            if (!$encoded)
+            {
+                throw new InvalidArgumentException('Failed to encode data in Base64');
+            }
+
+            return $encoded;
+        }
+
+        /**
+         * Decodes a Base64 encoded string.
+         *
+         * @param string $data The Base64 encoded data to be decoded.
+         * @return string The decoded data.
+         * @throws InvalidArgumentException If decoding fails.
+         */
+        public static function base64decode(string $data): string
+        {
+            $decoded = base64_decode($data, true);
+
+            if ($decoded === false)
+            {
+                throw new InvalidArgumentException('Failed to decode data from Base64');
+            }
+
+            return $decoded;
+        }
+
+        /**
+         * Returns the request headers as an associative array
+         *
+         * @return array
+         */
+        public static function getRequestHeaders(): array
+        {
+            // Check if function getallheaders() exists
+            if (function_exists('getallheaders'))
+            {
+                $headers = getallheaders();
+            }
+            else
+            {
+                // Fallback for servers where getallheaders() is not available
+                $headers = [];
+                foreach ($_SERVER as $key => $value)
+                {
+                    if (str_starts_with($key, 'HTTP_'))
+                    {
+                        // Convert header names to the normal HTTP format
+                        $headers[str_replace('_', '-', strtolower(substr($key, 5)))] = $value;
+                    }
+                }
+            }
+
+            if($headers === false)
+            {
+                throw new RuntimeException('Failed to get request headers');
+            }
+
+            return $headers;
+        }
+
+        public static function throwableToString(Throwable $e, int $level=0): string
+        {
+            // Indentation for nested exceptions
+            $indentation = str_repeat('  ', $level);
+
+            // Basic information about the Throwable
+            $type = get_class($e);
+            $message = $e->getMessage() ?: 'No message';
+            $file = $e->getFile() ?: 'Unknown file';
+            $line = $e->getLine() ?? 'Unknown line';
+
+            // Compose the base string representation of this Throwable
+            $result = sprintf("%s%s: %s\n%s  in %s on line %s\n",
+                $indentation, $type, $message, $indentation, $file, $line
+            );
+
+            // Append stack trace if available
+            $stackTrace = $e->getTraceAsString();
+            if (!empty($stackTrace))
+            {
+                $result .= $indentation . "  Stack trace:\n" . $indentation . "  " . str_replace("\n", "\n" . $indentation . "  ", $stackTrace) . "\n";
+            }
+
+            // Recursively append the cause if it exists
+            $previous = $e->getPrevious();
+            if ($previous)
+            {
+                $result .= $indentation . "Caused by:\n" . self::throwableToString($previous, $level + 1);
+            }
+
+            return $result;
+        }
+
+        /**
+         * Generates a formatted header string.
+         *
+         * @param StandardHeaders $header The standard header object.
+         * @param string $value The header value to be associated with the standard header.
+         * @return string The formatted header string.
+         */
+        public static function generateHeader(StandardHeaders $header, string $value): string
+        {
+            return $header->value . ': ' . $value;
+        }
+
+        /**
+         * Generates a random string of specified length using the provided character set.
+         *
+         * @param int $int The length of the random string to be generated.
+         * @param string $string The character set to use for generating the random string.
+         * @return string The generated random string.
+         */
+        public static function randomString(int $int, string $string): string
+        {
+            $characters = str_split($string);
+            $randomString = '';
+
+            for ($i = 0; $i < $int; $i++)
+            {
+                $randomString .= $characters[array_rand($characters)];
+            }
+
+            return $randomString;
+        }
+
+        /**
+         * Generates a random CRC32 hash.
+         *
+         * @return string The generated CRC32 hash as a string.
+         */
+        public static function randomCrc32(): string
+        {
+            return hash('crc32b', uniqid());
+        }
+
+        /**
+         * Sanitizes a file name by removing any characters that are not alphanumeric, hyphen, or underscore.
+         *
+         * @param string $name The file name to be sanitized.
+         * @return string The sanitized file name.
+         */
+        public static function sanitizeFileName(string $name): string
+        {
+            return preg_replace('/[^a-zA-Z0-9-_]/', '', $name);
+        }
+
+
+        /**
+         * Sanitizes a Base64-encoded JPEG image by validating its data, decoding it,
+         * and re-encoding it to ensure it conforms to the JPEG format.
+         *
+         * @param string $data The Base64-encoded string potentially containing a JPEG image,
+         *                     optionally prefixed with "data:image/...;base64,".
+         * @return string A sanitized and re-encoded JPEG image as a binary string.
+         * @throws InvalidArgumentException If the input data is not valid Base64,
+         *                                  does not represent an image, or is not in the JPEG format.
+         */
+        public static function sanitizeJpeg(string $data): string
+        {
+            // Temporarily load the decoded data as an image
+            $tempResource = imagecreatefromstring($data);
+
+            // Validate that the decoded data is indeed an image
+            if ($tempResource === false)
+            {
+                throw new InvalidArgumentException("The data does not represent a valid image.");
+            }
+
+            // Validate MIME type using getimagesizefromstring
+            $imageInfo = getimagesizefromstring($data);
+            if ($imageInfo === false || $imageInfo['mime'] !== 'image/jpeg')
+            {
+                imagedestroy($tempResource); // Cleanup resources
+                throw new InvalidArgumentException("The image is not a valid JPEG format.");
+            }
+
+            // Capture the re-encoded image in memory and return it as a string
+            ob_start(); // Start output buffering
+            $saveResult = imagejpeg($tempResource, null, 100); // Max quality, save to output buffer
+            imagedestroy($tempResource); // Free up memory resources
+
+            if (!$saveResult)
+            {
+                ob_end_clean(); // Clean the output buffer if encoding failed
+                throw new InvalidArgumentException("Failed to encode the sanitized image.");
+            }
+
+            // Return the sanitized jpeg image as the result
+            return ob_get_clean();
+        }
+
+        /**
+         * Resizes an image to a specified width and height while maintaining its aspect ratio.
+         * The resized image is centered on a black background matching the target dimensions.
+         *
+         * @param string $data The binary data of the source image.
+         * @param int $width The desired width of the resized image.
+         * @param int $height The desired height of the resized image.
+         * @return string The binary data of the resized image in PNG format.
+         * @throws InvalidArgumentException If the source image cannot be created from the provided data.
+         * @throws Exception If image processing fails during resizing.
+         */
+        public static function resizeImage(string $data, int $width, int $height): string
+        {
+            try
+            {
+                // Create image resource from binary data
+                $sourceImage = imagecreatefromstring($data);
+                if (!$sourceImage)
+                {
+                    throw new InvalidArgumentException("Failed to create image from provided data");
+                }
+
+                // Get original dimensions
+                $sourceWidth = imagesx($sourceImage);
+                $sourceHeight = imagesy($sourceImage);
+
+                // Calculate aspect ratios
+                $sourceRatio = $sourceWidth / $sourceHeight;
+                $targetRatio = $width / $height;
+
+                // Initialize dimensions for scaling
+                $scaleWidth = $width;
+                $scaleHeight = $height;
+
+                // Calculate scaling dimensions to maintain aspect ratio
+                if ($sourceRatio > $targetRatio)
+                {
+                    // Source image is wider - scale by width
+                    $scaleHeight = $width / $sourceRatio;
+                }
+                else
+                {
+                    // Source image is taller - scale by height
+                    $scaleWidth = $height * $sourceRatio;
+                }
+
+                // Create target image with desired dimensions
+                $targetImage = imagecreatetruecolor($width, $height);
+                if (!$targetImage)
+                {
+                    throw new Exception("Failed to create target image");
+                }
+
+                // Fill background with black
+                $black = imagecolorallocate($targetImage, 0, 0, 0);
+                imagefill($targetImage, 0, 0, $black);
+
+                // Calculate padding to center the scaled image
+                $paddingX = ($width - $scaleWidth) / 2;
+                $paddingY = ($height - $scaleHeight) / 2;
+
+                // Enable alpha blending
+                imagealphablending($targetImage, true);
+                imagesavealpha($targetImage, true);
+
+                // Resize and copy the image with high-quality resampling
+                if (!imagecopyresampled($targetImage, $sourceImage, (int)$paddingX, (int)$paddingY, 0, 0, (int)$scaleWidth, (int)$scaleHeight, $sourceWidth, $sourceHeight))
+                {
+                    throw new Exception("Failed to resize image");
+                }
+
+                // Start output buffering
+                ob_start();
+
+                // Output image as PNG (you can modify this to support other formats)
+                imagepng($targetImage);
+
+                // Return the image data
+                return ob_get_clean();
+            }
+            finally
+            {
+                if (isset($sourceImage))
+                {
+                    imagedestroy($sourceImage);
+                }
+
+                if (isset($targetImage))
+                {
+                    imagedestroy($targetImage);
                 }
             }
         }
 
-        if($headers === false)
+        /**
+         * Converts an array into a serialized string by joining the elements with a comma.
+         *
+         * @param array $list An array of elements that need to be converted to a comma-separated string.
+         * @return string A string representation of the array elements, joined by commas.
+         */
+        public static function serializeList(array $list): string
         {
-            throw new RuntimeException('Failed to get request headers');
+            return implode(',', $list);
         }
 
-        return $headers;
-    }
+        /**
+         * Converts a serialized string into an array by splitting the string at each comma.
+         *
+         * @param string $list A comma-separated string that needs to be converted to an array.
+         * @return array An array of string values obtained by splitting the input string.
+         */
+        public static function unserializeList(string $list): array
+        {
+            return explode(',', $list);
+        }
 
-    public static function throwableToString(\Throwable $e): string
-    {
-        return sprintf(
-            "%s: %s in %s:%d\nStack trace:\n%s",
-            get_class($e),
-            $e->getMessage(),
-            $e->getFile(),
-            $e->getLine(),
-            $e->getTraceAsString()
-        );
-    }
-
-    public static function generateHeader(StandardHeaders $header, string $value): string
-    {
-        return $header->value . ': ' . $value;
-    }
-}
\ No newline at end of file
+        /**
+         * Checks if the given HTTP response code indicates success or failure.
+         *
+         * @param int $responseCode The HTTP response code to check.
+         * @return bool True if the response code indicates success, false otherwise.
+         */
+        public static function isSuccessCodes(int $responseCode): bool
+        {
+            return $responseCode >= 200 && $responseCode < 300;
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Classes/Validator.php b/src/Socialbox/Classes/Validator.php
index 06e9de3..02ab8f5 100644
--- a/src/Socialbox/Classes/Validator.php
+++ b/src/Socialbox/Classes/Validator.php
@@ -1,19 +1,82 @@
 <?php
 
-namespace Socialbox\Classes;
+    namespace Socialbox\Classes;
 
-class Validator
-{
-    private const PEER_ADDRESS_PATTERN = "/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/";
-
-    /**
-     * Validates a peer address
-     *
-     * @param string $address The address to validate.
-     * @return bool True if the address is valid, false otherwise.
-     */
-    public static function validatePeerAddress(string $address): bool
+    class Validator
     {
-        return preg_match(self::PEER_ADDRESS_PATTERN, $address) === 1;
-    }
-}
\ No newline at end of file
+        private const string PEER_ADDRESS_PATTERN = "/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/";
+        private const string USERNAME_PATTERN = "/^[a-zA-Z0-9_]+$/";
+
+        /**
+         * Validates a peer address
+         *
+         * @param string $address The address to validate.
+         * @return bool True if the address is valid, false otherwise.
+         */
+        public static function validatePeerAddress(string $address): bool
+        {
+            return preg_match(self::PEER_ADDRESS_PATTERN, $address) === 1;
+        }
+
+        /**
+         * Checks if the provided email address is in a valid email format.
+         *
+         * @param string $emailAddress The email address to be validated.
+         * @return bool Returns true if the email address is valid, otherwise false.
+         */
+        public static function validateEmailAddress(string $emailAddress): bool
+        {
+            return filter_var($emailAddress, FILTER_VALIDATE_EMAIL) !== false;
+        }
+
+        /**
+         * Validates a username
+         *
+         * @param string $username The username to validate.
+         * @return bool True if the username is valid, false otherwise.
+         */
+        public static function validateUsername(string $username): bool
+        {
+            if(strlen($username) < 3 || strlen($username) > 255)
+            {
+                return false;
+            }
+
+            return preg_match(self::USERNAME_PATTERN, $username) === 1;
+        }
+
+        /**
+         * Validates whether a given phone number conforms to the required format.
+         *
+         * @param string $phoneNumber The phone number to validate. Must start with a "+" followed by 1 to 15 digits.
+         * @return bool Returns true if the phone number is valid according to the format, otherwise false.
+         */
+        public static function validatePhoneNumber(string $phoneNumber): bool
+        {
+            return preg_match("/^\+[0-9]{1,15}$/", $phoneNumber) === 1;
+        }
+
+        /**
+         * Validates whether the given date is a valid gregorian calendar date.
+         *
+         * @param int $month The month component of the date (1 through 12).
+         * @param int $day The day component of the date.
+         * @param int $year The year component of the date.
+         * @return bool Returns true if the provided date is valid, otherwise false.
+         */
+        public static function validateDate(int $month, int $day, int $year): bool
+        {
+            return checkdate($month, $day, $year);
+        }
+
+        /**
+         * Validates whether the given UUID is a valid UUID.
+         *
+         * @param string $uuid The UUID to validate.
+         * @return bool Returns true if the provided UUID is valid, otherwise false.
+         */
+        public static function validateUuid(string $uuid): bool
+        {
+            return preg_match("/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/", $uuid) === 1;
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Enums/CliCommands.php b/src/Socialbox/Enums/CliCommands.php
index d160006..bfd8729 100644
--- a/src/Socialbox/Enums/CliCommands.php
+++ b/src/Socialbox/Enums/CliCommands.php
@@ -2,12 +2,13 @@
 
 namespace Socialbox\Enums;
 
-use Socialbox\Classes\CliCommands\HelpCommand;
+use Socialbox\Classes\CliCommands\DnsRecordCommand;
 use Socialbox\Classes\CliCommands\InitializeCommand;
 
 enum CliCommands : string
 {
     case INITIALIZE = 'init';
+    case DNS_RECORD = 'dns-record';
 
     /**
      * Handles the command execution, returns the exit code.
@@ -20,13 +21,15 @@ enum CliCommands : string
         return match ($this)
         {
             self::INITIALIZE => InitializeCommand::execute($args),
+            self::DNS_RECORD => DnsRecordCommand::execute($args)
         };
     }
     public function getHelpMessage(): string
     {
         return match ($this)
         {
-            self::INITIALIZE => InitializeCommand::getHelpMessage()
+            self::INITIALIZE => InitializeCommand::getHelpMessage(),
+            self::DNS_RECORD => DnsRecordCommand::getHelpMessage()
         };
     }
 
@@ -34,7 +37,8 @@ enum CliCommands : string
     {
         return match ($this)
         {
-            self::INITIALIZE => InitializeCommand::getShortHelpMessage()
+            self::INITIALIZE => InitializeCommand::getShortHelpMessage(),
+            self::DNS_RECORD => DnsRecordCommand::getShortHelpMessage()
         };
     }
 }
diff --git a/src/Socialbox/Enums/ClientCommands.php b/src/Socialbox/Enums/ClientCommands.php
new file mode 100644
index 0000000..9a1e83a
--- /dev/null
+++ b/src/Socialbox/Enums/ClientCommands.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Socialbox\Enums;
+
+enum ClientCommands : string
+{
+    case CONNECT = 'CONNECT';
+}
diff --git a/src/Socialbox/Enums/DatabaseObjects.php b/src/Socialbox/Enums/DatabaseObjects.php
index d0037e3..18b0115 100644
--- a/src/Socialbox/Enums/DatabaseObjects.php
+++ b/src/Socialbox/Enums/DatabaseObjects.php
@@ -1,38 +1,66 @@
 <?php
 
-namespace Socialbox\Enums;
+    namespace Socialbox\Enums;
 
-enum DatabaseObjects : string
-{
-    case PASSWORD_AUTHENTICATION = 'password_authentication.sql';
-    case REGISTERED_PEERS = 'registered_peers.sql';
-    case SESSIONS = 'sessions.sql';
-    case VARIABLES = 'variables.sql';
-
-    /**
-     * Returns the priority of the database object
-     *
-     * @return int The priority of the database object
-     */
-    public function getPriority(): int
+    enum DatabaseObjects : string
     {
-        return match ($this)
+        case VARIABLES = 'variables.sql';
+        case RESOLVED_DNS_RECORDS = 'resolved_dns_records.sql';
+
+        case PEERS = 'peers.sql';
+
+        case PEER_INFORMATION = 'peer_information.sql';
+        case AUTHENTICATION_PASSWORDS = 'authentication_passwords.sql';
+        case AUTHENTICATION_OTP = 'authentication_otp.sql';
+        case CAPTCHA_IMAGES = 'captcha_images.sql';
+        case SESSIONS = 'sessions.sql';
+        case CONTACTS = 'contacts.sql';
+        case SIGNING_KEYS = 'signing_keys.sql';
+        case EXTERNAL_SESSIONS = 'external_sessions.sql';
+
+        case ENCRYPTION_CHANNELS = 'encryption_channels.sql';
+        case ENCRYPTION_CHANNELS_COM = 'encryption_channels_com.sql';
+
+        case CONTACT_KNOWN_KEYS = 'contact_known_keys.sql';
+
+        /**
+         * Returns the priority of the database object
+         *
+         * @return int The priority of the database object
+         */
+        public function getPriority(): int
         {
-            self::VARIABLES => 0,
-            self::REGISTERED_PEERS => 1,
-            self::PASSWORD_AUTHENTICATION, self::SESSIONS => 2,
-        };
-    }
+            return match ($this)
+            {
+                self::VARIABLES,
+                self::RESOLVED_DNS_RECORDS => 0,
 
-    /**
-     * Returns an array of cases ordered by their priority.
-     *
-     * @return array The array of cases sorted by their priority.
-     */
-    public static function casesOrdered(): array
-    {
-        $cases = self::cases();
-        usort($cases, fn($a, $b) => $a->getPriority() <=> $b->getPriority());
-        return $cases;
+                self::PEERS => 1,
+
+                self::PEER_INFORMATION,
+                self::AUTHENTICATION_PASSWORDS,
+                self::AUTHENTICATION_OTP,
+                self::CAPTCHA_IMAGES,
+                self::CONTACTS,
+                self::SESSIONS,
+                self::SIGNING_KEYS,
+                self::EXTERNAL_SESSIONS => 2,
+
+                self::ENCRYPTION_CHANNELS,
+                self::ENCRYPTION_CHANNELS_COM,
+                self::CONTACT_KNOWN_KEYS => 3,
+            };
+        }
+
+        /**
+         * Returns an array of cases ordered by their priority.
+         *
+         * @return array The array of cases sorted by their priority.
+         */
+        public static function casesOrdered(): array
+        {
+            $cases = self::cases();
+            usort($cases, fn($a, $b) => $a->getPriority() <=> $b->getPriority());
+            return $cases;
+        }
     }
-}
diff --git a/src/Socialbox/Enums/Flags/PeerFlags.php b/src/Socialbox/Enums/Flags/PeerFlags.php
new file mode 100644
index 0000000..a92537a
--- /dev/null
+++ b/src/Socialbox/Enums/Flags/PeerFlags.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Socialbox\Enums\Flags;
+
+enum PeerFlags : string
+{
+    // Administrative Flags
+    case ADMIN = 'ADMIN';
+    case MODERATOR = 'MODERATOR';
+
+    // General Flags
+    case VERIFIED = 'VERIFIED';
+
+    /**
+     * Converts an array of PeerFlags enums to a string representation
+     *
+     * @param PeerFlags[] $flags Array of PeerFlags enums
+     * @return string Comma-separated string of flag values
+     */
+    public static function toString(array $flags): string
+    {
+        return implode(',', array_map(fn(PeerFlags $flag) => $flag->value, $flags));
+    }
+
+    /**
+     * Converts a string representation back to an array of PeerFlags enums
+     *
+     * @param string $flagString Comma-separated string of flag values
+     * @return PeerFlags[] Array of PeerFlags enums
+     */
+    public static function fromString(string $flagString): array
+    {
+        if (empty($flagString))
+        {
+            return [];
+        }
+
+        return array_map(fn(string $value) => PeerFlags::from(trim($value)), explode(',', $flagString));
+    }
+}
diff --git a/src/Socialbox/Enums/Flags/SessionFlags.php b/src/Socialbox/Enums/Flags/SessionFlags.php
new file mode 100644
index 0000000..1fd021c
--- /dev/null
+++ b/src/Socialbox/Enums/Flags/SessionFlags.php
@@ -0,0 +1,152 @@
+<?php
+
+    namespace Socialbox\Enums\Flags;
+
+    use Socialbox\Classes\Logger;
+
+    enum SessionFlags : string
+    {
+        // Session states
+        case REGISTRATION_REQUIRED = 'REGISTRATION_REQUIRED'; // Peer has to register
+        case AUTHENTICATION_REQUIRED = 'AUTHENTICATION_REQUIRED'; // Peer has to authenticate
+
+        // Verification, require fields
+        case SET_PASSWORD = 'SET_PASSWORD'; // Peer has to set a password
+        case SET_OTP = 'SET_OTP'; // Peer has to set an OTP
+        case SET_DISPLAY_NAME = 'SET_DISPLAY_NAME'; // Peer has to set a display name to their profile information
+        case SET_FIRST_NAME = 'SET_FIRST_NAME'; // Peer has to set a first name to their profile information
+        case SET_MIDDLE_NAME = 'SET_MIDDLE_NAME'; // Peer has to set a middle name to their profile information
+        case SET_LAST_NAME = 'SET_LAST_NAME'; // Peer has to set a last name to their profile information
+        case SET_DISPLAY_PICTURE = 'SET_DISPLAY_PICTURE'; // Peer has to set a display picture to their profile information
+        case SET_EMAIL = 'SET_EMAIL'; // Peer has to set an email to their profile information
+        case SET_PHONE = 'SET_PHONE'; // Peer has to set a phone number to their profile information
+        case SET_BIRTHDAY = 'SET_BIRTHDAY'; // Peer has to set a birthday to their profile information
+        case SET_URL = 'SET_URL'; // Peer has to set an url to their profile information
+
+        // Verification, verification requirements
+        case VER_PRIVACY_POLICY = 'VER_PRIVACY_POLICY'; // Peer has to accept the privacy policy
+        case VER_TERMS_OF_SERVICE = 'VER_TERMS_OF_SERVICE'; // Peer has to accept the terms of service
+        case VER_COMMUNITY_GUIDELINES = 'VER_COMMUNITY_GUIDELINES'; // Peer has to acknowledge the community guidelines
+        case VER_EMAIL = 'VER_EMAIL'; // Peer has to verify their email
+        case VER_SMS = 'VER_SMS'; // Peer has to verify their phone number
+        case VER_PHONE_CALL = 'VER_PHONE_CALL'; // Peer has to verify their phone number via a phone call
+        case VER_IMAGE_CAPTCHA = 'VER_IMAGE_CAPTCHA'; // Peer has to solve an image captcha
+        case VER_TEXT_CAPTCHA = 'VER_TEXT_CAPTCHA'; // Peer has to solve a text captcha
+        case VER_EXTERNAL_URL = 'VER_EXTERNAL_URL'; // Peer has to visit an external URL
+        case VER_AUTHENTICATION = 'VER_AUTHENTICATION'; // External peer has to run authenticate() on their end
+
+        // Login, require fields
+        case VER_PASSWORD = 'VER_PASSWORD'; // Peer has to enter their password
+        case VER_OTP = 'VER_OTP'; // Peer has to enter their OTP
+        case VER_AUTHENTICATION_CODE = 'VER_AUTHENTICATION_CODE'; // Peer has to enter their authentication code
+
+        // Session Flags
+        case RATE_LIMITED = 'RATE_LIMITED'; // Peer is temporarily rate-limited
+
+        /**
+         * Retrieves a list of registration-related flags.
+         *
+         * @return array Array of registration flags applicable for the process.
+         */
+        public static function getRegistrationFlags(): array
+        {
+            return [
+                self::SET_PASSWORD,
+                self::SET_OTP,
+                self::SET_DISPLAY_NAME,
+                self::SET_DISPLAY_PICTURE,
+                self::SET_PHONE,
+                self::SET_BIRTHDAY,
+                self::SET_EMAIL,
+                self::VER_PRIVACY_POLICY,
+                self::VER_TERMS_OF_SERVICE,
+                self::VER_COMMUNITY_GUIDELINES,
+                self::VER_EMAIL,
+                self::VER_SMS,
+                self::VER_PHONE_CALL,
+                self::VER_IMAGE_CAPTCHA
+            ];
+        }
+
+        /**
+         * Retrieves an array of authentication flags to be used for verifying user identity.
+         *
+         * @return array Returns an array containing the values of defined authentication flags.
+         */
+        public static function getAuthenticationFlags(): array
+        {
+            return [
+                self::VER_IMAGE_CAPTCHA,
+                self::VER_PASSWORD,
+                self::VER_OTP,
+                self::VER_AUTHENTICATION
+            ];
+        }
+
+        /**
+         * Converts an array of SessionFlags to a comma-separated string of their values.
+         *
+         * @param array $flags An array of SessionFlags objects to be converted.
+         * @return string A comma-separated string of the provided SessionFlags as string values.
+         */
+        public static function toString(array $flags): string
+        {
+            return implode(',', array_map(fn(SessionFlags $flag) => $flag->value, $flags));
+        }
+
+        /**
+         * Converts a comma-separated string of flag values into an array of SessionFlags objects.
+         *
+         * @param string $flagString A comma-separated string representing flag values.
+         * @return array An array of SessionFlags objects created from the provided string.
+         */
+        public static function fromString(string $flagString): array
+        {
+            if (empty($flagString))
+            {
+                return [];
+            }
+
+            return array_map(fn(string $value) => SessionFlags::from(trim($value)), explode(',', $flagString));
+        }
+
+        /**
+         * Determines if all required session flags for completion are satisfied based on the given array of flags.
+         *
+         * @param array $flags An array of session flags to evaluate. Accepts both enum values (strings) and enum objects.
+         * @return bool True if all required flags for completion are satisfied, false otherwise.
+         */
+        public static function isComplete(array $flags): bool
+        {
+            // Map provided flags to their scalar values if they are enums
+            $flagValues = array_map(fn($flag) => $flag instanceof SessionFlags ? $flag->value : $flag, $flags);
+
+            if (in_array(SessionFlags::REGISTRATION_REQUIRED, $flags, true))
+            {
+                Logger::getLogger()->info('Checking registration flags');
+                // Compare values instead of objects
+                return empty(array_intersect(self::getScalarValues(self::getRegistrationFlags()), $flagValues));
+            }
+
+            if (in_array(SessionFlags::AUTHENTICATION_REQUIRED, $flags, true))
+            {
+                Logger::getLogger()->info('Checking authentication flags');
+                // Compare values instead of objects
+                return empty(array_intersect(self::getScalarValues(self::getAuthenticationFlags()), $flagValues));
+            }
+
+            Logger::getLogger()->info('Neither registration nor authentication flags found');
+            return true;
+        }
+
+        /**
+         * Helper method: Converts an array of SessionFlags enums to their scalar values (strings)
+         *
+         * @param array $flagEnums Array of SessionFlags objects
+         * @return array Array of scalar values corresponding to the flags
+         */
+        private static function getScalarValues(array $flagEnums): array
+        {
+            return array_map(fn(SessionFlags $flag) => $flag->value, $flagEnums);
+        }
+    }
diff --git a/src/Socialbox/Enums/Options/ClientOptions.php b/src/Socialbox/Enums/Options/ClientOptions.php
new file mode 100644
index 0000000..1842f58
--- /dev/null
+++ b/src/Socialbox/Enums/Options/ClientOptions.php
@@ -0,0 +1,8 @@
+<?php
+
+    namespace Socialbox\Enums\Options;
+
+    enum ClientOptions
+    {
+        case EXTERNAL_CONNECTION;
+    }
diff --git a/src/Socialbox/Enums/PrivacyState.php b/src/Socialbox/Enums/PrivacyState.php
new file mode 100644
index 0000000..d69c8f3
--- /dev/null
+++ b/src/Socialbox/Enums/PrivacyState.php
@@ -0,0 +1,11 @@
+<?php
+
+    namespace Socialbox\Enums;
+
+    enum PrivacyState : string
+    {
+        case PUBLIC = 'PUBLIC';
+        case PRIVATE = 'PRIVATE';
+        case CONTACTS = 'CONTACTS';
+        case TRUSTED = 'TRUSTED';
+    }
diff --git a/src/Socialbox/Enums/SessionState.php b/src/Socialbox/Enums/SessionState.php
index f277d2b..21aff42 100644
--- a/src/Socialbox/Enums/SessionState.php
+++ b/src/Socialbox/Enums/SessionState.php
@@ -4,6 +4,11 @@ namespace Socialbox\Enums;
 
 enum SessionState : string
 {
+    /**
+     * The session is awaiting a Diffie-Hellman exchange to be completed
+     */
+    case AWAITING_DHE = 'AWAITING_DHE';
+
     /**
      * The session is currently active and usable
      */
diff --git a/src/Socialbox/Enums/SigningKeyState.php b/src/Socialbox/Enums/SigningKeyState.php
new file mode 100644
index 0000000..6e55ce7
--- /dev/null
+++ b/src/Socialbox/Enums/SigningKeyState.php
@@ -0,0 +1,9 @@
+<?php
+
+    namespace Socialbox\Enums;
+
+    enum SigningKeyState : string
+    {
+        case ACTIVE = 'ACTIVE';
+        case EXPIRED = 'EXPIRED';
+    }
diff --git a/src/Socialbox/Enums/StandardError.php b/src/Socialbox/Enums/StandardError.php
index f8e6174..9dc896c 100644
--- a/src/Socialbox/Enums/StandardError.php
+++ b/src/Socialbox/Enums/StandardError.php
@@ -1,46 +1,84 @@
 <?php
 
-namespace Socialbox\Enums;
+    namespace Socialbox\Enums;
 
-enum StandardError : int
-{
-    // Fallback Codes
-    case UNKNOWN = -1;
-
-    // RPC Errors
-    case RPC_METHOD_NOT_FOUND = -1000;
-    case RPC_INVALID_ARGUMENTS = -1001;
-
-    // Server Errors
-    case INTERNAL_SERVER_ERROR = -2000;
-    case SERVER_UNAVAILABLE = -2001;
-
-    // Authentication/Cryptography Errors
-    case INVALID_PUBLIC_KEY = -3000;
-    case SESSION_NOT_FOUND = -3001;
-    case UNSUPPORTED_AUTHENTICATION_TYPE = -3002;
-
-    /**
-     * Returns the default generic message for the error
-     *
-     * @return string
-     */
-    public function getMessage(): string
+    enum StandardError : int
     {
-        return match ($this)
+        // Fallback Codes
+        case UNKNOWN = -1;
+
+        // Generic Errors
+        case INTERNAL_SERVER_ERROR = -100;
+        case SERVER_UNAVAILABLE = -101;
+        case BAD_REQUEST = -102;
+        case FORBIDDEN = -103;
+        case UNAUTHORIZED = -104;
+        case NOT_FOUND = -105;
+        case RESOLUTION_FAILED = -106;
+        case CONFLICT = -107;
+        case EXPIRED = -108;
+        case CRYPTOGRAPHIC_ERROR = -109;
+        case UUID_CONFLICT = -110;
+        case UUID_MISMATCH = -111;
+
+        // RPC Errors
+        case RPC_METHOD_NOT_FOUND = -1000;
+        case RPC_INVALID_ARGUMENTS = -1001;
+        CASE RPC_BAD_REQUEST = -1002;
+
+        // Client Errors
+        case METHOD_NOT_ALLOWED = -3001;
+
+        // Authentication/Cryptography Errors
+        case INVALID_PUBLIC_KEY = -4000; // *
+        case SESSION_NOT_FOUND = -5002; // *
+        case ALREADY_AUTHENTICATED = -6005;
+        case UNSUPPORTED_AUTHENTICATION_TYPE = -6006;
+        case AUTHENTICATION_REQUIRED = -6007;
+        case REGISTRATION_DISABLED = -6008;
+        case CAPTCHA_NOT_AVAILABLE = -6009;
+        case INCORRECT_CAPTCHA_ANSWER = -6010;
+        case CAPTCHA_EXPIRED = -6011;
+
+        // General Error Messages
+        case PEER_NOT_FOUND = -7000;
+        case INVALID_USERNAME = -7001;
+        case USERNAME_ALREADY_EXISTS = -7002;
+        case NOT_REGISTERED = -7003;
+
+        /**
+         * Returns the default generic message for the error
+         *
+         * @return string
+         */
+        public function getMessage(): string
         {
-            self::UNKNOWN => 'Unknown Error',
+            return match ($this)
+            {
+                default => 'Unknown Error',
 
-            self::RPC_METHOD_NOT_FOUND => 'The request method was not found',
-            self::RPC_INVALID_ARGUMENTS => 'The request method contains one or more invalid arguments',
+                self::RPC_METHOD_NOT_FOUND => 'The request method was not found',
+                self::RPC_INVALID_ARGUMENTS => 'The request method contains one or more invalid arguments',
 
-            self::INTERNAL_SERVER_ERROR => 'Internal server error',
-            self::SERVER_UNAVAILABLE => 'Server temporarily unavailable',
+                self::INTERNAL_SERVER_ERROR => 'Internal server error',
+                self::SERVER_UNAVAILABLE => 'Server temporarily unavailable',
 
-            self::INVALID_PUBLIC_KEY => 'The given public key is not valid',
-            self::SESSION_NOT_FOUND => 'The requested session UUID was not found',
-            self::UNSUPPORTED_AUTHENTICATION_TYPE => 'The requested authentication type is not supported by the server'
-        };
+                self::INVALID_PUBLIC_KEY => 'The given public key is not valid',
+                self::UNSUPPORTED_AUTHENTICATION_TYPE => 'The requested authentication type is not supported by the server',
+                self::ALREADY_AUTHENTICATED => 'The action cannot be preformed while authenticated',
+                self::AUTHENTICATION_REQUIRED => 'Authentication is required to preform this action',
+                self::SESSION_NOT_FOUND => 'The requested session UUID was not found',
+                self::REGISTRATION_DISABLED => 'Registration is disabled on the server',
+                self::CAPTCHA_NOT_AVAILABLE => 'Captcha is not available',
+                self::INCORRECT_CAPTCHA_ANSWER => 'The Captcha answer is incorrect',
+                self::CAPTCHA_EXPIRED => 'The captcha has expired and a new captcha needs to be requested',
 
-    }
-}
\ No newline at end of file
+                self::PEER_NOT_FOUND => 'The requested peer was not found',
+                self::INVALID_USERNAME => 'The given username is invalid, it must be Alphanumeric with a minimum of 3 character but no greater than 255 characters',
+                self::USERNAME_ALREADY_EXISTS => 'The given username already exists on the network',
+                self::NOT_REGISTERED => 'The given username is not registered on the server',
+                self::METHOD_NOT_ALLOWED => 'The requested method is not allowed',
+            };
+
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Enums/StandardHeaders.php b/src/Socialbox/Enums/StandardHeaders.php
index 9d707de..630b2fb 100644
--- a/src/Socialbox/Enums/StandardHeaders.php
+++ b/src/Socialbox/Enums/StandardHeaders.php
@@ -1,68 +1,34 @@
 <?php
 
-namespace Socialbox\Enums;
-
-/**
- * Enumeration of standard header names used in HTTP communication.
- */
-enum StandardHeaders : string
-{
-    case CONTENT_TYPE = 'Content-Type';
-    case CLIENT_NAME = 'Client-Name';
-    case CLIENT_VERSION = 'Client-Version';
-    case SESSION_UUID = 'Session-UUID';
-    case FROM_PEER = 'From-Peer';
-    case SIGNATURE = 'Signature';
-    case PUBLIC_KEY = 'Public-Key';
+    namespace Socialbox\Enums;
 
     /**
-     * Determines if the current instance is required based on its type.
-     *
-     * @return bool Returns true if the instance is of type CONTENT_TYPE, CLIENT_VERSION, or CLIENT_NAME; otherwise, false.
+     * Enumeration of standard header names used in HTTP communication.
      */
-    public function isRequired(): bool
+    enum StandardHeaders : string
     {
-        return match($this)
-        {
-            self::CONTENT_TYPE,
-            self::CLIENT_VERSION,
-            self::CLIENT_NAME
-                => true,
+        case REQUEST_TYPE = 'Request-Type';
+        case ERROR_CODE = 'Error-Code';
+        case IDENTIFY_AS = 'Identify-As';
+        case CLIENT_NAME = 'Client-Name';
+        case CLIENT_VERSION = 'Client-Version';
+        case SIGNING_PUBLIC_KEY = 'Signing-Public-Key';
+        case ENCRYPTION_PUBLIC_KEY = 'Encryption-Public-Key';
 
-            default => false,
-        };
-    }
+        case SESSION_UUID = 'Session-UUID';
+        case SIGNATURE = 'Signature';
 
-    /**
-     * Retrieves an array of required headers.
-     *
-     * @return array An array containing only the headers that are marked as required.
-     */
-    public static function getRequiredHeaders(): array
-    {
-        $results = [];
-        foreach(StandardHeaders::cases() as $header)
+        /**
+         * @return array
+         */
+        public static function toArray(): array
         {
-            if($header->isRequired())
+            $results = [];
+            foreach(StandardHeaders::cases() as $header)
             {
                 $results[] = $header->value;
             }
+
+            return $results;
         }
-
-        return $results;
-    }
-
-    /**
-     * @return array
-     */
-    public static function toArray(): array
-    {
-        $results = [];
-        foreach(StandardHeaders::cases() as $header)
-        {
-            $results[] = $header->value;
-        }
-
-        return $results;
-    }
-}
\ No newline at end of file
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Enums/StandardMethods.php b/src/Socialbox/Enums/StandardMethods.php
index 7200d9b..2bdc72f 100644
--- a/src/Socialbox/Enums/StandardMethods.php
+++ b/src/Socialbox/Enums/StandardMethods.php
@@ -1,31 +1,589 @@
 <?php
 
-namespace Socialbox\Enums;
+    namespace Socialbox\Enums;
 
-use Socialbox\Classes\StandardMethods\CreateSession;
-use Socialbox\Classes\StandardMethods\Ping;
-use Socialbox\Exceptions\StandardException;
-use Socialbox\Interfaces\SerializableInterface;
-use Socialbox\Objects\ClientRequest;
-use Socialbox\Objects\RpcRequest;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Classes\StandardMethods\AddressBook\AddressBookAddContact;
+    use Socialbox\Classes\StandardMethods\AddressBook\AddressBookContactExists;
+    use Socialbox\Classes\StandardMethods\AddressBook\AddressBookDeleteContact;
+    use Socialbox\Classes\StandardMethods\AddressBook\AddressBookGetContact;
+    use Socialbox\Classes\StandardMethods\AddressBook\AddressBookGetContacts;
+    use Socialbox\Classes\StandardMethods\AddressBook\AddressBookRevokeSignature;
+    use Socialbox\Classes\StandardMethods\AddressBook\AddressBookTrustSignature;
+    use Socialbox\Classes\StandardMethods\AddressBook\AddressBookUpdateRelationship;
+    use Socialbox\Classes\StandardMethods\Core\GetAllowedMethods;
+    use Socialbox\Classes\StandardMethods\Core\GetSelf;
+    use Socialbox\Classes\StandardMethods\Core\GetSessionState;
+    use Socialbox\Classes\StandardMethods\Core\Ping;
+    use Socialbox\Classes\StandardMethods\Core\ResolvePeer;
+    use Socialbox\Classes\StandardMethods\Core\ResolveSignature;
+    use Socialbox\Classes\StandardMethods\Core\VerifySignature;
+    use Socialbox\Classes\StandardMethods\ServerDocuments\AcceptCommunityGuidelines;
+    use Socialbox\Classes\StandardMethods\ServerDocuments\AcceptPrivacyPolicy;
+    use Socialbox\Classes\StandardMethods\ServerDocuments\AcceptTermsOfService;
+    use Socialbox\Classes\StandardMethods\ServerDocuments\GetCommunityGuidelines;
+    use Socialbox\Classes\StandardMethods\ServerDocuments\GetPrivacyPolicy;
+    use Socialbox\Classes\StandardMethods\ServerDocuments\GetTermsOfService;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsAddInformationField;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsAddSignature;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsDeleteInformationField;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsDeleteOtp;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsDeletePassword;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsDeleteSignature;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsGetInformationField;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsGetInformationFields;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsGetSignature;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsGetSignatures;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsInformationFieldExists;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsSetOtp;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsSetPassword;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsSignatureExists;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsUpdateInformationField;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsUpdateInformationPrivacy;
+    use Socialbox\Classes\StandardMethods\Settings\SettingsUpdatePassword;
+    use Socialbox\Classes\StandardMethods\Verification\VerificationAuthenticate;
+    use Socialbox\Classes\StandardMethods\Verification\VerificationAnswerImageCaptcha;
+    use Socialbox\Classes\StandardMethods\Verification\VerificationGetImageCaptcha;
+    use Socialbox\Classes\StandardMethods\Verification\VerificationOtpAuthentication;
+    use Socialbox\Classes\StandardMethods\Verification\VerificationPasswordAuthentication;
+    use Socialbox\Enums\Flags\SessionFlags;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\OneTimePasswordManager;
+    use Socialbox\Managers\PasswordManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\Database\SessionRecord;
+    use Socialbox\Objects\RpcRequest;
 
-enum StandardMethods : string
-{
-    case PING = 'ping';
-    case CREATE_SESSION = 'create_session';
-
-    /**
-     * @param ClientRequest $request
-     * @param RpcRequest $rpcRequest
-     * @return SerializableInterface|null
-     * @throws StandardException
-     */
-    public function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
+    enum StandardMethods : string
     {
-        return match ($this)
+        // AddressBook Methods
+        case ADDRESS_BOOK_ADD_CONTACT = 'addressBookAddContact';
+        case ADDRESS_BOOK_CONTACT_EXISTS = 'addressBookContactExists';
+        case ADDRESS_BOOK_DELETE_CONTACT = 'addressBookDeleteContact';
+        case ADDRESS_BOOK_GET_CONTACT = 'addressBookGetContact';
+        case ADDRESS_BOOK_GET_CONTACTS = 'addressBookGetContacts';
+        case ADDRESS_BOOK_TRUST_SIGNATURE = 'addressBookTrustSignature';
+        case ADDRESS_BOOK_REVOKE_SIGNATURE = 'addressBookRevokeSignature';
+        case ADDRESS_BOOK_UPDATE_RELATIONSHIP = 'addressBookUpdateRelationship';
+
+        // Core Methods
+        case GET_ALLOWED_METHODS = 'getAllowedMethods';
+        case GET_SELF = 'getSelf';
+        case GET_SESSION_STATE = 'getSessionState';
+        case PING = 'ping';
+        case RESOLVE_PEER = 'resolvePeer';
+        case RESOLVE_SIGNATURE = 'resolveSignature';
+        case VERIFY_SIGNATURE = 'verifySignature';
+
+        // Encryption Channel Methods
+        case ENCRYPTION_ACCEPT_CHANNEL = 'encryptionAcceptChannel';
+        case ENCRYPTION_CHANNEL_ACKNOWLEDGE_MESSAGE = 'encryptionChannelAcknowledgeMessage';
+        case ENCRYPTION_CHANNEL_EXISTS = 'encryptionChannelExists';
+        case ENCRYPTION_CHANNEL_SEND = 'encryptionChannelSend';
+        case ENCRYPTION_CLOSE_CHANNEL = 'encryptionCloseChannel';
+        case ENCRYPTION_CREATE_CHANNEL = 'encryptionCreateChannel';
+        case ENCRYPTION_DECLINE_CHANNEL = 'encryptionDeclineChannel';
+        case ENCRYPTION_GET_CHANNEL = 'encryptionGetChannel';
+
+        // ServerDocument Methods
+        case ACCEPT_COMMUNITY_GUIDELINES = 'acceptCommunityGuidelines';
+        case ACCEPT_PRIVACY_POLICY = 'acceptPrivacyPolicy';
+        case ACCEPT_TERMS_OF_SERVICE = 'acceptTermsOfService';
+        case GET_COMMUNITY_GUIDELINES = 'getCommunityGuidelines';
+        case GET_PRIVACY_POLICY = 'getPrivacyPolicy';
+        case GET_TERMS_OF_SERVICE = 'getTermsOfService';
+
+        // Settings Methods
+        case SETTINGS_ADD_INFORMATION_FIELD = 'settingsAddInformationField';
+        case SETTINGS_ADD_SIGNATURE = 'settingsAddSigningKey';
+        case SETTINGS_DELETE_INFORMATION_FIELD = 'settingsDeleteInformationField';
+        case SETTINGS_DELETE_OTP = 'settingsDeleteOtp';
+        case SETTINGS_DELETE_PASSWORD = 'settingsDeletePassword';
+        case SETTINGS_DELETE_SIGNATURE = 'settingsDeleteSigningKey';
+        case SETTINGS_GET_INFORMATION_FIELD = 'settingsGetInformationField';
+        case SETTINGS_GET_INFORMATION_FIELDS = 'settingsGetInformationFields';
+        case SETTINGS_GET_SIGNATURE = 'settingsGetSignature';
+        case SETTINGS_GET_SIGNATURES = 'settingsGetSignatures';
+        case SETTINGS_INFORMATION_FIELD_EXISTS = 'settingsInformationFieldExists';
+        case SETTINGS_SET_OTP = 'settingsSetOtp';
+        case SETTINGS_SET_PASSWORD = 'settingsSetPassword';
+        case SETTINGS_SIGNATURE_EXISTS = 'settingsSignatureExists';
+        case SETTINGS_UPDATE_INFORMATION_FIELD = 'settingsUpdateInformationField';
+        case SETTINGS_UPDATE_INFORMATION_PRIVACY = 'settingsUpdateInformationPrivacy';
+        case SETTINGS_UPDATE_PASSWORD = 'settingsUpdatePassword';
+
+        // Verification Methods
+        case VERIFICATION_ANSWER_IMAGE_CAPTCHA = 'verificationAnswerImageCaptcha';
+        case VERIFICATION_AUTHENTICATE = 'authenticate';
+        case VERIFICATION_GET_IMAGE_CAPTCHA = 'verificationGetImageCaptcha';
+        case VERIFICATION_OTP_AUTHENTICATION = 'verificationOtpAuthentication';
+        case VERIFICATION_PASSWORD_AUTHENTICATION = 'verificationPasswordAuthentication';
+        // NOT IMPLEMENTED VERIFICATION METHODS
+        case VERIFICATION_EMAIL = 'verificationEmail'; // NOT IMPLEMENTED
+        case VERIFICATION_ANSWER_EMAIL = 'verificationAnswerEmail'; // NOT IMPLEMENTED
+        case VERIFICATION_SMS = 'verificationSms'; // NOT IMPLEMENTED
+        case VERIFICATION_ANSWER_SMS = 'verificationAnswerSms'; // NOT IMPLEMENTED
+        case VERIFICATION_PHONE_CALL = 'verificationPhoneCall'; // NOT IMPLEMENTED
+        case VERIFICATION_ANSWER_PHONE_CALL = 'verificationAnswerPhoneCall'; // NOT IMPLEMENTED
+        case VERIFICATION_GET_TEXT_CAPTCHA = 'verificationGetTextCaptcha'; // NOT IMPLEMENTED
+        case VERIFICATION_ANSWER_TEXT_CAPTCHA = 'verificationAnswerTextCaptcha'; // NOT IMPLEMENTED
+        case VERIFICATION_GET_EXTERNAL_URL = 'verificationGetExternalUrl'; // NOT IMPLEMENTED
+        case VERIFICATION_ANSWER_EXTERNAL_URL = 'verificationAnswerExternalUrl'; // NOT IMPLEMENTED
+
+
+        // TODO: COMPLETE THE REST
+        // MISC
+        case GET_STATE = 'getState';
+
+        // Messaging methods
+        case MESSAGES_GET_INBOX = 'messagesGetInbox';
+        case MESSAGES_GET_UNTRUSTED = 'messagesGetUntrusted';
+        case MESSAGES_GET_ARCHIVED = 'messagesGetArchived';
+        case MESSAGES_GET_OUTBOX = 'messagesGetOutbox';
+        case MESSAGES_GET_MESSAGE = 'messagesGetMessage';
+        case MESSAGES_GET_DRAFTS = 'messagesGetDrafts';
+        case MESSAGES_GET_DRAFT = 'messagesGetDraft';
+        case MESSAGES_TOGGLE_MESSAGE_READ = 'messagesToggleMessageRead';
+        case MESSAGES_TOGGLE_MESSAGE_STAR = 'messagesToggleMessageStar';
+        case MESSAGES_TOGGLE_MESSAGE_FLAG = 'messagesToggleMessageFlag';
+        case MESSAGES_ARCHIVE_MESSAGE = 'messagesArchiveMessage';
+        case MESSAGES_UNARCHIVE_MESSAGE = 'messagesUnarchiveMessage';
+        case MESSAGES_DELETE_MESSAGE = 'messagesDeleteMessage';
+        case MESSAGES_DELETE_DRAFT = 'messagesDeleteDraft';
+        case MESSAGES_COMPOSE_NEW_MESSAGE = 'messagesComposeNewMessage';
+        case MESSAGES_COMPOSE_REPLY_MESSAGE = 'messagesComposeReplyMessage';
+        case MESSAGES_COMPOSE_FORWARD_MESSAGE = 'messagesComposeForwardMessage';
+        case MESSAGES_SET_MESSAGE_RECIPIENTS = 'messagesSetMessageRecipients';
+        case MESSAGES_SET_MESSAGE_CARBON_COPY_RECIPIENTS = 'messagesSetMessageCarbonCopyRecipients';
+        case MESSAGES_SET_MESSAGE_BLIND_CARBON_COPY_RECIPIENTS = 'messagesSetMessageBlindCarbonCopyRecipients';
+        case MESSAGES_SET_MESSAGE_ENCRYPTION_CHANNEL = 'messagesSetMessageEncryptionChannel';
+        case MESSAGES_SET_MESSAGE_SUBJECT = 'messagesSetMessageSubject';
+        case MESSAGES_SET_MESSAGE_BODY = 'messagesSetMessageBody';
+        case MESSAGES_SEND_MESSAGE = 'messagesSendMessage';
+
+        /**
+         * Executes the appropriate operation based on the current context and requests provided.
+         *
+         * @param ClientRequest $request The client request object containing necessary data for execution.
+         * @param RpcRequest $rpcRequest The RPC request object providing additional parameters for execution.
+         * @return SerializableInterface|null The result of the operation as a serializable interface or null if no operation matches.
+         * @throws StandardRpcException If an error occurs during execution
+         */
+        public function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
         {
-            self::PING => Ping::execute($request, $rpcRequest),
-            self::CREATE_SESSION => CreateSession::execute($request, $rpcRequest),
-        };
-    }
-}
\ No newline at end of file
+            return match ($this)
+            {
+                // AddressBook Methods
+                self::ADDRESS_BOOK_ADD_CONTACT => AddressBookAddContact::execute($request, $rpcRequest),
+                self::ADDRESS_BOOK_CONTACT_EXISTS => AddressBookContactExists::execute($request, $rpcRequest),
+                self::ADDRESS_BOOK_DELETE_CONTACT => AddressBookDeleteContact::execute($request, $rpcRequest),
+                self::ADDRESS_BOOK_GET_CONTACT => AddressBookGetContact::execute($request, $rpcRequest),
+                self::ADDRESS_BOOK_GET_CONTACTS => AddressBookGetContacts::execute($request, $rpcRequest),
+                self::ADDRESS_BOOK_TRUST_SIGNATURE => AddressBookTrustSignature::execute($request, $rpcRequest),
+                self::ADDRESS_BOOK_REVOKE_SIGNATURE => AddressBookRevokeSignature::execute($request, $rpcRequest),
+                self::ADDRESS_BOOK_UPDATE_RELATIONSHIP => AddressBookUpdateRelationship::execute($request, $rpcRequest),
+
+                // Core Methods
+                self::GET_ALLOWED_METHODS => GetAllowedMethods::execute($request, $rpcRequest),
+                self::GET_SELF => GetSelf::execute($request, $rpcRequest),
+                self::GET_SESSION_STATE => GetSessionState::execute($request, $rpcRequest),
+                self::PING => Ping::execute($request, $rpcRequest),
+                self::RESOLVE_PEER => ResolvePeer::execute($request, $rpcRequest),
+                self::RESOLVE_SIGNATURE => ResolveSignature::execute($request, $rpcRequest),
+                self::VERIFY_SIGNATURE => VerifySignature::execute($request, $rpcRequest),
+
+                // Server Document Methods
+                self::ACCEPT_PRIVACY_POLICY => AcceptPrivacyPolicy::execute($request, $rpcRequest),
+                self::ACCEPT_COMMUNITY_GUIDELINES => AcceptCommunityGuidelines::execute($request, $rpcRequest),
+                self::ACCEPT_TERMS_OF_SERVICE => AcceptTermsOfService::execute($request, $rpcRequest),
+                self::GET_COMMUNITY_GUIDELINES => GetCommunityGuidelines::execute($request, $rpcRequest),
+                self::GET_PRIVACY_POLICY => GetPrivacyPolicy::execute($request, $rpcRequest),
+                self::GET_TERMS_OF_SERVICE => GetTermsOfService::execute($request, $rpcRequest),
+
+                // Settings Methods
+                self::SETTINGS_ADD_INFORMATION_FIELD => SettingsAddInformationField::execute($request, $rpcRequest),
+                self::SETTINGS_ADD_SIGNATURE => SettingsAddSignature::execute($request, $rpcRequest),
+                self::SETTINGS_DELETE_INFORMATION_FIELD => SettingsDeleteInformationField::execute($request, $rpcRequest),
+                self::SETTINGS_DELETE_OTP => SettingsDeleteOtp::execute($request, $rpcRequest),
+                self::SETTINGS_DELETE_PASSWORD => SettingsDeletePassword::execute($request, $rpcRequest),
+                self::SETTINGS_DELETE_SIGNATURE => SettingsDeleteSignature::execute($request, $rpcRequest),
+                self::SETTINGS_GET_INFORMATION_FIELD => SettingsGetInformationField::execute($request, $rpcRequest),
+                self::SETTINGS_GET_INFORMATION_FIELDS => SettingsGetInformationFields::execute($request, $rpcRequest),
+                self::SETTINGS_GET_SIGNATURE => SettingsGetSignature::execute($request, $rpcRequest),
+                self::SETTINGS_GET_SIGNATURES => SettingsGetSignatures::execute($request, $rpcRequest),
+                self::SETTINGS_INFORMATION_FIELD_EXISTS => SettingsInformationFieldExists::execute($request, $rpcRequest),
+                self::SETTINGS_SET_OTP => SettingsSetOtp::execute($request, $rpcRequest),
+                self::SETTINGS_SET_PASSWORD => SettingsSetPassword::execute($request, $rpcRequest),
+                self::SETTINGS_SIGNATURE_EXISTS => SettingsSignatureExists::execute($request, $rpcRequest),
+                self::SETTINGS_UPDATE_INFORMATION_FIELD => SettingsUpdateInformationField::execute($request, $rpcRequest),
+                self::SETTINGS_UPDATE_INFORMATION_PRIVACY => SettingsUpdateInformationPrivacy::execute($request, $rpcRequest),
+                self::SETTINGS_UPDATE_PASSWORD => SettingsUpdatePassword::execute($request, $rpcRequest),
+
+                // Verification Methods
+                self::VERIFICATION_ANSWER_IMAGE_CAPTCHA => VerificationAnswerImageCaptcha::execute($request, $rpcRequest),
+                self::VERIFICATION_AUTHENTICATE => VerificationAuthenticate::execute($request, $rpcRequest),
+                self::VERIFICATION_GET_IMAGE_CAPTCHA => VerificationGetImageCaptcha::execute($request, $rpcRequest),
+                self::VERIFICATION_OTP_AUTHENTICATION => VerificationOtpAuthentication::execute($request, $rpcRequest),
+                self::VERIFICATION_PASSWORD_AUTHENTICATION => VerificationPasswordAuthentication::execute($request, $rpcRequest),
+
+                // Default Unknown/Not Implemented
+                default => $rpcRequest->produceError(StandardError::METHOD_NOT_ALLOWED, sprintf("The method %s is not supported by the server", $rpcRequest->getMethod()))
+            };
+        }
+
+        /**
+         * Checks if the access method is allowed for the given client request.
+         *
+         * @param ClientRequest $clientRequest The client request instance to check access against.
+         * @throws DatabaseOperationException If an error occurs while checking the database for session information.
+         * @throws StandardRpcException If the method is not allowed for the given client request.
+         * @return bool
+         */
+        public function checkAccess(ClientRequest $clientRequest): bool
+        {
+            return in_array($this, self::getAllowedMethods($clientRequest));
+        }
+
+        /**
+         * Determines the list of allowed methods for a given client request.
+         *
+         * @param ClientRequest $clientRequest The client request for which allowed methods are determined.
+         * @return array Returns an array of allowed methods for the provided client request.
+         * @throws DatabaseOperationException If an error occurs while checking the database for session information.
+         * @throws StandardRpcException
+         */
+        public static function getAllowedMethods(ClientRequest $clientRequest): array
+        {
+            // These methods should always accessible
+            $methods = self::getCoreMethods();
+            $session = $clientRequest->getSession();
+
+            if($session === null)
+            {
+                return $methods;
+            }
+
+            try
+            {
+                $external = $session->isExternal();
+            }
+            catch(DatabaseOperationException)
+            {
+                $external = false;
+            }
+
+            // If the session is external (eg; coming from a different server)
+            // Servers will have their own access control mechanisms
+            if($external)
+            {
+                $methods = array_merge($methods, self::getExternalMethods($clientRequest));
+            }
+            // If the session is authenticated, then allow additional method calls
+            elseif($session->isAuthenticated())
+            {
+                $methods = array_merge($methods, self::getAuthenticatedMethods($session));
+            }
+            // If the session isn't authenticated, check if it's a registering user
+            elseif($session->flagExists(SessionFlags::REGISTRATION_REQUIRED))
+            {
+                $methods = array_merge($methods, self::getRegistrationMethods($session));
+            }
+            // If the user is a registering peer, check if it's an authenticating one
+            elseif($session->flagExists(SessionFlags::AUTHENTICATION_REQUIRED))
+            {
+                $methods = array_merge($methods, self::getAuthenticationMethods($clientRequest));
+            }
+
+            return $methods;
+        }
+
+        /**
+         * Retrieves a list of external methods based on the client's session state.
+         *
+         * @param ClientRequest $clientRequest The client request object containing all the request parameters
+         * @return array Returns an array methods that are available for external sessions
+         * @throws DatabaseOperationException If an error occurs while checking the database for session information.
+         * @throws StandardRpcException If an error occurs while checking the database for session information.
+         */
+        private static function getExternalMethods(ClientRequest $clientRequest): array
+        {
+            $methods = [];
+
+            $session = $clientRequest->getSession();
+            if(!$session->isAuthenticated() || $session->flagExists(SessionFlags::AUTHENTICATION_REQUIRED))
+            {
+                $methods[] = self::VERIFICATION_AUTHENTICATE;
+            }
+            else
+            {
+                $methods[] = self::RESOLVE_PEER;
+            }
+
+            return $methods;
+        }
+
+        /**
+         * Retrieves a list of authenticated user methods based on configuration settings.
+         *
+         * @return array An array of methods that are available to
+         */
+        private static function getAuthenticatedMethods(?SessionRecord $session=null): array
+        {
+            return array_merge(
+                self::getAddressBookMethods(),
+                self::getServerDocumentMethods($session),
+                self::getSettingsMethods(),
+                self::getVerificationMethods($session)
+            );
+        }
+
+        /**
+         * Retrieves a list of registration methods based on the session flags.
+         *
+         * @param SessionRecord $session The session record containing flags that determine available registration methods.
+         * @return array An array of registration methods available for the session.
+         */
+        private static function getRegistrationMethods(SessionRecord $session): array
+        {
+            // Don't allow registration methods if registration is disabled
+            if(!Configuration::getRegistrationConfiguration()->isRegistrationEnabled())
+            {
+                return [];
+            }
+
+            $methods = self::getSettingsMethods();
+
+            // If the flag `VER_PRIVACY_POLICY` is set, then the user can accept the privacy policy
+            if($session->flagExists(SessionFlags::VER_PRIVACY_POLICY))
+            {
+                $methods[] = self::ACCEPT_PRIVACY_POLICY;
+            }
+
+            // If the flag `VER_TERMS_OF_SERVICE` is set, then the user can accept the terms of service
+            if($session->flagExists(SessionFlags::VER_TERMS_OF_SERVICE))
+            {
+                $methods[] = self::ACCEPT_TERMS_OF_SERVICE;
+            }
+
+            // If the flag `VER_COMMUNITY_GUIDELINES` is set, then the user can accept the community guidelines
+            if($session->flagExists(SessionFlags::VER_COMMUNITY_GUIDELINES))
+            {
+                $methods[] = self::ACCEPT_COMMUNITY_GUIDELINES;
+            }
+
+            // If the flag `VER_IMAGE_CAPTCHA` is set, then the user has to get and answer an image captcha
+            if($session->flagExists(SessionFlags::VER_IMAGE_CAPTCHA))
+            {
+                $methods[] = self::VERIFICATION_GET_IMAGE_CAPTCHA;
+                $methods[] = self::VERIFICATION_ANSWER_IMAGE_CAPTCHA;
+            }
+
+            return $methods;
+        }
+
+        /**
+         * Retrieves the list of authentication methods available for the given client request.
+         *
+         * @param ClientRequest $clientRequest The client request for which the authentication methods are determined.
+         * @return array The list of available authentication methods as an array of constants.
+         * @throws DatabaseOperationException If an error occurs while checking the database for authentication methods.
+         * @throws StandardRpcException
+         */
+        private static function getAuthenticationMethods(ClientRequest $clientRequest): array
+        {
+            if(!Configuration::getAuthenticationConfiguration()->isEnabled())
+            {
+                return [];
+            }
+
+            $methods = [];
+
+            if(Configuration::getAuthenticationConfiguration()->isImageCaptchaVerificationRequired())
+            {
+                $methods[] = self::VERIFICATION_GET_IMAGE_CAPTCHA;
+                $methods[] = self::VERIFICATION_ANSWER_IMAGE_CAPTCHA;
+            }
+
+
+            $peer = $clientRequest->getPeer();
+
+            if(PasswordManager::usesPassword($peer))
+            {
+                $methods[] = self::VERIFICATION_PASSWORD_AUTHENTICATION;
+            }
+
+            if(OneTimePasswordManager::usesOtp($peer->getUuid()))
+            {
+                $methods[] = self::VERIFICATION_OTP_AUTHENTICATION;
+            }
+
+            return $methods;
+        }
+
+        /**
+         * Returns an array of methods for managing the peer's AddressBook
+         *
+         * @param bool $readOnly If True, only methods related to reading will be returned.
+         * @return StandardMethods[] The array of AddressBook methods to return
+         */
+        public static function getAddressBookMethods(bool $readOnly=false): array
+        {
+            if($readOnly)
+            {
+                return [
+                    self::ADDRESS_BOOK_CONTACT_EXISTS,
+                    self::ADDRESS_BOOK_GET_CONTACT,
+                    self::ADDRESS_BOOK_GET_CONTACTS,
+                ];
+            }
+
+            return [
+                self::ADDRESS_BOOK_ADD_CONTACT,
+                self::ADDRESS_BOOK_CONTACT_EXISTS,
+                self::ADDRESS_BOOK_DELETE_CONTACT,
+                self::ADDRESS_BOOK_GET_CONTACT,
+                self::ADDRESS_BOOK_GET_CONTACTS,
+                self::ADDRESS_BOOK_REVOKE_SIGNATURE,
+                self::ADDRESS_BOOK_TRUST_SIGNATURE,
+                self::ADDRESS_BOOK_UPDATE_RELATIONSHIP
+            ];
+        }
+
+        /**
+         * Returns an array of methods for the core methods of the Socialbox RPC protocol
+         *
+         * @return StandardMethods[] An array of Core methods
+         */
+        public static function getCoreMethods(): array
+        {
+            return [
+                self::GET_ALLOWED_METHODS,
+                self::GET_SELF,
+                self::GET_SESSION_STATE,
+                self::PING,
+                self::RESOLVE_PEER,
+                self::RESOLVE_SIGNATURE,
+                self::VERIFY_SIGNATURE
+            ];
+        }
+
+        /**
+         * Returns na array of ServerDocument methods made available for the peer, if $session is false then all
+         * methods would be returned, otherwise the allowed methods would be returned.
+         *
+         * @param SessionRecord|null $session Optional. If null, all session will return otherwise only allowed methods would be returned
+         * @return StandardMethods[] An array of standard methods that are related to Server documentation
+         */
+        public static function getServerDocumentMethods(?SessionRecord $session=null): array
+        {
+            if($session === null)
+            {
+                return [
+                    self::ACCEPT_COMMUNITY_GUIDELINES,
+                    self::ACCEPT_PRIVACY_POLICY,
+                    self::ACCEPT_TERMS_OF_SERVICE,
+                    self::GET_COMMUNITY_GUIDELINES,
+                    self::GET_PRIVACY_POLICY,
+                    self::GET_TERMS_OF_SERVICE
+                ];
+            }
+
+            $results = [
+                self::GET_COMMUNITY_GUIDELINES,
+                self::GET_PRIVACY_POLICY,
+                self::GET_TERMS_OF_SERVICE
+            ];
+
+            if($session->flagExists(SessionFLags::VER_COMMUNITY_GUIDELINES))
+            {
+                $results[] = self::ACCEPT_COMMUNITY_GUIDELINES;
+            }
+
+            if($session->flagExists(SessionFlags::VER_PRIVACY_POLICY))
+            {
+                $results[] = self::ACCEPT_PRIVACY_POLICY;
+            }
+
+            if($session->flagExists(SessionFlags::VER_TERMS_OF_SERVICE))
+            {
+                $results[] = self::ACCEPT_TERMS_OF_SERVICE;
+            }
+
+            return $results;
+        }
+
+        /**
+         * Returns an array of setting methods that are accessible.
+         *
+         * @return StandardMethods[]
+         */
+        public static function getSettingsMethods(): array
+        {
+            return [
+                self::SETTINGS_ADD_INFORMATION_FIELD,
+                self::SETTINGS_ADD_SIGNATURE,
+                self::SETTINGS_DELETE_INFORMATION_FIELD,
+                self::SETTINGS_DELETE_OTP,
+                self::SETTINGS_DELETE_PASSWORD,
+                self::SETTINGS_DELETE_SIGNATURE,
+                self::SETTINGS_GET_INFORMATION_FIELD,
+                self::SETTINGS_GET_INFORMATION_FIELDS,
+                self::SETTINGS_GET_SIGNATURE,
+                self::SETTINGS_GET_SIGNATURES,
+                self::SETTINGS_INFORMATION_FIELD_EXISTS,
+                self::SETTINGS_SET_OTP,
+                self::SETTINGS_SET_PASSWORD,
+                self::SETTINGS_SIGNATURE_EXISTS,
+                self::SETTINGS_UPDATE_INFORMATION_FIELD,
+                self::SETTINGS_UPDATE_INFORMATION_PRIVACY,
+                self::SETTINGS_UPDATE_PASSWORD
+            ];
+        }
+
+        /**
+         * Returns an array of verification methods that are accessible, if $session is null, all methods are returned,
+         * otherwise only accessible methods are returned.
+         *
+         * @return StandardMethods[]
+         */
+        public static function getVerificationMethods(?SessionRecord $session=null): array
+        {
+            if($session === null)
+            {
+                return [
+                    self::VERIFICATION_ANSWER_IMAGE_CAPTCHA,
+                    self::VERIFICATION_AUTHENTICATE,
+                    self::VERIFICATION_GET_IMAGE_CAPTCHA,
+                    self::VERIFICATION_OTP_AUTHENTICATION,
+                    self::VERIFICATION_PASSWORD_AUTHENTICATION
+                ];
+            }
+
+            $results = [];
+
+            if($session->flagExists(SessionFlags::VER_IMAGE_CAPTCHA))
+            {
+                $results[] = self::VERIFICATION_GET_IMAGE_CAPTCHA;
+                $results[] = self::VERIFICATION_ANSWER_IMAGE_CAPTCHA;
+            }
+
+            if($session->flagExists(SessionFlags::VER_AUTHENTICATION))
+            {
+                $results[] = self::VERIFICATION_AUTHENTICATE;
+            }
+
+            if($session->flagExists(SessionFlags::VER_OTP))
+            {
+                $results[] = self::VERIFICATION_OTP_AUTHENTICATION;
+            }
+
+            if($session->flagExists(SessionFlags::VER_PASSWORD))
+            {
+                $results[] = self::VERIFICATION_PASSWORD_AUTHENTICATION;
+            }
+
+            return $results;
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Enums/Status/CaptchaStatus.php b/src/Socialbox/Enums/Status/CaptchaStatus.php
new file mode 100644
index 0000000..4400a07
--- /dev/null
+++ b/src/Socialbox/Enums/Status/CaptchaStatus.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Socialbox\Enums\Status;
+
+enum CaptchaStatus : string
+{
+     case UNSOLVED = 'UNSOLVED';
+     case SOLVED = 'SOLVED';
+}
diff --git a/src/Socialbox/Enums/Status/EncryptionChannelMessageStatus.php b/src/Socialbox/Enums/Status/EncryptionChannelMessageStatus.php
new file mode 100644
index 0000000..1da9032
--- /dev/null
+++ b/src/Socialbox/Enums/Status/EncryptionChannelMessageStatus.php
@@ -0,0 +1,10 @@
+<?php
+
+    namespace Socialbox\Enums\Status;
+
+    enum EncryptionChannelMessageStatus : string
+    {
+        case SENT = 'SENT';
+        case RECEIVED = 'RECEIVED';
+        case REJECTED = 'REJECTED';
+    }
diff --git a/src/Socialbox/Enums/Status/EncryptionChannelStatus.php b/src/Socialbox/Enums/Status/EncryptionChannelStatus.php
new file mode 100644
index 0000000..1a9b37f
--- /dev/null
+++ b/src/Socialbox/Enums/Status/EncryptionChannelStatus.php
@@ -0,0 +1,13 @@
+<?php
+
+    namespace Socialbox\Enums\Status;
+
+    enum EncryptionChannelStatus : string
+    {
+        case AWAITING_RECEIVER = 'AWAITING_RECEIVER';
+        case SERVER_REJECTED = 'SERVER_REJECTED';
+        case PEER_REJECTED = 'PEER_REJECTED';
+        case ERROR = 'ERROR';
+        case OPENED = 'OPENED';
+        case CLOSED = 'CLOSED';
+    }
diff --git a/src/Socialbox/Enums/Status/SignatureVerificationStatus.php b/src/Socialbox/Enums/Status/SignatureVerificationStatus.php
new file mode 100644
index 0000000..0ee7710
--- /dev/null
+++ b/src/Socialbox/Enums/Status/SignatureVerificationStatus.php
@@ -0,0 +1,36 @@
+<?php
+
+    namespace Socialbox\Enums\Status;
+
+    enum SignatureVerificationStatus : string
+    {
+        /**
+         * Returned if the signature is invalid
+         */
+        case INVALID = 'INVALID';
+
+        /**
+         * Returned if one or more of the parameters are invalid resulting in a failure to verify the signature
+         */
+        case ERROR = 'ERROR';
+
+        /**
+         * Returned if the signing key is not found
+         */
+        case NOT_FOUND = 'NOT_FOUND';
+
+        /**
+         * Returned if the signature has expired
+         */
+        case EXPIRED = 'EXPIRED';
+
+        /**
+         * Returned if there was an error while trying to resolve the signature locally or externally
+         */
+        case RESOLUTION_ERROR = 'RESOLUTION_ERROR';
+
+        /**
+         * Returned if the signature has been successfully verified
+         */
+        case VERIFIED = 'VERIFIED';
+    }
diff --git a/src/Socialbox/Enums/Types/ContactRelationshipType.php b/src/Socialbox/Enums/Types/ContactRelationshipType.php
new file mode 100644
index 0000000..9585bd4
--- /dev/null
+++ b/src/Socialbox/Enums/Types/ContactRelationshipType.php
@@ -0,0 +1,10 @@
+<?php
+
+    namespace Socialbox\Enums\Types;
+
+    enum ContactRelationshipType : string
+    {
+        case MUTUAL = 'MUTUAL';
+        case TRUSTED = 'TRUSTED';
+        case BLOCKED = 'BLOCKED';
+    }
diff --git a/src/Socialbox/Enums/Types/EncryptionMessageRecipient.php b/src/Socialbox/Enums/Types/EncryptionMessageRecipient.php
new file mode 100644
index 0000000..d839890
--- /dev/null
+++ b/src/Socialbox/Enums/Types/EncryptionMessageRecipient.php
@@ -0,0 +1,23 @@
+<?php
+
+    namespace Socialbox\Enums\Types;
+
+    enum EncryptionMessageRecipient : string
+    {
+        case SENDER = 'SENDER';
+        case RECEIVER = 'RECEIVER';
+
+        /**
+         * Reverses the role of the recipient
+         *
+         * @return EncryptionMessageRecipient
+         */
+        public function reverse(): EncryptionMessageRecipient
+        {
+            return match($this)
+            {
+                self::SENDER => self::RECEIVER,
+                self::RECEIVER => self::SENDER
+            };
+        }
+    }
diff --git a/src/Socialbox/Enums/Types/InformationFieldName.php b/src/Socialbox/Enums/Types/InformationFieldName.php
new file mode 100644
index 0000000..54a18b1
--- /dev/null
+++ b/src/Socialbox/Enums/Types/InformationFieldName.php
@@ -0,0 +1,71 @@
+<?php
+
+    namespace Socialbox\Enums\Types;
+
+    enum InformationFieldName : string
+    {
+        /**
+         * The display name of the peer
+         */
+        case DISPLAY_NAME = 'DISPLAY_NAME';
+
+        /**
+         * The display picture of the peer, the value is a resource ID hosted on the server
+         */
+        case DISPLAY_PICTURE = 'DISPLAY_PICTURE';
+
+        /**
+         * The first name of the peer
+         */
+        case FIRST_NAME = 'FIRST_NAME';
+
+        /**
+         * The middle name of the peer
+         */
+        case MIDDLE_NAME = 'MIDDLE_NAME';
+
+        /**
+         * The last name of the peer
+         */
+        case LAST_NAME = 'LAST_NAME';
+
+        /**
+         * The email address of the peer
+         */
+        case EMAIL_ADDRESS = 'EMAIL_ADDRESS';
+
+        /**
+         * The phone number of the peer
+         */
+        case PHONE_NUMBER = 'PHONE_NUMBER';
+
+        /**
+         * The birthday of the peer
+         */
+        case BIRTHDAY = 'BIRTHDAY';
+
+        /**
+         * The peer's personal/public URL
+         */
+        case URL = 'URL';
+
+        /**
+         * Validates the value of the field
+         *
+         * @param string $value The value to validate
+         * @return bool Returns true if the value is valid, false otherwise
+         */
+        public function validate(string $value): bool
+        {
+            return match ($this)
+            {
+                InformationFieldName::DISPLAY_NAME => strlen($value) >= 3 && strlen($value) <= 50,
+                InformationFieldName::LAST_NAME, InformationFieldName::MIDDLE_NAME, InformationFieldName::FIRST_NAME => strlen($value) >= 2 && strlen($value) <= 50,
+                InformationFieldName::EMAIL_ADDRESS => filter_var($value, FILTER_VALIDATE_EMAIL),
+                InformationFieldName::PHONE_NUMBER => preg_match('/^\+?[0-9]{1,3}-?[0-9]{3}-?[0-9]{3}-?[0-9]{4}$/', $value),
+                InformationFieldName::BIRTHDAY => preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $value),
+                InformationFieldName::URL => filter_var($value, FILTER_VALIDATE_URL),
+                default => true,
+            };
+        }
+    }
diff --git a/src/Socialbox/Enums/Types/RequestType.php b/src/Socialbox/Enums/Types/RequestType.php
new file mode 100644
index 0000000..e447884
--- /dev/null
+++ b/src/Socialbox/Enums/Types/RequestType.php
@@ -0,0 +1,31 @@
+<?php
+
+    namespace Socialbox\Enums\Types;
+
+    enum RequestType : string
+    {
+        /**
+         * Represents the action of sending a ping request.
+         */
+        case PING = 'ping';
+
+        /**
+         * Represents the action of getting server information (Non-RPC Request)
+         */
+        case INFO = 'info';
+
+        /**
+         * Represents the action of initiating a session.
+         */
+        case INITIATE_SESSION = 'init';
+
+        /**
+         * Represents the action of performing a Diffie-Hellman key exchange.
+         */
+        case DHE_EXCHANGE = 'dhe';
+
+        /**
+         * Represents the action of performing a remote procedure call.
+         */
+        case RPC = 'rpc';
+    }
diff --git a/src/Socialbox/Exceptions/DatabaseOperationException.php b/src/Socialbox/Exceptions/DatabaseOperationException.php
index d40218a..fe9f188 100644
--- a/src/Socialbox/Exceptions/DatabaseOperationException.php
+++ b/src/Socialbox/Exceptions/DatabaseOperationException.php
@@ -1,14 +1,20 @@
 <?php
 
-namespace Socialbox\Exceptions;
+    namespace Socialbox\Exceptions;
 
-use Exception;
-use Throwable;
+    use Exception;
+    use Throwable;
 
-class DatabaseOperationException extends Exception
-{
-    public function __construct(string $message, ?Throwable $throwable=null)
+    class DatabaseOperationException extends Exception
     {
-        parent::__construct($message, 500, $throwable);
-    }
-}
\ No newline at end of file
+        /**
+         * DatabaseOperationException constructor.
+         *
+         * @param string $message
+         * @param Throwable|null $throwable
+         */
+        public function __construct(string $message, ?Throwable $throwable=null)
+        {
+            parent::__construct($message, 500, $throwable);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Exceptions/RequestException.php b/src/Socialbox/Exceptions/RequestException.php
new file mode 100644
index 0000000..488dc20
--- /dev/null
+++ b/src/Socialbox/Exceptions/RequestException.php
@@ -0,0 +1,32 @@
+<?php
+
+    namespace Socialbox\Exceptions;
+
+    use Exception;
+    use Socialbox\Enums\StandardError;
+    use Throwable;
+
+    class RequestException extends Exception
+    {
+        /**
+         * Initializes a new instance of the exception class with a custom message, code, and a previous throwable.
+         *
+         * @param string $message The exception message. Defaults to an empty string.
+         * @param int $code The exception code. Defaults to 0.
+         * @param Throwable|null $previous The previous throwable used for exception chaining. Defaults to null.
+         */
+        public function __construct(string $message = "", int $code = 0, ?Throwable $previous = null)
+        {
+            parent::__construct($message, $code, $previous);
+        }
+
+        /**
+         * Gets the standard error associated with the exception code.
+         *
+         * @return StandardError The standard error associated with the exception code.
+         */
+        public function getStandardError(): StandardError
+        {
+            return StandardError::tryFrom($this->getCode()) ?? StandardError::UNKNOWN;
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Exceptions/RpcException.php b/src/Socialbox/Exceptions/RpcException.php
index b9c582e..0607436 100644
--- a/src/Socialbox/Exceptions/RpcException.php
+++ b/src/Socialbox/Exceptions/RpcException.php
@@ -3,6 +3,7 @@
 namespace Socialbox\Exceptions;
 
 use Exception;
+use Socialbox\Objects\RpcError;
 use Throwable;
 
 class RpcException extends Exception
@@ -18,4 +19,16 @@ class RpcException extends Exception
     {
         parent::__construct($message, $code, $previous);
     }
+
+    /**
+     * Creates an RpcException instance from an RpcError.
+     *
+     * @param RpcError $error The RPC error object containing details of the error.
+     * @param Throwable|null $e The previous throwable used for exception chaining.
+     * @return RpcException The constructed RpcException instance.
+     */
+    public static function fromRpcError(RpcError $error, ?Throwable $e=null): RpcException
+    {
+        return new RpcException($error->getError(), $error->getCode()->value, $e);
+    }
 }
\ No newline at end of file
diff --git a/src/Socialbox/Exceptions/Standard/InvalidRpcArgumentException.php b/src/Socialbox/Exceptions/Standard/InvalidRpcArgumentException.php
new file mode 100644
index 0000000..5a1f101
--- /dev/null
+++ b/src/Socialbox/Exceptions/Standard/InvalidRpcArgumentException.php
@@ -0,0 +1,62 @@
+<?php
+
+    namespace Socialbox\Exceptions\Standard;
+
+    use InvalidArgumentException;
+    use Socialbox\Enums\StandardError;
+    use Throwable;
+
+    class InvalidRpcArgumentException extends StandardRpcException
+    {
+        /**
+         * Thrown when a required parameter is missing
+         *
+         * @param string|null $parameterName The name of the parameter that is missing
+         * @param string|Throwable|null $reason The reason why the parameter is invalid can be a string or an exception or null
+         */
+        public function __construct(string|null $parameterName, null|string|Throwable $reason=null)
+        {
+            if($parameterName === null)
+            {
+                if($reason instanceof InvalidArgumentException)
+                {
+                    parent::__construct(sprintf('Invalid parameter: %s', $reason->getMessage()), StandardError::RPC_INVALID_ARGUMENTS, $reason);
+                    return;
+                }
+
+                if(is_string($reason))
+                {
+                    parent::__construct(sprintf('Invalid parameter: %s', $reason), StandardError::RPC_INVALID_ARGUMENTS);
+                    return;
+                }
+
+                parent::__construct('Invalid parameter', StandardError::RPC_INVALID_ARGUMENTS);
+                return;
+            }
+            
+            if(is_null($reason))
+            {
+                parent::__construct(sprintf('Invalid parameter %s', $parameterName), StandardError::RPC_INVALID_ARGUMENTS);
+                return;
+            }
+
+            if($reason instanceof InvalidArgumentException)
+            {
+                parent::__construct(sprintf('Invalid parameter %s: %s', $parameterName, $reason->getMessage()), StandardError::RPC_INVALID_ARGUMENTS, $reason);
+                return;
+            }
+
+            parent::__construct(sprintf('Invalid parameter %s: %s', $parameterName, $reason), StandardError::RPC_INVALID_ARGUMENTS);
+        }
+
+        /**
+         * Creates an instance of InvalidRpcArgumentException from an InvalidArgumentException
+         *
+         * @param InvalidArgumentException $e The exception to create the instance from
+         * @return InvalidRpcArgumentException The instance created from the exception
+         */
+        public static function fromInvalidArgumentException(InvalidArgumentException $e): InvalidRpcArgumentException
+        {
+            return new InvalidRpcArgumentException(null, $e);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Exceptions/Standard/MissingRpcArgumentException.php b/src/Socialbox/Exceptions/Standard/MissingRpcArgumentException.php
new file mode 100644
index 0000000..6ac23a0
--- /dev/null
+++ b/src/Socialbox/Exceptions/Standard/MissingRpcArgumentException.php
@@ -0,0 +1,18 @@
+<?php
+
+    namespace Socialbox\Exceptions\Standard;
+
+    use Socialbox\Enums\StandardError;
+
+    class MissingRpcArgumentException extends StandardRpcException
+    {
+        /**
+         * Thrown when a required parameter is missing
+         *
+         * @param string $parameterName The name of the missing parameter
+         */
+        public function __construct(string $parameterName)
+        {
+            parent::__construct(sprintf('Missing required parameter: %s', $parameterName), StandardError::RPC_INVALID_ARGUMENTS);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Exceptions/Standard/StandardRpcException.php b/src/Socialbox/Exceptions/Standard/StandardRpcException.php
new file mode 100644
index 0000000..640de54
--- /dev/null
+++ b/src/Socialbox/Exceptions/Standard/StandardRpcException.php
@@ -0,0 +1,47 @@
+<?php
+
+    namespace Socialbox\Exceptions\Standard;
+
+    use Exception;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Classes\Utilities;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\RpcException;
+    use Socialbox\Objects\RpcError;
+    use Socialbox\Objects\RpcRequest;
+    use Throwable;
+
+    class StandardRpcException extends Exception
+    {
+        /**
+         * Thrown as a standard error, with a message and a code
+         *
+         * @param string $message
+         * @param StandardError $code
+         * @param Throwable|null $previous
+         */
+        public function __construct(string $message, StandardError $code, ?Throwable $previous=null)
+        {
+            parent::__construct($message, $code->value, $previous);
+        }
+
+        public function getStandardError(): StandardError
+        {
+            return StandardError::from($this->code);
+        }
+
+        public function produceError(RpcRequest $request): ?RpcError
+        {
+            if(Configuration::getSecurityConfiguration()->isDisplayInternalExceptions())
+            {
+                return $request->produceError(StandardError::from($this->code), Utilities::throwableToString($this));
+            }
+
+            return $request->produceError(StandardError::from($this->code), $this->message);
+        }
+
+        public static function fromRpcException(RpcException $e): StandardRpcException
+        {
+            return new self($e->getMessage(), StandardError::tryFrom($e->getCode()) ?? StandardError::UNKNOWN, $e);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Exceptions/StandardException.php b/src/Socialbox/Exceptions/StandardException.php
deleted file mode 100644
index c163c82..0000000
--- a/src/Socialbox/Exceptions/StandardException.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Socialbox\Exceptions;
-
-use Exception;
-use Socialbox\Enums\StandardError;
-use Socialbox\Objects\RpcError;
-use Socialbox\Objects\RpcRequest;
-use Throwable;
-
-class StandardException extends Exception
-{
-    /**
-     * Thrown as a standard error, with a message and a code
-     *
-     * @param string $message
-     * @param StandardError $code
-     * @param Throwable|null $previous
-     */
-    public function __construct(string $message, StandardError $code, ?Throwable $previous=null)
-    {
-        parent::__construct($message, $code->value, $previous);
-    }
-
-    public function getStandardError(): StandardError
-    {
-        return StandardError::from($this->code);
-    }
-
-    public function produceError(RpcRequest $request): ?RpcError
-    {
-        return $request->produceError(StandardError::from($this->code), $this->message);
-    }
-}
\ No newline at end of file
diff --git a/src/Socialbox/Managers/CaptchaManager.php b/src/Socialbox/Managers/CaptchaManager.php
new file mode 100644
index 0000000..711c7fd
--- /dev/null
+++ b/src/Socialbox/Managers/CaptchaManager.php
@@ -0,0 +1,197 @@
+<?php
+
+    namespace Socialbox\Managers;
+
+    use DateTime;
+    use PDOException;
+    use Socialbox\Classes\Database;
+    use Socialbox\Classes\Logger;
+    use Socialbox\Classes\Utilities;
+    use Socialbox\Enums\Status\CaptchaStatus;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Objects\Database\CaptchaRecord;
+    use Socialbox\Objects\Database\PeerDatabaseRecord;
+
+    class CaptchaManager
+    {
+        /**
+         * Creates a new captcha for the given peer UUID.
+         *
+         * @param string|PeerDatabaseRecord $peer_uuid The UUID of the peer to create the captcha for.
+         * @return string The answer to the captcha.
+         * @throws DatabaseOperationException If the operation fails.
+         */
+        public static function createCaptcha(string|PeerDatabaseRecord $peer_uuid): string
+        {
+            // If the peer_uuid is a RegisteredPeerRecord, get the UUID
+            if($peer_uuid instanceof PeerDatabaseRecord)
+            {
+                $peer_uuid = $peer_uuid->getUuid();
+            }
+
+            $answer = Utilities::randomString(6, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
+            $current_time = (new DateTime())->setTimestamp(time())->format('Y-m-d H:i:s');
+
+            if(!self::captchaExists($peer_uuid))
+            {
+                Logger::getLogger()->debug('Creating a new captcha record for peer ' . $peer_uuid);
+                $statement = Database::getConnection()->prepare("INSERT INTO captcha_images (peer_uuid, created, answer) VALUES (?, ?, ?)");
+                $statement->bindParam(1, $peer_uuid);
+                $statement->bindParam(2, $current_time);
+                $statement->bindParam(3, $answer);
+
+                try
+                {
+                    $statement->execute();
+                }
+                catch(PDOException $e)
+                {
+                    throw new DatabaseOperationException('Failed to create a captcha in the database', $e);
+                }
+
+                return $answer;
+            }
+
+            Logger::getLogger()->debug('Updating an existing captcha record for peer ' . $peer_uuid);
+            $statement = Database::getConnection()->prepare("UPDATE captcha_images SET answer=?, status='UNSOLVED', created=? WHERE peer_uuid=?");
+            $statement->bindParam(1, $answer);
+            $statement->bindParam(2, $current_time);
+            $statement->bindParam(3, $peer_uuid);
+
+            try
+            {
+                $statement->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to update a captcha in the database', $e);
+            }
+
+            return $answer;
+        }
+
+        /**
+         * Answers a captcha for the given peer UUID.
+         *
+         * @param string|PeerDatabaseRecord $peer_uuid The UUID of the peer to answer the captcha for.
+         * @param string $answer The answer to the captcha.
+         * @return bool True if the answer is correct, false otherwise.
+         * @throws DatabaseOperationException If the operation fails.
+         */
+        public static function answerCaptcha(string|PeerDatabaseRecord $peer_uuid, string $answer): bool
+        {
+            if($peer_uuid instanceof PeerDatabaseRecord)
+            {
+                $peer_uuid = $peer_uuid->getUuid();
+            }
+
+            // Return false if the captcha does not exist
+            if(!self::captchaExists($peer_uuid))
+            {
+                return false;
+            }
+
+            $captcha = self::getCaptcha($peer_uuid);
+
+            // Return false if the captcha has already been solved
+            if($captcha->getStatus() === CaptchaStatus::SOLVED)
+            {
+                return false;
+            }
+
+            // Return false if the captcha is older than 5 minutes
+            if ($captcha->isExpired())
+            {
+                return false;
+            }
+
+            // Verify the answer
+            if($captcha->getAnswer() !== $answer)
+            {
+                return false;
+            }
+
+            $statement = Database::getConnection()->prepare("UPDATE captcha_images SET status='SOLVED', answered=NOW() WHERE peer_uuid=?");
+            $statement->bindParam(1, $peer_uuid);
+
+            try
+            {
+                $statement->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to update a captcha in the database', $e);
+            }
+
+            return true;
+        }
+
+        /**
+         * Retrieves the captcha record for the given peer UUID.
+         *
+         * @param string|PeerDatabaseRecord $peer_uuid The UUID of the peer to retrieve the captcha for.
+         * @return CaptchaRecord|null The captcha record.
+         * @throws DatabaseOperationException If the operation fails.
+         */
+        public static function getCaptcha(string|PeerDatabaseRecord $peer_uuid): ?CaptchaRecord
+        {
+            // If the peer_uuid is a RegisteredPeerRecord, get the UUID
+            if($peer_uuid instanceof PeerDatabaseRecord)
+            {
+                $peer_uuid = $peer_uuid->getUuid();
+            }
+
+            Logger::getLogger()->debug('Getting the captcha record for peer ' . $peer_uuid);
+
+            try
+            {
+                $statement = Database::getConnection()->prepare("SELECT * FROM captcha_images WHERE peer_uuid=? LIMIT 1");
+                $statement->bindParam(1, $peer_uuid);
+                $statement->execute();
+                $result = $statement->fetch();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to get a captcha from the database', $e);
+            }
+
+            if($result === false)
+            {
+                return null;
+            }
+
+            return CaptchaRecord::fromArray($result);
+        }
+
+        /**
+         * Checks if a captcha exists for the given peer UUID.
+         *
+         * @param string|PeerDatabaseRecord $peer_uuid The UUID of the peer to check for a captcha.
+         * @return bool True if a captcha exists, false otherwise.
+         * @throws DatabaseOperationException If the operation fails.
+         */
+        public static function captchaExists(string|PeerDatabaseRecord $peer_uuid): bool
+        {
+            // If the peer_uuid is a RegisteredPeerRecord, get the UUID
+            if($peer_uuid instanceof PeerDatabaseRecord)
+            {
+                $peer_uuid = $peer_uuid->getUuid();
+            }
+
+            Logger::getLogger()->debug('Checking if a captcha exists for peer ' . $peer_uuid);
+
+            try
+            {
+                $statement = Database::getConnection()->prepare("SELECT COUNT(*) FROM captcha_images WHERE peer_uuid=?");
+                $statement->bindParam(1, $peer_uuid);
+                $statement->execute();
+                $result = $statement->fetchColumn();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to check if a captcha exists in the database', $e);
+            }
+
+            return $result > 0;
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Managers/ContactManager.php b/src/Socialbox/Managers/ContactManager.php
new file mode 100644
index 0000000..29941f9
--- /dev/null
+++ b/src/Socialbox/Managers/ContactManager.php
@@ -0,0 +1,572 @@
+<?php
+
+    namespace Socialbox\Managers;
+
+    use ncc\ThirdParty\Symfony\Uid\UuidV4;
+    use PDO;
+    use PDOException;
+    use Socialbox\Classes\Database;
+    use Socialbox\Enums\Types\ContactRelationshipType;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Objects\Database\ContactDatabaseRecord;
+    use Socialbox\Objects\Database\ContactKnownKeyRecord;
+    use Socialbox\Objects\PeerAddress;
+    use Socialbox\Objects\Standard\Contact;
+    use Socialbox\Objects\Standard\Signature;
+
+    class ContactManager
+    {
+        /**
+         * Determines if a given contact address is associated with a specified peer UUID in the database.
+         *
+         * @param string $peerUuid The unique identifier of the peer.
+         * @param string|PeerAddress $contactAddress The contact's address, either as a string or a PeerAddress instance.
+         * @return bool Returns true if the contact exists in the database; otherwise, returns false.
+         * @throws DatabaseOperationException If the operation fails.
+         */
+        public static function isContact(string $peerUuid, string|PeerAddress $contactAddress): bool
+        {
+            if($contactAddress instanceof PeerAddress)
+            {
+                $contactAddress = $contactAddress->getAddress();
+            }
+
+            try
+            {
+                // Check if the contact is already in the database
+                $statement = Database::getConnection()->prepare('SELECT COUNT(*) FROM contacts WHERE peer_uuid=:peer AND contact_peer_address=:address');
+                $statement->bindParam(':peer', $peerUuid);
+                $statement->bindParam(':address', $contactAddress);
+                $statement->execute();
+
+                return $statement->fetchColumn() > 0;
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to check if a contact exists in the database', $e);
+            }
+        }
+
+        /**
+         * Creates a new contact associated with the given peer UUID and contact address
+         * in the database, with a specified relationship type.
+         *
+         * @param string $peerUuid The unique identifier of the peer.
+         * @param string|PeerAddress $contactAddress The contact's address, either as a string or a PeerAddress instance.
+         * @param ContactRelationshipType $relationship The type of relationship between the peer and the contact. Defaults to ContactRelationshipType::MUTUAL.
+         * @return string The UUID of the newly created contact.
+         * @throws DatabaseOperationException If the operation fails.
+         */
+        public static function createContact(string $peerUuid, string|PeerAddress $contactAddress, ContactRelationshipType $relationship=ContactRelationshipType::MUTUAL): string
+        {
+            if($contactAddress instanceof PeerAddress)
+            {
+                $contactAddress = $contactAddress->getAddress();
+            }
+
+            $uuid = UuidV4::v4()->toRfc4122();
+
+            try
+            {
+                // Insert the contact into the database
+                $statement = Database::getConnection()->prepare('INSERT INTO contacts (uuid, peer_uuid, contact_peer_address, relationship) VALUES (:uuid, :peer, :address, :relationship)');
+                $statement->bindParam(':uuid', $uuid);
+                $statement->bindParam(':peer', $peerUuid);
+                $statement->bindParam(':address', $contactAddress);
+                $relationship = $relationship->value;
+                $statement->bindParam(':relationship', $relationship);
+                $statement->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to create a new contact in the database', $e);
+            }
+
+            return $uuid;
+        }
+
+        /**
+         * Retrieves the total number of contacts associated with a specific peer.
+         *
+         * @param string $peerUuid The unique identifier for the peer whose contact count is to be retrieved.
+         * @return int The total number of contacts for the given peer.
+         * @throws DatabaseOperationException If the database query fails.
+         */
+        public static function getContactCount(string $peerUuid): int
+        {
+            try
+            {
+                // Get the contact count from the database
+                $statement = Database::getConnection()->prepare('SELECT COUNT(*) FROM contacts WHERE peer_uuid=:peer');
+                $statement->bindParam(':peer', $peerUuid);
+                $statement->execute();
+                return $statement->fetchColumn();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to get the contact count from the database', $e);
+            }
+        }
+
+        /**
+         * Retrieves a specific contact associated with a peer based on the contact's address.
+         *
+         * @param string $peerUuid The unique identifier for the peer whose contact is to be retrieved.
+         * @param string|PeerAddress $contactAddress The address of the contact, either as a string or a PeerAddress object.
+         * @return ContactDatabaseRecord|null The retrieved ContactRecord instance if found, or null if no matching contact exists.
+         * @throws DatabaseOperationException If the database query fails.
+         */
+        public static function getContact(string $peerUuid, string|PeerAddress $contactAddress): ?ContactDatabaseRecord
+        {
+            if($contactAddress instanceof PeerAddress)
+            {
+                $contactAddress = $contactAddress->getAddress();
+            }
+
+            try
+            {
+                // Get the contact from the database
+                $statement = Database::getConnection()->prepare('SELECT * FROM contacts WHERE peer_uuid=:peer AND contact_peer_address=:address LIMIT 1');
+                $statement->bindParam(':peer', $peerUuid);
+                $statement->bindParam(':address', $contactAddress);
+                $statement->execute();
+                $result = $statement->fetch();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to get a contact from the database', $e);
+            }
+
+            if($result === false)
+            {
+                return null;
+            }
+
+            return ContactDatabaseRecord::fromArray($result);
+        }
+
+        /**
+         * Deletes a specific contact associated with a given peer.
+         *
+         * @param string $peerUuid The unique identifier for the peer whose contact is to be deleted.
+         * @param string|PeerAddress $contactAddress The address of the contact to be deleted. Can be provided as a string or a PeerAddress instance.
+         * @return void
+         * @throws DatabaseOperationException If the database query fails.
+         */
+        public static function deleteContact(string $peerUuid, string|PeerAddress $contactAddress): void
+        {
+            if($contactAddress instanceof PeerAddress)
+            {
+                $contactAddress = $contactAddress->getAddress();
+            }
+
+            try
+            {
+                $statement = Database::getConnection()->prepare('DELETE FROM contacts WHERE peer_uuid=:peer AND contact_peer_address=:address');
+                $statement->bindParam(':peer', $peerUuid);
+                $statement->bindParam(':address', $contactAddress);
+                $statement->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to delete a contact from the database', $e);
+            }
+        }
+
+        /**
+         * Updates the relationship type of contact associated with a specific peer.
+         *
+         * @param string $peerUuid The unique identifier for the peer whose contact relationship is to be updated.
+         * @param string|PeerAddress $contactAddress The address of the contact to update. Can be provided as a string or an instance of PeerAddress.
+         * @param ContactRelationshipType $relationship The new relationship type to assign to the contact.
+         * @return void
+         * @throws DatabaseOperationException If the database query fails.
+         */
+        public static function updateContactRelationship(string $peerUuid, string|PeerAddress $contactAddress, ContactRelationshipType $relationship): void
+        {
+            if($contactAddress instanceof PeerAddress)
+            {
+                $contactAddress = $contactAddress->getAddress();
+            }
+
+            try
+            {
+                $statement = Database::getConnection()->prepare('UPDATE contacts SET relationship=:relationship WHERE peer_uuid=:peer AND contact_peer_address=:address');
+                $relationship = $relationship->value;
+                $statement->bindParam(':relationship', $relationship);
+                $statement->bindParam(':peer', $peerUuid);
+                $statement->bindParam(':address', $contactAddress);
+                $statement->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to update the relationship for a contact in the database', $e);
+            }
+        }
+
+        /**
+         * Retrieves a contact by its unique identifier.
+         *
+         * @param string $uuid The unique identifier of the contact to retrieve.
+         * @return ContactDatabaseRecord|null A ContactRecord instance if the contact is found, or null if no contact exists with the provided UUID.
+         * @throws DatabaseOperationException If the database query fails.
+         */
+        public static function getContactByUuid(string $uuid): ?ContactDatabaseRecord
+        {
+            try
+            {
+                // Get the contact from the database
+                $statement = Database::getConnection()->prepare('SELECT * FROM contacts WHERE uuid=:uuid LIMIT 1');
+                $statement->bindParam(':uuid', $uuid);
+                $statement->execute();
+                $result = $statement->fetch();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to get a contact from the database', $e);
+            }
+
+            if($result === false)
+            {
+                return null;
+            }
+
+            return ContactDatabaseRecord::fromArray($result);
+        }
+
+        /**
+         * Retrieves a list of contacts associated with a specific peer.
+         *
+         * @param string $peerUuid The unique identifier for the peer whose contacts are to be retrieved.
+         * @param int $limit The maximum number of contacts to retrieve per page. Defaults to 100.
+         * @param int $page The page number to retrieve. Defaults to 1.
+         * @return ContactDatabaseRecord[] An array of ContactRecord instances representing the contacts for the given peer.
+         * @throws DatabaseOperationException If the database query fails.
+         */
+        public static function getContacts(string $peerUuid, int $limit=100, int $page=1): array
+        {
+            if ($page < 1)
+            {
+                $page = 1;
+            }
+
+            if ($limit < 1)
+            {
+                $limit = 1;
+            }
+
+            $contacts = [];
+
+            try
+            {
+                $statement = Database::getConnection()->prepare("SELECT * FROM contacts WHERE peer_uuid=:peer ORDER BY created DESC LIMIT :limit OFFSET :offset");
+                $offset = ($page - 1) * $limit;
+                $statement->bindParam(':peer', $peerUuid);
+                $statement->bindParam(':limit', $limit, PDO::PARAM_INT);
+                $statement->bindParam(':offset', $offset, PDO::PARAM_INT);
+                $statement->execute();
+
+                // Fetch results
+                $results = $statement->fetchAll(PDO::FETCH_ASSOC);
+
+                // Convert results to ContactRecord instances
+                foreach ($results as $result)
+                {
+                    $contacts[] = ContactDatabaseRecord::fromArray($result);
+                }
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to get contacts from the database', $e);
+            }
+            return $contacts;
+        }
+
+        /**
+         * Retrieves a list of standard contacts associated with a specific peer.
+         *
+         * @param string $peerUuid The unique identifier for the peer whose contacts are to be retrieved.
+         * @param int $limit The maximum number of contacts to retrieve per page. Defaults to 100.
+         * @param int $page The page number to retrieve. Defaults to 1.
+         * @return Contact[] An array of ContactRecord instances representing the contacts for the given peer.
+         * @throws DatabaseOperationException If the database query fails.
+         */
+        public static function getStandardContacts(string $peerUuid, int $limit=100, int $page=1): array
+        {
+            if ($page < 1)
+            {
+                $page = 1;
+            }
+
+            if ($limit < 1)
+            {
+                $limit = 1;
+            }
+
+            $contacts = [];
+
+            try
+            {
+                $statement = Database::getConnection()->prepare("SELECT uuid FROM contacts WHERE peer_uuid=:peer ORDER BY created DESC LIMIT :limit OFFSET :offset");
+                $offset = ($page - 1) * $limit;
+                $statement->bindParam(':peer', $peerUuid);
+                $statement->bindParam(':limit', $limit, PDO::PARAM_INT);
+                $statement->bindParam(':offset', $offset, PDO::PARAM_INT);
+                $statement->execute();
+
+                // Fetch results
+                $results = $statement->fetchAll(PDO::FETCH_ASSOC);
+
+                // Convert results to ContactRecord instances
+                foreach ($results as $result)
+                {
+                    $contacts[] = self::getStandardContact($peerUuid, $result['uuid']);
+                }
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to get contacts from the database', $e);
+            }
+            return $contacts;
+        }
+
+        /**
+         * Adds a signing key to a contact in the database.
+         *
+         * @param string|ContactDatabaseRecord $contactUuid The unique identifier of the contact to add the signing key to.
+         * @param Signature $signingKey The signing key to add to the contact.
+         * @return void
+         * @throws DatabaseOperationException If the database query fails.
+         */
+        public static function addContactSigningKey(string|ContactDatabaseRecord $contactUuid, Signature $signingKey): void
+        {
+            if($contactUuid instanceof ContactDatabaseRecord)
+            {
+                $contactUuid = $contactUuid->getUuid();
+            }
+
+            try
+            {
+                $statement = Database::getConnection()->prepare('INSERT INTO contacts_known_keys (contact_uuid, signature_uuid, signature_name, signature_key, expires, created, trusted_on) VALUES (:contact_uuid, :signature_uuid, :signature_name, :signature_key, :expires, :created, :trusted_on)');
+
+                $statement->bindParam(':contact_uuid', $contactUuid);
+                $signatureUuid = $signingKey->getUuid();
+                $statement->bindParam(':signature_uuid', $signatureUuid);
+                $signatureName = $signingKey->getName();
+                $statement->bindParam(':signature_name', $signatureName);
+                $signatureKey = $signingKey->getPublicKey();
+                $statement->bindParam(':signature_key', $signatureKey);
+                $expires = $signingKey->getExpires();
+                $statement->bindParam(':expires', $expires);
+                $created = $signingKey->getCreated();
+                $statement->bindParam(':created', $created);
+                $trustedOn = (new \DateTime())->format('Y-m-d H:i:s');
+                $statement->bindParam(':trusted_on', $trustedOn);
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to add a signing key to a contact in the database', $e);
+            }
+        }
+
+        public static function removeContactSigningKey(string|ContactDatabaseRecord $contactUuid, string $signatureUuid): void
+        {
+            if($contactUuid instanceof ContactDatabaseRecord)
+            {
+                $contactUuid = $contactUuid->getUuid();
+            }
+
+            try
+            {
+                $statement = Database::getConnection()->prepare('DELETE FROM contacts_known_keys WHERE contact_uuid=:contact_uuid AND signature_uuid=:signature_uuid');
+                $statement->bindParam(':contact_uuid', $contactUuid);
+                $statement->bindParam(':signature_uuid', $signatureUuid);
+                $statement->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to remove a signing key from a contact in the database', $e);
+            }
+        }
+
+        /**
+         * Determines if a signing key UUID exists for a contact in the database.
+         *
+         * @param string|ContactDatabaseRecord $contactUuid The unique identifier of the contact to check.
+         * @param string $signatureUuid The UUID of the signing key to check.
+         * @return bool Returns true if the signing key UUID exists for the contact; otherwise, returns false.
+         * @throws DatabaseOperationException If the database query fails.
+         */
+        public static function contactSigningKeyUuidExists(string|ContactDatabaseRecord $contactUuid, string $signatureUuid): bool
+        {
+            if($contactUuid instanceof ContactDatabaseRecord)
+            {
+                $contactUuid = $contactUuid->getUuid();
+            }
+
+            try
+            {
+                $statement = Database::getConnection()->prepare('SELECT COUNT(*) FROM contacts_known_keys WHERE contact_uuid=:contact_uuid AND signature_uuid=:signature_uuid');
+                $statement->bindParam(':contact_uuid', $contactUuid);
+                $statement->bindParam(':signature_uuid', $signatureUuid);
+                $statement->execute();
+                return $statement->fetchColumn() > 0;
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to check if a signing key UUID exists for a contact in the database', $e);
+            }
+        }
+
+        /**
+         * Determines if a signing key exists for a contact in the database.
+         *
+         * @param string|ContactDatabaseRecord $contactUuid The unique identifier of the contact to check.
+         * @param string $signatureKey The public key of the signing key to check.
+         * @return bool Returns true if the signing key exists for the contact; otherwise, returns false.
+         * @throws DatabaseOperationException If the database query fails.
+         */
+        public static function contactSigningKeyExists(string|ContactDatabaseRecord $contactUuid, string $signatureKey): bool
+        {
+            if($contactUuid instanceof ContactDatabaseRecord)
+            {
+                $contactUuid = $contactUuid->getUuid();
+            }
+
+            try
+            {
+                $statement = Database::getConnection()->prepare('SELECT COUNT(*) FROM contacts_known_keys WHERE contact_uuid=:contact_uuid AND signature_key=:signature_key');
+                $statement->bindParam(':contact_uuid', $contactUuid);
+                $statement->bindParam(':signature_key', $signatureKey);
+                $statement->execute();
+                return $statement->fetchColumn() > 0;
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to check if a signing key exists for a contact in the database', $e);
+            }
+        }
+
+        /**
+         * Retrieves a signing key for a contact from the database.
+         *
+         * @param string|ContactDatabaseRecord $contactUuid The unique identifier of the contact to retrieve the signing key for.
+         * @param string $signatureUuid The UUID of the signing key to retrieve.
+         * @return ContactKnownKeyRecord|null The retrieved ContactKnownKeyRecord instance if found, or null if no matching signing key exists.
+         * @throws DatabaseOperationException If the database query fails.
+         */
+        public static function contactGetSigningKey(string|ContactDatabaseRecord $contactUuid, string $signatureUuid): ?ContactKnownKeyRecord
+        {
+            if($contactUuid instanceof ContactDatabaseRecord)
+            {
+                $contactUuid = $contactUuid->getUuid();
+            }
+
+            try
+            {
+                $statement = Database::getConnection()->prepare('SELECT * FROM contacts_known_keys WHERE contact_uuid=:contact_uuid AND signature_uuid=:signature_uuid LIMIT 1');
+                $statement->bindParam(':contact_uuid', $contactUuid);
+                $statement->bindParam(':signature_uuid', $signatureUuid);
+                $statement->execute();
+                $result = $statement->fetch();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to get a signing key for a contact from the database', $e);
+            }
+
+            if($result === false)
+            {
+                return null;
+            }
+
+            return ContactKnownKeyRecord::fromArray($result);
+        }
+
+        /**
+         * Retrieves all signing keys for a contact from the database.
+         *
+         * @param string|ContactDatabaseRecord $contactUuid The unique identifier of the contact to retrieve the signing keys for.
+         * @return ContactKnownKeyRecord[] An array of ContactKnownKeyRecord instances representing the signing keys for the contact.
+         * @throws DatabaseOperationException If the database query fails.
+         */
+        public static function contactGetSigningKeys(string|ContactDatabaseRecord $contactUuid): array
+        {
+            if($contactUuid instanceof ContactDatabaseRecord)
+            {
+                $contactUuid = $contactUuid->getUuid();
+            }
+
+            $signingKeys = [];
+
+            try
+            {
+                $statement = Database::getConnection()->prepare('SELECT * FROM contacts_known_keys WHERE contact_uuid=:contact_uuid');
+                $statement->bindParam(':contact_uuid', $contactUuid);
+                $statement->execute();
+                $results = $statement->fetchAll(PDO::FETCH_ASSOC);
+
+                foreach($results as $result)
+                {
+                    $signingKeys[] = ContactKnownKeyRecord::fromArray($result);
+                }
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to get signing keys for a contact from the database', $e);
+            }
+
+            return $signingKeys;
+        }
+
+        /**
+         * Retrieves the number of signing keys for a contact from the database.
+         *
+         * @param string|ContactDatabaseRecord $contactUuid The unique identifier of the contact to retrieve the signing keys count for.
+         * @return int The number of signing keys for the contact.
+         * @throws DatabaseOperationException If the database query fails.
+         */
+        public static function contactGetSigningKeysCount(string|ContactDatabaseRecord $contactUuid): int
+        {
+            if($contactUuid instanceof ContactDatabaseRecord)
+            {
+                $contactUuid = $contactUuid->getUuid();
+            }
+
+            try
+            {
+                $statement = Database::getConnection()->prepare('SELECT COUNT(*) FROM contacts_known_keys WHERE contact_uuid=:contact_uuid');
+                $statement->bindParam(':contact_uuid', $contactUuid);
+                $statement->execute();
+                return $statement->fetchColumn();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to get the number of signing keys for a contact from the database', $e);
+            }
+        }
+
+        /**
+         * Returns a standard contact record for a given peer UUID and contact address.
+         *
+         * @param string $peerUuid The unique identifier of the peer.
+         * @param string|PeerAddress $contactAddress The contact's address, either as a string or a PeerAddress instance.
+         * @return Contact|null The standard contact record if found, or null if no matching contact exists.
+         * @throws DatabaseOperationException If the database query fails.
+         */
+        public static function getStandardContact(string $peerUuid, string|PeerAddress $contactAddress): ?Contact
+        {
+            $contact = self::getContact($peerUuid, $contactAddress);
+            if($contact === null)
+            {
+                return null;
+            }
+
+            return new Contact([
+                'address' => $contact->getContactPeerAddress(),
+                'relationship' => $contact->getRelationship(),
+                'known_keys' => self::contactGetSigningKeys($contact),
+                'added_timestamp' => $contact->getCreated()->getTimestamp()
+            ]);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Managers/EncryptionChannelManager.php b/src/Socialbox/Managers/EncryptionChannelManager.php
new file mode 100644
index 0000000..31a3444
--- /dev/null
+++ b/src/Socialbox/Managers/EncryptionChannelManager.php
@@ -0,0 +1,735 @@
+<?php
+
+
+    namespace Socialbox\Managers;
+
+
+    use InvalidArgumentException;
+    use PDO;
+    use PDOException;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Classes\Cryptography;
+    use Socialbox\Classes\Database;
+    use Socialbox\Classes\Validator;
+    use Socialbox\Enums\Status\EncryptionChannelStatus;
+    use Socialbox\Enums\Types\EncryptionMessageRecipient;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Objects\Database\EncryptionChannelMessageRecord;
+    use Socialbox\Objects\Database\EncryptionChannelRecord;
+    use Socialbox\Objects\PeerAddress;
+    use Symfony\Component\Uid\Uuid;
+
+    class EncryptionChannelManager
+    {
+        /**
+         * Checks if an encryption channel with the specified UUID exists.
+         *
+         * @param string $channelUuid The UUID of the channel.
+         * @return bool True if the channel exists, false otherwise.
+         * @throws DatabaseOperationException If the database operation fails.
+         */
+        public static function channelUuidExists(string $channelUuid): bool
+        {
+            try
+            {
+                $stmt = Database::getConnection()->prepare('SELECT COUNT(*) FROM encryption_channels WHERE uuid=:uuid');
+                $stmt->bindParam(':uuid', $channelUuid);
+                $stmt->execute();
+
+                return $stmt->fetchColumn() > 0;
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to check if channel UUID exists', $e);
+            }
+        }
+
+        /**
+         * Deletes an encryption channel with the specified UUID.
+         *
+         * @param string $channelUuid The UUID of the channel.
+         * @return void
+         * @throws DatabaseOperationException If the database operation fails.
+         */
+        public static function deleteChannel(string $channelUuid): void
+        {
+            if(!Validator::validateUuid($channelUuid))
+            {
+                throw new InvalidArgumentException('Invalid UUID V4');
+            }
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare('DELETE FROM encryption_channels WHERE uuid=:uuid LIMIT 1');
+                $stmt->bindParam(':uuid', $channelUuid);
+                $stmt->execute();
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to delete encryption channel', $e);
+            }
+        }
+
+        /**
+         * Creates a new encryption channel by inserting the caller's request information into the database.
+         *
+         * @param string|PeerAddress $callingPeer The peer address of the caller.
+         * @param string|PeerAddress $receivingPeer The peer address of the receiver.
+         * @param string $callingPublicEncryptionKey The public encryption key of the caller.
+         * @param string|null $channelUUid The UUID of the channel. If not provided, a new UUID will be generated.
+         * @return string The UUID of the created channel.
+         * @throws DatabaseOperationException If the database operation fails.
+         */
+        public static function createChannel(string|PeerAddress $callingPeer, string|PeerAddress $receivingPeer,
+            string                                              $callingPublicEncryptionKey, ?string $channelUUid=null): string
+        {
+            if($channelUUid === null)
+            {
+                $channelUUid = Uuid::v4()->toRfc4122();
+            }
+            elseif(!Validator::validateUuid($channelUUid))
+            {
+                throw new InvalidArgumentException('Invalid UUID V4');
+            }
+
+            if($callingPeer instanceof PeerAddress)
+            {
+                $callingPeer = $callingPeer->getAddress();
+            }
+            elseif(!Validator::validatePeerAddress($callingPeer))
+            {
+                throw new InvalidArgumentException('Invalid calling peer address');
+            }
+
+            if($receivingPeer instanceof PeerAddress)
+            {
+                $receivingPeer = $receivingPeer->getAddress();
+            }
+            elseif(!Validator::validatePeerAddress($receivingPeer))
+            {
+                throw new InvalidArgumentException('Invalid receiving peer address');
+            }
+
+            if(!Cryptography::validatePublicEncryptionKey($callingPublicEncryptionKey))
+            {
+                throw new InvalidArgumentException('Invalid public encryption key');
+            }
+
+            try
+            {
+                $channelUUid = $channelUUid ?? Uuid::v4()->toRfc4122();
+                $stmt = Database::getConnection()->prepare('INSERT INTO encryption_channels (uuid, calling_peer_address, receiving_peer_address, calling_peer_address, calling_public_encryption_key) VALUES (:uuid, :calling_peer_address, :receiving_peer_address, :calling_peer_address, :calling_public_encryption_key)');
+                $stmt->bindParam(':uuid', $channelUUid);
+                $stmt->bindParam(':calling_peer_address', $callingPeer);
+                $stmt->bindParam(':receiving_peer_address', $receivingPeer);
+                $stmt->bindParam(':calling_public_encryption_key', $callingPublicEncryptionKey);
+                $stmt->execute();
+
+                return $channelUUid;
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to create encryption channel', $e);
+            }
+        }
+
+        /**
+         * Declines an encryption channel with the specified UUID.
+         *
+         * @param string $channelUuid The UUID of the channel.
+         * @param bool $isServer True if the server is declining the channel, false if the peer is declining the channel.
+         * @return void
+         * @throws DatabaseOperationException If the database operation fails.
+         */
+        public static function declineChannel(string $channelUuid, bool $isServer=false): void
+        {
+            if(!Validator::validateUuid($channelUuid))
+            {
+                throw new InvalidArgumentException('Invalid UUID V4');
+            }
+
+            try
+            {
+                $status = $isServer ? EncryptionChannelStatus::SERVER_REJECTED->value : EncryptionChannelStatus::PEER_REJECTED->value;
+
+                $stmt = Database::getConnection()->prepare('UPDATE encryption_channels SET status=:status WHERE uuid=:uuid LIMIT 1');
+                $stmt->bindParam(':uuid', $channelUuid);
+                $stmt->bindParam(':status', $status);
+                $stmt->execute();
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to decline encryption channel', $e);
+            }
+        }
+
+        /**
+         * Accepts an incoming channel as the receiver, requires the receiver's generated public encryption key
+         * so that both sides can preform a DHE and get the shared secret
+         *
+         * @param string $channelUuid The Unique Universal Identifier for the channel
+         * @param string $publicEncryptionKey The public encryption key of the receiver
+         * @return void
+         * @throws DatabaseOperationException Thrown if there was a database error while trying to accept the chanel
+         */
+        public static function acceptChannel(string $channelUuid, string $publicEncryptionKey): void
+        {
+            if(!Validator::validateUuid($channelUuid))
+            {
+                throw new InvalidArgumentException('Invalid UUID V4');
+            }
+
+            if(!Cryptography::validatePublicEncryptionKey($publicEncryptionKey))
+            {
+                throw new InvalidArgumentException('Invalid public encryption key');
+            }
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare('UPDATE encryption_channels SET status=:status, receiving_public_encryption_key=:public_encryption_key WHERE uuid=:uuid LIMIT 1');
+                $status = EncryptionChannelStatus::OPENED->value;
+                $stmt->bindParam(':uuid', $channelUuid);
+                $stmt->bindParam(':public_encryption_key', $publicEncryptionKey);
+                $stmt->bindParam(':status', $status);
+                $stmt->execute();
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to decline encryption channel', $e);
+            }
+        }
+
+        /**
+         * Closes an encryption channel with the specified UUID.
+         *
+         * @param string $channelUuid The UUID of the channel.
+         * @return void
+         * @throws DatabaseOperationException If the database operation fails.
+         */
+        public static function closeChannel(string $channelUuid): void
+        {
+            if(!Validator::validateUuid($channelUuid))
+            {
+                throw new InvalidArgumentException('Invalid Channel UUID V4');
+            }
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare('UPDATE encryption_channels SET status=:status WHERE uuid=:uuid LIMIT 1');
+                $status = EncryptionChannelStatus::CLOSED->value;
+                $stmt->bindParam(':uuid', $channelUuid);
+                $stmt->bindParam(':status', $status);
+                $stmt->execute();
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to decline encryption channel', $e);
+            }
+        }
+
+        /**
+         * Returns an existing encryption channel from the database.
+         *
+         * @param string $channelUuid The
+         * @return EncryptionChannelRecord|null
+         * @throws DatabaseOperationException
+         */
+        public static function getChannel(string $channelUuid): ?EncryptionChannelRecord
+        {
+            if(!Validator::validateUuid($channelUuid))
+            {
+                throw new InvalidArgumentException('Invalid Channel UUID V4');
+            }
+
+            try
+
+            {
+                $stmt = Database::getConnection()->prepare('SELECT * FROM encryption_channels WHERE uuid=:uuid LIMIT 1');
+                $stmt->bindParam(':uuid', $channelUuid);
+                $stmt->execute();
+
+                if($result = $stmt->fetch())
+                {
+                    return EncryptionChannelRecord::fromArray($result);
+                }
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to retrieve encryption channel', $e);
+            }
+
+            return null;
+        }
+
+        /**
+         * Returns an array of channels that are outgoing from the specified peer address
+         *
+         * @param string|PeerAddress $peerAddress The Peer Address of the caller
+         * @param int $page The page number
+         * @param int $limit The limit of records to return
+         * @return EncryptionChannelRecord[] An array of channel records
+         * @throws DatabaseOperationException Thrown if there was a database error while retrieving the records
+         */
+        public static function getChannels(string|PeerAddress $peerAddress, int $page=1, int $limit=100): array
+        {
+            if($peerAddress instanceof PeerAddress)
+            {
+                $peerAddress = $peerAddress->getAddress();
+            }
+            elseif(!Validator::validatePeerAddress($peerAddress))
+            {
+                throw new InvalidArgumentException('Invalid Peer Address');
+            }
+
+            if($page < 1)
+            {
+                throw new InvalidArgumentException('The page number cannot be less than 1');
+            }
+
+            if($limit < 1)
+            {
+                throw new InvalidArgumentException('The limit cannot be less than 1');
+            }
+            elseif($limit > Configuration::getPoliciesConfiguration()->getEncryptionChannelsLimit())
+            {
+                throw new InvalidArgumentException(sprintf('The limit cannot exceed a value of %d', Configuration::getPoliciesConfiguration()->getEncryptionChannelsLimit()));
+            }
+
+            try
+            {
+                $offset = ($page - 1) * $limit;
+                $stmt = Database::getConnection()->prepare('SELECT * FROM encryption_channels WHERE calling_peer_address=:peer_address OR receiving_peer_address=:peer_address LIMIT :limit OFFSET :offset');
+                $stmt->bindParam(':peer_address', $peerAddress);
+                $stmt->bindParam(':limit', $limit, PDO::PARAM_INT);
+                $stmt->bindParam(':offset', $offset, PDO::PARAM_INT);
+                $stmt->execute();
+
+                $results = $stmt->fetchAll();
+
+                if(!$results)
+                {
+                    return [];
+                }
+
+                return array_map(fn($result) => EncryptionChannelRecord::fromArray($result), $results);
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to retrieve encryption channels', $e);
+            }
+        }
+
+        /**
+         * Returns an array of channels that are outgoing from the specified peer address
+         *
+         * @param string|PeerAddress $peerAddress The Peer Address of the caller
+         * @param int $page The page number
+         * @param int $limit The limit of records to return
+         * @return EncryptionChannelRecord[] An array of channel records
+         * @throws DatabaseOperationException Thrown if there was a database error while retrieving the records
+         */
+        public static function getIncomingChannels(string|PeerAddress $peerAddress, int $page=1, int $limit=100): array
+        {
+            if($peerAddress instanceof PeerAddress)
+            {
+                $peerAddress = $peerAddress->getAddress();
+            }
+            elseif(!Validator::validatePeerAddress($peerAddress))
+            {
+                throw new InvalidArgumentException('Invalid Peer Address');
+            }
+
+            if($page < 1)
+            {
+                throw new InvalidArgumentException('The page number cannot be less than 1');
+            }
+
+            if($limit < 1)
+            {
+                throw new InvalidArgumentException('The limit cannot be less than 1');
+            }
+            elseif($limit > Configuration::getPoliciesConfiguration()->getEncryptionChannelIncomingLimit())
+            {
+                throw new InvalidArgumentException(sprintf('The limit cannot exceed a value of %d', Configuration::getPoliciesConfiguration()->getEncryptionChannelIncomingLimit()));
+            }
+
+            try
+            {
+                $offset = ($page - 1) * $limit;
+                $stmt = Database::getConnection()->prepare('SELECT * FROM encryption_channels WHERE receiving_peer_address=:peer_address LIMIT :limit OFFSET :offset');
+                $stmt->bindParam(':peer_address', $peerAddress);
+                $stmt->bindParam(':limit', $limit);
+                $stmt->bindParam(':offset', $offset);
+                $stmt->execute();
+
+                $results = $stmt->fetchAll();
+
+                if(!$results)
+                {
+                    return [];
+                }
+
+                return array_map(fn($result) => EncryptionChannelRecord::fromArray($result), $results);
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to retrieve incoming encryption channels', $e);
+            }
+        }
+
+        /**
+         * Returns an array of outgoing channels for the given peer address
+         *
+         * @param string|PeerAddress $peerAddress The Peer Address of the caller
+         * @param int $page The page number
+         * @param int $limit The limit of records to return
+         * @return EncryptionChannelRecord[] An array of channel records
+         * @throws DatabaseOperationException Thrown if there was a database error while retrieving the records
+         */
+        public static function getOutgoingChannels(string|PeerAddress $peerAddress, int $page=1, int $limit=100): array
+        {
+            if($peerAddress instanceof PeerAddress)
+            {
+                $peerAddress = $peerAddress->getAddress();
+            }
+            elseif(!Validator::validatePeerAddress($peerAddress))
+            {
+                throw new InvalidArgumentException('Invalid Peer Address');
+            }
+
+            if($page < 1)
+            {
+                throw new InvalidArgumentException('The page number cannot be less than 1');
+            }
+
+            if($limit < 1)
+            {
+                throw new InvalidArgumentException('The limit cannot be less than 1');
+            }
+            elseif($limit > Configuration::getPoliciesConfiguration()->getEncryptionChannelOutgoingLimit())
+            {
+                throw new InvalidArgumentException(sprintf('The limit cannot exceed a value of %d', Configuration::getPoliciesConfiguration()->getEncryptionChannelOutgoingLimit()));
+            }
+
+            try
+            {
+                $offset = ($page -1) * $limit;
+                $stmt = Database::getConnection()->prepare('SELECT * FROM encryption_channels WHERE calling_peer_address=:peer_address LIMIT :limit OFFSET :offset');
+                $stmt->bindParam(':peer_address', $peerAddress);
+                $stmt->bindParam(':limit', $limit);
+                $stmt->bindParam(':offset', $offset);
+                $stmt->execute();
+
+                $results = $stmt->fetchAll();
+
+                if(!$results)
+                {
+                    return [];
+                }
+
+                return array_map(fn($result) => EncryptionChannelRecord::fromArray($result), $results);
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to retrieve outgoing encryption channels', $e);
+            }
+        }
+
+        /**
+         * Returns an array of channels that are awaiting the receiver to accept the channel
+         *
+         * @param string|PeerAddress $peerAddress The Peer Address of the receiver
+         * @param int $page The page number
+         * @param int $limit The limit of records to return
+         * @return EncryptionChannelRecord[] An array of channel records
+         * @throws DatabaseOperationException Thrown if there was a database error while retrieving the records
+         */
+        public static function getChannelRequests(string|PeerAddress $peerAddress, int $page=1, int $limit=100): array
+        {
+            if($peerAddress instanceof PeerAddress)
+            {
+                $peerAddress = $peerAddress->getAddress();
+            }
+            elseif(!Validator::validatePeerAddress($peerAddress))
+            {
+                throw new InvalidArgumentException('Invalid Peer Address');
+            }
+
+
+            if($page < 1)
+            {
+                throw new InvalidArgumentException('The page number cannot be less than 1');
+            }
+
+            if($limit < 1)
+            {
+                throw new InvalidArgumentException('The limit cannot be less than 1');
+            }
+            elseif($limit > Configuration::getPoliciesConfiguration()->getEncryptionChannelRequestsLimit())
+            {
+                throw new InvalidArgumentException(sprintf('The limit cannot exceed a value of %d', Configuration::getPoliciesConfiguration()->getEncryptionChannelRequestsLimit()));
+            }
+
+
+            try
+            {
+                $offset = ($page -1) * $limit;
+                $stmt = Database::getConnection()->prepare('SELECT * FROM encryption_channels WHERE receiving_peer_address=:peer_address AND status=:status LIMIT :limit OFFSET :offset');
+                $stmt->bindParam(':peer_address', $peerAddress);
+                $status = EncryptionChannelStatus::AWAITING_RECEIVER->value;
+                $stmt->bindParam(':status', $status);
+                $stmt->bindParam(':limit', $limit);
+                $stmt->bindParam(':offset', $offset);
+                $stmt->execute();
+
+                $results = $stmt->fetchAll();
+
+                if(!$results)
+                {
+                    return [];
+                }
+
+                return array_map(fn($result) => EncryptionChannelRecord::fromArray($result), $results);
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to retrieve channel requests', $e);
+            }
+        }
+
+        /**
+         * Submits data into the encryption channel
+         *
+         * @param string $channelUuid The Unique Universal Identifier of the encryption channel
+         * @param EncryptionMessageRecipient $recipient The recipient of the message
+         * @param string $checksum The SHA512 checksum of the decrypted data content
+         * @param string $data The encrypted data of the message
+         * @param string|null $messageUuid Optional. The UUID of the message, used for server-to-server replication
+         * @param int|null $messageTimestamp Optional. The Timestamp of the message, used for server-to-server replication
+         * @return string Returns the UUID of the message, if $uuid was provided then it's value is returned.
+         * @throws DatabaseOperationException Thrown if there was a database error while inserting the record
+         */
+        public static function sendMessage(string  $channelUuid, EncryptionMessageRecipient $recipient, string $checksum, string $data,
+                                           ?string $messageUuid=null, ?int $messageTimestamp=null): string
+        {
+            if($messageUuid === null)
+            {
+                $messageUuid = Uuid::v4()->toRfc4122();
+            }
+            elseif(!Validator::validateUuid($messageUuid))
+            {
+                throw new InvalidArgumentException('Invalid UUID V4 of the message');
+            }
+
+            if($messageTimestamp === null)
+            {
+                $messageTimestamp = time();
+            }
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare('INSERT INTO encryption_channels_com (uuid, channel_uuid, recipient, checksum, data, timestamp) VALUES (:uuid, :channel_uuid, :recipient, :checksum, :data, :timestamp)');
+                $stmt->bindParam(':uuid', $messageUuid);
+                $stmt->bindParam(':channel_uuid', $channelUuid);
+                $stmt->bindParam(':recipient', $recipient);
+                $stmt->bindParam(':checksum', $checksum);
+                $stmt->bindParam(':data', $data);
+                $stmt->bindParam(':timestamp', $messageTimestamp);
+
+                $stmt->execute();
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to send data through the encryption channel', $e);
+            }
+
+            return $messageUuid;
+        }
+
+        /**
+         * Obtains a message record from the database
+         *
+         * @param string $channelUuid The Unique Universal Identifier for the channel
+         * @param string $messageUuid The Unique Universal Identifier for the message
+         * @return EncryptionChannelMessageRecord|null Returns the message record if found, null otherwise
+         * @throws DatabaseOperationException Thrown if there was a database operation error
+         */
+        public static function getMessageRecord(string $channelUuid, string $messageUuid): ?EncryptionChannelMessageRecord
+        {
+            if(!Validator::validateUuid($channelUuid))
+            {
+                throw new InvalidArgumentException('The given Channel UUID is not a valid V4 UUID');
+            }
+
+            if(!Validator::validateUuid($messageUuid))
+            {
+                throw new InvalidArgumentException('The given Message UUID is not a valid V4 UUID');
+            }
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare("SELECT * FROM encryption_channels_com WHERE channel_uuid=:channel_uuid AND uuid=:message_uuid LIMIT 1");
+                $stmt->bindParam(':channel_uuid', $channelUuid);
+                $stmt->bindParam(':message_uuid', $messageUuid);
+                $stmt->execute();
+                $result = $stmt->fetch();
+
+                return $result ? EncryptionChannelMessageRecord::fromArray($result) : null;
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException(sprintf('Failed to retrieve requested message record %s (Channel UUID: %s) from the database', $channelUuid, $messageUuid), $e);
+            }
+        }
+
+        /**
+         * Returns an array of EncryptionChannelMessageRecord objects sorted by the Timestamp
+         *
+         * @param string $channelUuid The Unique Universal Identifier of the channel
+         * @param EncryptionMessageRecipient|string $recipient The recipient of the receiver
+         * @return EncryptionChannelMessageRecord[] An array of message objects returned
+         * @throws DatabaseOperationException Thrown if there was a database operation error
+         */
+        public static function receiveData(string $channelUuid, EncryptionMessageRecipient|string $recipient): array
+        {
+            if(!Validator::validateUuid($channelUuid))
+            {
+                throw new InvalidArgumentException('The given Channel UUID is not a valid V4 UUID');
+            }
+
+            if($recipient instanceof EncryptionMessageRecipient)
+            {
+                $recipient = $recipient->value;
+            }
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare("SELECT * FROM encryption_channels_com WHERE channel_uuid=:channel_uuid AND recipient=:recipient AND status='SENT' ORDER BY timestamp LIMIT 100");
+                $stmt->bindParam(':channel_uuid', $channelUuid);
+                $stmt->bindParam(':recipient', $recipient);
+                $stmt->execute();
+                $results = $stmt->fetchAll();
+
+                if(!$results)
+                {
+                    return [];
+                }
+
+                return array_map(fn($result) => EncryptionChannelMessageRecord::fromArray($result), $results);
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('There was an error while trying to receive new data from the database', $e);
+            }
+        }
+
+        /**
+         * Acknowledges the requested message was received
+         *
+         * @param string $channelUuid The Unique Universal identifier of the channel
+         * @param string $messageUuid The Unique Universal Identifier of the message
+         * @return void
+         * @throws DatabaseOperationException Thrown if there was an error with the database operation
+         */
+        public static function acknowledgeMessage(string $channelUuid, string $messageUuid): void
+        {
+            if(!Validator::validateUuid($channelUuid))
+            {
+                throw new InvalidArgumentException('The given Channel UUID is not a valid V4 UUID');
+            }
+
+            if(!Validator::validateUuid($messageUuid))
+            {
+                throw new InvalidArgumentException('The given Message UUID is not a valid V4 uuid');
+            }
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare("UPDATE encryption_channels_com SET status='RECEIVED' WHERE channel_uuid=:channel_uuid AND uuid=:message_uuid LIMIT 1");
+                $stmt->bindParam(':channel_uuid', $channelUuid);
+                $stmt->bindParam(':message_uuid', $messageUuid);
+                $stmt->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('There was an error while acknowledging the message record', $e);
+            }
+        }
+
+        /**
+         * Acknowledges a batch of messages as received
+         *
+         * @param string $channelUuid The Unique Universal Identifier of the channel
+         * @param array $messageUuids An array of message UUIDs to acknowledge
+         * @return void
+         * @throws DatabaseOperationException Thrown if there was an error with the database operation
+         */
+        public static function acknowledgeMessagesBatch(string $channelUuid, array $messageUuids): void
+        {
+            if(!Validator::validateUuid($channelUuid))
+            {
+                throw new InvalidArgumentException('The given Channel UUID is not a valid V4 UUID');
+            }
+
+            if(empty($messageUuids))
+            {
+                throw new InvalidArgumentException('The given Message UUIDs array is empty');
+            }
+
+            $placeholders = implode(',', array_fill(0, count($messageUuids), '?'));
+            $query = "UPDATE encryption_channels_com SET status='RECEIVED' WHERE channel_uuid=:channel_uuid AND uuid IN ($placeholders)";
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare($query);
+                $stmt->bindParam(':channel_uuid', $channelUuid);
+                foreach($messageUuids as $index => $messageUuid)
+                {
+                    $stmt->bindValue($index + 1, $messageUuid);
+                }
+
+                $stmt->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('There was an error while acknowledging the message records', $e);
+            }
+        }
+
+        /**
+         * Rejects the requested message
+         *
+         * @param string $channelUuid The Unique Universal Identifier of the channel
+         * @param string $messageUuid The Unique Universal Identifier of the message
+         * @param bool $isServer If True, the message will be rejected as "SERVER_REJECTED" otherwise "PEER_REJECTED"
+         * @return void
+         * @throws DatabaseOperationException Thrown if there was an error with the database operation
+         */
+        public static function rejectMessage(string $channelUuid, string $messageUuid, bool $isServer=false): void
+        {
+            if(!Validator::validateUuid($channelUuid))
+            {
+                throw new InvalidArgumentException('The given Channel UUID is not a valid V4 UUID');
+            }
+
+            if(!Validator::validateUuid($messageUuid))
+            {
+                throw new InvalidArgumentException('The given Message UUId is not a valid V4 uuid');
+            }
+
+            try
+            {
+                $status = $isServer ? EncryptionChannelStatus::SERVER_REJECTED->value : EncryptionChannelStatus::PEER_REJECTED->value;
+                $stmt = Database::getConnection()->prepare("UPDATE encryption_channels_com SET status=:status WHERE channel_uuid=:channel_uuid AND uuid=:message_uuid LIMIT 1");
+                $stmt->bindParam(':status', $status);
+                $stmt->bindParam(':channel_uuid', $channelUuid);
+                $stmt->bindParam(':message_uuid', $messageUuid);
+
+                $stmt->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('There was an error while rejecting the message record', $e);
+            }
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Managers/ExternalSessionManager.php b/src/Socialbox/Managers/ExternalSessionManager.php
new file mode 100644
index 0000000..bd02658
--- /dev/null
+++ b/src/Socialbox/Managers/ExternalSessionManager.php
@@ -0,0 +1,170 @@
+<?php
+
+    namespace Socialbox\Managers;
+
+    use PDOException;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Classes\Database;
+    use Socialbox\Enums\ReservedUsernames;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Objects\Client\ExportedSession;
+
+    class ExternalSessionManager
+    {
+        /**
+         * Checks if a session exists in the database for the specified domain.
+         *
+         * @param string $domain The domain to check for an existing session in the external_sessions table.
+         * @return bool Returns true if a session exists for the specified domain, otherwise false.
+         * @throws DatabaseOperationException If the database operation fails.
+         */
+        public static function sessionExists(string $domain): bool
+        {
+            try
+            {
+                $stmt = Database::getConnection()->prepare("SELECT COUNT(*) FROM external_sessions WHERE domain=:domain LIMIT 1");
+                $stmt->bindParam(':domain', $domain);
+                $stmt->execute();
+
+                return $stmt->fetchColumn() > 0;
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to check if a session exists in the database', $e);
+            }
+        }
+
+        /**
+         * Adds a new external session to the database.
+         *
+         * @param ExportedSession $exportedSession The session data to be added, containing all necessary attributes
+         *                                         such as server keys, client keys, and other metadata.
+         * @return void
+         * @throws DatabaseOperationException If the database operation fails.
+         */
+        public static function addSession(ExportedSession $exportedSession): void
+        {
+            try
+            {
+                $stmt = Database::getConnection()->prepare("INSERT INTO external_sessions (domain, rpc_endpoint, session_uuid, transport_encryption_algorithm, server_keypair_expires, server_public_signing_key, server_public_encryption_key, host_public_encryption_key, host_private_encryption_key, private_shared_secret, host_transport_encryption_key, server_transport_encryption_key) VALUES (:domain, :rpc_endpoint, :session_uuid, :transport_encryption_algorithm, :server_keypair_expires, :server_public_signing_key, :server_public_encryption_key, :host_public_encryption_key, :host_private_encryption_key, :private_shared_secret, :host_transport_encryption_key, :server_transport_encryption_key)");
+                $domain = $exportedSession->getRemoteServer();
+                $stmt->bindParam(':domain', $domain);
+                $rpcEndpoint = $exportedSession->getRpcEndpoint();
+                $stmt->bindParam(':rpc_endpoint', $rpcEndpoint);
+                $sessionUuid = $exportedSession->getSessionUuid();
+                $stmt->bindParam(':session_uuid', $sessionUuid);
+                $transportEncryptionAlgorithm = $exportedSession->getTransportEncryptionAlgorithm();
+                $stmt->bindParam(':transport_encryption_algorithm', $transportEncryptionAlgorithm);
+                $serverKeypairExpires = $exportedSession->getServerKeypairExpires();
+                $stmt->bindParam(':server_keypair_expires', $serverKeypairExpires);
+                $serverPublicSigningKey = $exportedSession->getServerPublicSigningKey();
+                $stmt->bindParam(':server_public_signing_key', $serverPublicSigningKey);
+                $serverPublicEncryptionKey = $exportedSession->getServerPublicEncryptionKey();
+                $stmt->bindParam(':server_public_encryption_key', $serverPublicEncryptionKey);
+                $hostPublicEncryptionKey = $exportedSession->getClientPublicEncryptionKey();
+                $stmt->bindParam(':host_public_encryption_key', $hostPublicEncryptionKey);
+                $hostPrivateEncryptionKey = $exportedSession->getClientPrivateEncryptionKey();
+                $stmt->bindParam(':host_private_encryption_key', $hostPrivateEncryptionKey);
+                $privateSharedSecret = $exportedSession->getPrivateSharedSecret();
+                $stmt->bindParam(':private_shared_secret', $privateSharedSecret);
+                $hostTransportEncryptionKey = $exportedSession->getClientTransportEncryptionKey();
+                $stmt->bindParam(':host_transport_encryption_key', $hostTransportEncryptionKey);
+                $serverTransportEncryptionKey = $exportedSession->getServerTransportEncryptionKey();
+                $stmt->bindParam(':server_transport_encryption_key', $serverTransportEncryptionKey);
+
+                $stmt->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to add a session to the database', $e);
+            }
+        }
+
+        /**
+         * Retrieves a session associated with the specified domain from the database.
+         *
+         * @param string $domain The domain for which the session should be retrieved.
+         * @return ExportedSession|null The retrieved session as an ExportedSession object, or null if no session is found.
+         * @throws DatabaseOperationException If the operation fails due to a database error.
+         */
+        public static function getSession(string $domain): ?ExportedSession
+        {
+            try
+            {
+                $stmt = Database::getConnection()->prepare("SELECT * FROM external_sessions WHERE domain=:domain LIMIT 1");
+                $stmt->bindParam(':domain', $domain);
+                $stmt->execute();
+                $result = $stmt->fetch();
+
+                if($result === false)
+                {
+                    return null;
+                }
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to retrieve the session from the database', $e);
+            }
+
+            return ExportedSession::fromArray([
+                'peer_address' => sprintf('%s@%s', ReservedUsernames::HOST->value, Configuration::getInstanceConfiguration()->getDomain()),
+                'rpc_endpoint' => $result['rpc_endpoint'],
+                'remote_server' => $result['domain'],
+                'session_uuid' => $result['session_uuid'],
+                'transport_encryption_algorithm' => $result['transport_encryption_algorithm'],
+                'server_keypair_expires' => $result['server_keypair_expires'],
+                'server_public_signing_key' => $result['server_public_signing_key'],
+                'server_public_encryption_key' => $result['server_public_encryption_key'],
+                'client_public_signing_key' => Configuration::getCryptographyConfiguration()->getHostPublicKey(),
+                'client_private_signing_key' => Configuration::getCryptographyConfiguration()->getHostPrivateKey(),
+                'client_public_encryption_key' => $result['host_public_encryption_key'],
+                'client_private_encryption_key' => $result['host_private_encryption_key'],
+                'private_shared_secret' => $result['private_shared_secret'],
+                'client_transport_encryption_key' => $result['host_transport_encryption_key'],
+                'server_transport_encryption_key' => $result['server_transport_encryption_key']
+            ]);
+        }
+
+        /**
+         * Removes a session associated with the specified domain from the database.
+         *
+         * @param string $domain The domain for which the session should be removed.
+         * @return void
+         * @throws DatabaseOperationException If the operation fails due to a database error.
+         */
+        public static function removeSession(string $domain): void
+        {
+            try
+            {
+                $stmt = Database::getConnection()->prepare("DELETE FROM external_sessions WHERE domain=:domain");
+                $stmt->bindParam(':domain', $domain);
+                $stmt->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to remove a session from the database', $e);
+            }
+        }
+
+
+        /**
+         * Updates the last accessed timestamp for a specific external session in the database.
+         *
+         * @param string $domain The domain associated with the external session to update.
+         * @return void
+         * @throws DatabaseOperationException If the update operation fails.
+         */
+        public static function updateLastAccessed(string $domain): void
+        {
+            try
+            {
+                $stmt = Database::getConnection()->prepare("UPDATE external_sessions SET last_accessed=CURRENT_TIMESTAMP WHERE domain=:domain");
+                $stmt->bindParam(':domain', $domain);
+                $stmt->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to update the last accessed time of a session in the database', $e);
+            }
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Managers/OneTimePasswordManager.php b/src/Socialbox/Managers/OneTimePasswordManager.php
new file mode 100644
index 0000000..c9fa89c
--- /dev/null
+++ b/src/Socialbox/Managers/OneTimePasswordManager.php
@@ -0,0 +1,205 @@
+<?php
+
+    namespace Socialbox\Managers;
+
+    use DateTime;
+    use PDOException;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Classes\Cryptography;
+    use Socialbox\Classes\Database;
+    use Socialbox\Classes\OtpCryptography;
+    use Socialbox\Exceptions\CryptographyException;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Objects\Database\PeerDatabaseRecord;
+
+    class OneTimePasswordManager
+    {
+        /**
+         * Checks if a given peer uses OTP for authentication.
+         *
+         * @param string|PeerDatabaseRecord $peerUuid Either a UUID as a string or a RegisteredPeerRecord object representing the peer.
+         * @return bool Returns true if the peer uses OTP, otherwise false.
+         * @throws DatabaseOperationException Thrown when a database error occurs.
+         */
+        public static function usesOtp(string|PeerDatabaseRecord $peerUuid): bool
+        {
+            if($peerUuid instanceof PeerDatabaseRecord)
+            {
+                $peerUuid = $peerUuid->getUuid();
+            }
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare('SELECT COUNT(*) FROM authentication_otp WHERE peer_uuid=:uuid');
+                $stmt->bindParam(':uuid', $peerUuid);
+                $stmt->execute();
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('An error occurred while checking the OTP usage in the database', $e);
+            }
+
+            return $stmt->fetchColumn() > 0;
+        }
+
+        /**
+         * Creates and stores a new OTP (One-Time Password) secret for the specified peer, and generates a key URI.
+         *
+         * @param string|PeerDatabaseRecord $peer The unique identifier of the peer, either as a string UUID
+         *                                          or an instance of RegisteredPeerRecord.
+         * @return string The generated OTP key URI that can be used for applications like authenticator apps.
+         * @throws DatabaseOperationException If there is an error during the database operation.
+         */
+        public static function createOtp(string|PeerDatabaseRecord $peer): string
+        {
+            if(is_string($peer))
+            {
+                $peer = RegisteredPeerManager::getPeer($peer);
+            }
+
+            $secret = OtpCryptography::generateSecretKey(Configuration::getSecurityConfiguration()->getOtpSecretKeyLength());
+            $encryptionKey = Configuration::getCryptographyConfiguration()->getRandomInternalEncryptionKey();
+            $encryptedSecret = Cryptography::encryptMessage($secret, $encryptionKey, Configuration::getCryptographyConfiguration()->getEncryptionKeysAlgorithm());
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare("INSERT INTO authentication_otp (peer_uuid, secret) VALUES (:peer_uuid, :secret)");
+                $stmt->bindParam(':peer_uuid', $peer);
+                $stmt->bindParam(':secret', $encryptedSecret);
+                $stmt->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('An error occurred while creating the OTP secret in the database', $e);
+            }
+
+            return OtpCryptography::generateKeyUri($peer->getAddress(), $secret,
+                Configuration::getInstanceConfiguration()->getDomain(),
+                Configuration::getSecurityConfiguration()->getOtpTimeStep(),
+                Configuration::getSecurityConfiguration()->getOtpDigits(),
+                Configuration::getSecurityConfiguration()->getOtpHashAlgorithm()
+            );
+        }
+
+        /**
+         * Verifies the provided OTP (One-Time Password) against the stored secret associated with the specified peer.
+         *
+         * @param string|PeerDatabaseRecord $peerUuid The unique identifier of the peer, either as a string UUID
+         *                                              or an instance of RegisteredPeerRecord.
+         * @param string $otp The OTP to be verified.
+         * @return bool Returns true if the OTP is valid; otherwise, false.
+         * @throws DatabaseOperationException If there is an error during the database operation.
+         * @throws CryptographyException If there is a failure in decrypting the stored OTP secret.
+         */
+        public static function verifyOtp(string|PeerDatabaseRecord $peerUuid, string $otp): bool
+        {
+            if($peerUuid instanceof PeerDatabaseRecord)
+            {
+                $peerUuid = $peerUuid->getUuid();
+            }
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare('SELECT secret FROM authentication_otp WHERE peer_uuid=:uuid');
+                $stmt->bindParam(':uuid', $peerUuid);
+                $stmt->execute();
+
+                $encryptedSecret = $stmt->fetchColumn();
+
+                if($encryptedSecret === false)
+                {
+                    return false;
+                }
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('An error occurred while retrieving the OTP secret from the database', $e);
+            }
+
+            $decryptedSecret = null;
+            foreach(Configuration::getCryptographyConfiguration()->getInternalEncryptionKeys() as $encryptionKey)
+            {
+                try
+                {
+                    $decryptedSecret = Cryptography::decryptMessage($encryptedSecret, $encryptionKey, Configuration::getCryptographyConfiguration()->getEncryptionKeysAlgorithm());
+                }
+                catch(CryptographyException)
+                {
+                    continue;
+                }
+            }
+
+            if($decryptedSecret === null)
+            {
+                throw new CryptographyException('Failed to decrypt the OTP secret');
+            }
+
+            return OtpCryptography::verifyOTP($decryptedSecret, $otp,
+                Configuration::getSecurityConfiguration()->getOtpTimeStep(),
+                Configuration::getSecurityConfiguration()->getOtpWindow(),
+                Configuration::getSecurityConfiguration()->getOtpDigits(),
+                Configuration::getSecurityConfiguration()->getOtpHashAlgorithm()
+            );
+        }
+
+        /**
+         * Deletes the OTP record associated with the specified peer.
+         *
+         * @param string|PeerDatabaseRecord $peerUuid The peer's UUID or an instance of RegisteredPeerRecord whose OTP record needs to be deleted.
+         * @return void
+         * @throws DatabaseOperationException if the database operation fails.
+         */
+        public static function deleteOtp(string|PeerDatabaseRecord $peerUuid): void
+        {
+            if($peerUuid instanceof PeerDatabaseRecord)
+            {
+                $peerUuid = $peerUuid->getUuid();
+            }
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare('DELETE FROM authentication_otp WHERE peer_uuid=:uuid');
+                $stmt->bindParam(':uuid', $peerUuid);
+                $stmt->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('An error occurred while deleting the OTP secret from the database', $e);
+            }
+        }
+
+        /**
+         * Retrieves the last updated timestamp for the OTP record of the specified peer.
+         *
+         * @param string|PeerDatabaseRecord $peerUuid The peer's UUID or an instance of RegisteredPeerRecord whose OTP record's last updated timestamp needs to be retrieved
+         * @return int The last updated timestamp of the OTP record, or 0 if no such record exists
+         */
+        public static function getLastUpdated(string|PeerDatabaseRecord $peerUuid): int
+        {
+            if($peerUuid instanceof PeerDatabaseRecord)
+            {
+                $peerUuid = $peerUuid->getUuid();
+            }
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare('SELECT updated FROM authentication_otp WHERE peer_uuid=:uuid');
+                $stmt->bindParam(':uuid', $peerUuid);
+                $stmt->execute();
+
+                /** @var \DateTime $updated */
+                $updated = $stmt->fetchColumn();
+
+                if($updated === false)
+                {
+                    return 0;
+                }
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('An error occurred while retrieving the last updated timestamp from the database', $e);
+            }
+
+            return $updated->getTimestamp();
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Managers/PasswordManager.php b/src/Socialbox/Managers/PasswordManager.php
new file mode 100644
index 0000000..71b848a
--- /dev/null
+++ b/src/Socialbox/Managers/PasswordManager.php
@@ -0,0 +1,204 @@
+<?php
+
+    namespace Socialbox\Managers;
+    
+    use DateTime;
+    use PDO;
+    use PDOException;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Classes\Cryptography;
+    use Socialbox\Classes\Database;
+    use Socialbox\Exceptions\CryptographyException;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Objects\Database\PeerDatabaseRecord;
+
+    class PasswordManager
+    {
+        /**
+         * Checks if the given peer UUID is associated with a password in the database.
+         *
+         * @param string|PeerDatabaseRecord $peerUuid The UUID of the peer, or an instance of RegisteredPeerRecord from which the UUID will be retrieved.
+         * @return bool Returns true if the peer UUID is associated with a password, otherwise false.
+         * @throws DatabaseOperationException If an error occurs while querying the database.
+         */
+        public static function usesPassword(string|PeerDatabaseRecord $peerUuid): bool
+        {
+            if($peerUuid instanceof PeerDatabaseRecord)
+            {
+                $peerUuid = $peerUuid->getUuid();
+            }
+            
+            try
+            {
+                $stmt = Database::getConnection()->prepare('SELECT COUNT(*) FROM authentication_passwords WHERE peer_uuid=:uuid');
+                $stmt->bindParam(':uuid', $peerUuid);
+                $stmt->execute();
+
+                return $stmt->fetchColumn() > 0;
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('An error occurred while checking the password usage in the database', $e);
+            }
+        }
+
+        /**
+         * Sets a secured password for the given peer UUID or registered peer record.
+         *
+         * @param string|PeerDatabaseRecord $peerUuid The unique identifier or registered peer record of the user.
+         * @param string $hash The plaintext password to be securely stored.
+         * @return void
+         * @throws DatabaseOperationException If an error occurs while storing the password in the database.
+         * @throws CryptographyException If an error occurs during password encryption or hashing.
+         */
+        public static function setPassword(string|PeerDatabaseRecord $peerUuid, string $hash): void
+        {
+            if($peerUuid instanceof PeerDatabaseRecord)
+            {
+                $peerUuid = $peerUuid->getUuid();
+            }
+
+            // Throws an exception if the hash is invalid
+            if(!Cryptography::validatePasswordHash($hash))
+            {
+                throw new CryptographyException('Invalid password hash');
+            }
+
+            $encryptionKey = Configuration::getCryptographyConfiguration()->getRandomInternalEncryptionKey();
+            $securedPassword = Cryptography::encryptMessage($hash, $encryptionKey, Configuration::getCryptographyConfiguration()->getEncryptionKeysAlgorithm());
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare("INSERT INTO authentication_passwords (peer_uuid, hash) VALUES (:peer_uuid, :hash)");
+                $stmt->bindParam(":peer_uuid", $peerUuid);
+                $stmt->bindParam(':hash', $securedPassword);
+
+                $stmt->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException(sprintf('Failed to set password for user %s', $peerUuid), $e);
+            }
+        }
+
+        /**
+         * Updates the secured password associated with the given peer UUID.
+         *
+         * @param string|PeerDatabaseRecord $peerUuid The unique identifier or registered peer record of the user.
+         * @param string $hash The new password to be stored securely.
+         * @return void
+         * @throws DatabaseOperationException If an error occurs while updating the password in the database.
+         * @throws CryptographyException If an error occurs while encrypting the password or validating the hash.
+         */
+        public static function updatePassword(string|PeerDatabaseRecord $peerUuid, string $hash): void
+        {
+            if($peerUuid instanceof PeerDatabaseRecord)
+            {
+                $peerUuid = $peerUuid->getUuid();
+            }
+
+            if(!Cryptography::validatePasswordHash($hash))
+            {
+                throw new CryptographyException('Invalid password hash');
+            }
+
+            $encryptionKey = Configuration::getCryptographyConfiguration()->getRandomInternalEncryptionKey();
+            $securedPassword = Cryptography::encryptMessage($hash, $encryptionKey, Configuration::getCryptographyConfiguration()->getEncryptionKeysAlgorithm());
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare("UPDATE authentication_passwords SET hash=:hash, updated=:updated WHERE peer_uuid=:peer_uuid");
+                $updated = (new DateTime())->setTimestamp(time());
+                $stmt->bindParam(':hash', $securedPassword);
+                $stmt->bindParam(':updated', $updated);
+                $stmt->bindParam(':peer_uuid', $peerUuid);
+
+                $stmt->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException(sprintf('Failed to update password for user %s', $peerUuid), $e);
+            }
+        }
+
+        /**
+         * Deletes the stored password for a specific peer.
+         *
+         * @param string|PeerDatabaseRecord $peerUuid The unique identifier of the peer, or an instance of RegisteredPeerRecord.
+         * @return void
+         * @throws DatabaseOperationException If an error occurs during the database operation.
+         */
+        public static function deletePassword(string|PeerDatabaseRecord $peerUuid): void
+        {
+            if($peerUuid instanceof PeerDatabaseRecord)
+            {
+                $peerUuid = $peerUuid->getUuid();
+            }
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare('DELETE FROM authentication_passwords WHERE peer_uuid=:uuid');
+                $stmt->bindParam(':uuid', $peerUuid);
+                $stmt->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('An error occurred while deleting the password', $e);
+            }
+        }
+
+        /**
+         * Verifies a given password against a stored password hash for a specific peer.
+         *
+         * @param string|PeerDatabaseRecord $peerUuid The unique identifier of the peer, or an instance of RegisteredPeerRecord.
+         * @param string $sha512 The SHA-512 hash of the password to be verified.
+         * @return bool Returns true if the password matches the stored hash; false otherwise.
+         * @throws CryptographyException If the password hash is invalid or an error occurs during the cryptographic operation.
+         * @throws DatabaseOperationException If an error occurs during the database operation.
+         */
+        public static function verifyPassword(string|PeerDatabaseRecord $peerUuid, string $sha512): bool
+        {
+            if($peerUuid instanceof PeerDatabaseRecord)
+            {
+                $peerUuid = $peerUuid->getUuid();
+            }
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare('SELECT hash FROM authentication_passwords WHERE peer_uuid=:uuid');
+                $stmt->bindParam(':uuid', $peerUuid);
+                $stmt->execute();
+
+                $record = $stmt->fetch(PDO::FETCH_ASSOC);
+                if($record === false)
+                {
+                    return false;
+                }
+
+                $encryptedHash = $record['hash'];
+                $decryptedHash = null;
+                foreach(Configuration::getCryptographyConfiguration()->getInternalEncryptionKeys() as $key)
+                {
+                    try
+                    {
+                        $decryptedHash = Cryptography::decryptMessage($encryptedHash, $key, Configuration::getCryptographyConfiguration()->getEncryptionKeysAlgorithm());
+                    }
+                    catch(CryptographyException)
+                    {
+                        continue;
+                    }
+                }
+
+                if($decryptedHash === null)
+                {
+                    throw new CryptographyException('Cannot decrypt hashed password');
+                }
+
+                return Cryptography::verifyPassword($sha512, $decryptedHash);
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('An error occurred while verifying the password', $e);
+            }
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Managers/PeerInformationManager.php b/src/Socialbox/Managers/PeerInformationManager.php
new file mode 100644
index 0000000..a849732
--- /dev/null
+++ b/src/Socialbox/Managers/PeerInformationManager.php
@@ -0,0 +1,309 @@
+<?php
+
+    namespace Socialbox\Managers;
+
+    use PDOException;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Classes\Database;
+    use Socialbox\Enums\PrivacyState;
+    use Socialbox\Enums\Types\InformationFieldName;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Objects\Database\PeerInformationFieldRecord;
+    use Socialbox\Objects\Database\PeerDatabaseRecord;
+
+    class PeerInformationManager
+    {
+        /**
+         * Adds a property to a peer's information record.
+         *
+         * @param string|PeerDatabaseRecord $peerUuid The UUID of the peer to add the property to.
+         * @param InformationFieldName $property The name of the property to add.
+         * @param string $value The value of the property to add.
+         * @param PrivacyState|null $privacyState The privacy state of the property to add.
+         * @return void
+         * @throws DatabaseOperationException Thrown if the operation fails.
+         */
+        public static function addField(string|PeerDatabaseRecord $peerUuid, InformationFieldName $property, string $value, ?PrivacyState $privacyState=null): void
+        {
+            if($peerUuid instanceof PeerDatabaseRecord)
+            {
+                $peerUuid = $peerUuid->getUuid();
+            }
+
+            if($privacyState === null)
+            {
+                $privacyState = match($property)
+                {
+                    InformationFieldName::DISPLAY_NAME => Configuration::getPoliciesConfiguration()->getDefaultDisplayPicturePrivacy(),
+                    InformationFieldName::FIRST_NAME => Configuration::getPoliciesConfiguration()->getDefaultFirstNamePrivacy(),
+                    InformationFieldName::MIDDLE_NAME => Configuration::getPoliciesConfiguration()->getDefaultMiddleNamePrivacy(),
+                    InformationFieldName::LAST_NAME => Configuration::getPoliciesConfiguration()->getDefaultLastNamePrivacy(),
+                    InformationFieldName::EMAIL_ADDRESS => Configuration::getPoliciesConfiguration()->getDefaultEmailAddressPrivacy(),
+                    InformationFieldName::PHONE_NUMBER => Configuration::getPoliciesConfiguration()->getDefaultPhoneNumberPrivacy(),
+                    InformationFieldName::BIRTHDAY => Configuration::getPoliciesConfiguration()->getDefaultBirthdayPrivacy(),
+                    InformationFieldName::DISPLAY_PICTURE => COnfiguration::getPoliciesConfiguration()->getDefaultDisplayPicturePrivacy(),
+                    InformationFieldName::URL => Configuration::getPoliciesConfiguration()->getDefaultUrlPrivacy(),
+                };
+            }
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare('INSERT INTO peer_information (peer_uuid, property_name, property_value, privacy_state) VALUES (:peer_uuid, :property_name, :property_value, :privacy_state)');
+                $stmt->bindValue(':peer_uuid', $peerUuid);
+                $propertyName = $property->value;
+                $stmt->bindValue(':property_name', $propertyName);
+                $stmt->bindValue(':property_value', $value);
+                $stmt->bindValue(':privacy_state', $privacyState->value);
+                $stmt->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException(sprintf('Failed to add property for peer %s', $peerUuid), $e);
+            }
+        }
+
+        /**
+         * Updates a property for a peer's information record.
+         *
+         * @param string|PeerDatabaseRecord $peerUuid The UUID of the peer to update the property for.
+         * @param InformationFieldName $property The name of the property to update.
+         * @param string $value The new value of the property.
+         * @return void
+         * @throws DatabaseOperationException Thrown if the operation fails.
+         */
+        public static function updateField(string|PeerDatabaseRecord $peerUuid, InformationFieldName $property, string $value): void
+        {
+            if($peerUuid instanceof PeerDatabaseRecord)
+            {
+                $peerUuid = $peerUuid->getUuid();
+            }
+
+            if(!self::fieldExists($peerUuid, $property))
+            {
+                throw new DatabaseOperationException(sprintf('Cannot to update property %s for peer %s, property does not exist', $property->value, $peerUuid));
+            }
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare('UPDATE peer_information SET property_value=:property_value WHERE peer_uuid=:peer_uuid AND property_name=:property_name');
+                $stmt->bindValue(':peer_uuid', $peerUuid);
+                $propertyName = $property->value;
+                $stmt->bindValue(':property_name', $propertyName);
+                $stmt->bindValue(':property_value', $value);
+                $stmt->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException(sprintf('Failed to update property %s for peer %s', $property->value, $peerUuid), $e);
+            }
+        }
+
+        /**
+         * Updates the privacy state for a property in a peer's information record.
+         *
+         * @param string|PeerDatabaseRecord $peerUuid The UUID of the peer to update the privacy state for.
+         * @param InformationFieldName $property The name of the property to update the privacy state for.
+         * @param PrivacyState $privacyState The new privacy state of the property.
+         * @return void
+         * @throws DatabaseOperationException Thrown if the operation fails.
+         */
+        public static function updatePrivacyState(string|PeerDatabaseRecord $peerUuid, InformationFieldName $property, PrivacyState $privacyState): void
+        {
+            if($peerUuid instanceof PeerDatabaseRecord)
+            {
+                $peerUuid = $peerUuid->getUuid();
+            }
+
+            if(!self::fieldExists($peerUuid, $property))
+            {
+                throw new \InvalidArgumentException(sprintf('Cannot update privacy state, the requested property %s does not exist with %s', $property->value, $peerUuid));
+            }
+            
+            try
+            {
+                $stmt = Database::getConnection()->prepare('UPDATE peer_information SET privacy_state=:privacy_state WHERE peer_uuid=:peer_uuid AND property_name=:property_name');
+                $stmt->bindValue(':peer_uuid', $peerUuid);
+                $propertyName = $property->value;
+                $stmt->bindValue(':property_name', $propertyName);
+                $privacyState = $privacyState->value;
+                $stmt->bindValue(':privacy_state', $privacyState);
+                $stmt->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException(sprintf('Failed to update privacy state for property %s for peer %s', $property->value, $peerUuid), $e);
+            }
+        }
+
+        /**
+         * Checks if a property exists for a peer.
+         *
+         * @param string|PeerDatabaseRecord $peerUuid The UUID of the peer to check for the property.
+         * @param InformationFieldName $property The name of the property to check for.
+         * @return bool
+         * @throws DatabaseOperationException Thrown if the operation fails.
+         */
+        public static function fieldExists(string|PeerDatabaseRecord $peerUuid, InformationFieldName $property): bool
+        {
+            if($peerUuid instanceof PeerDatabaseRecord)
+            {
+                $peerUuid = $peerUuid->getUuid();
+            }
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare('SELECT COUNT(*) FROM peer_information WHERE peer_uuid=:peer_uuid AND property_name=:property_name LIMIT 1');
+                $stmt->bindValue(':peer_uuid', $peerUuid);
+                $propertyName = $property->value;
+                $stmt->bindValue(':property_name', $propertyName);
+                $stmt->execute();
+
+                return $stmt->fetchColumn() > 0;
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException(sprintf('Failed to check if property exists for peer %s', $peerUuid), $e);
+            }
+        }
+
+        /**
+         * Gets a property from a peer's information record.
+         *
+         * @param string|PeerDatabaseRecord $peerUuid The UUID of the peer to get the property from.
+         * @param InformationFieldName $property The name of the property to get.
+         * @return PeerInformationFieldRecord|null The property record, or null if it does not exist.
+         * @throws DatabaseOperationException Thrown if the operation fails.
+         */
+        public static function getField(string|PeerDatabaseRecord $peerUuid, InformationFieldName $property): ?PeerInformationFieldRecord
+        {
+            if($peerUuid instanceof PeerDatabaseRecord)
+            {
+                $peerUuid = $peerUuid->getUuid();
+            }
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare('SELECT * FROM peer_information WHERE peer_uuid=:peer_uuid AND property_name=:property_name LIMIT 1');
+                $stmt->bindValue(':peer_uuid', $peerUuid);
+                $propertyName = $property->value;
+                $stmt->bindValue(':property_name', $propertyName);
+                $stmt->execute();
+
+                $result = $stmt->fetch();
+                if($result === false)
+                {
+                    return null;
+                }
+
+                return PeerInformationFieldRecord::fromArray($result);
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException(sprintf('Failed to get property %s for peer %s', $property->value, $peerUuid), $e);
+            }
+        }
+
+        /**
+         * Gets all properties from a peer's information record.
+         *
+         * @param string|PeerDatabaseRecord $peerUuid The UUID of the peer to get the properties from.
+         * @return PeerInformationFieldRecord[]
+         * @throws DatabaseOperationException Thrown if the operation fails.
+         */
+        public static function getFields(string|PeerDatabaseRecord $peerUuid): array
+        {
+            if($peerUuid instanceof PeerDatabaseRecord)
+            {
+                $peerUuid = $peerUuid->getUuid();
+            }
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare('SELECT * FROM peer_information WHERE peer_uuid=:peer_uuid');
+                $stmt->bindValue(':peer_uuid', $peerUuid);
+                $stmt->execute();
+                $results = $stmt->fetchAll();
+
+                if(!$results)
+                {
+                    return [];
+                }
+
+                return array_map(fn($result) => PeerInformationFieldRecord::fromArray($result), $results);
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException(sprintf('Failed to get properties for peer %s', $peerUuid), $e);
+            }
+        }
+
+        /**
+         * Gets all properties from a peer's information record that match the provided privacy filters.
+         *
+         * @param string|PeerDatabaseRecord $peerUuid The UUID of the peer to get the properties from.
+         * @param PrivacyState[] $privacyFilters The privacy filters to apply.
+         * @return PeerInformationFieldRecord[] The filtered properties.
+         * @throws DatabaseOperationException Thrown if the operation fails.
+         */
+        public static function getFilteredFields(string|PeerDatabaseRecord $peerUuid, array $privacyFilters): array
+        {
+            if($peerUuid instanceof PeerDatabaseRecord)
+            {
+                $peerUuid = $peerUuid->getUuid();
+            }
+
+            $results = [];
+            /** @var PrivacyState $privacyState */
+            foreach($privacyFilters as $privacyState)
+            {
+                try
+                {
+                    $stmt = Database::getConnection()->prepare('SELECT * FROM peer_information WHERE peer_uuid=:peer_uuid AND privacy_state=:privacy_state');
+                    $stmt->bindValue(':peer_uuid', $peerUuid);
+                    $stmt->bindValue(':privacy_state', $privacyState->value);
+                    $stmt->execute();
+                    $results = array_merge($results, $stmt->fetchAll());
+                }
+                catch(PDOException $e)
+                {
+                    throw new DatabaseOperationException(sprintf('Failed to get properties for peer %s with privacy state %s', $peerUuid, $privacyState->value), $e);
+                }
+            }
+
+            if(!$results)
+            {
+                return [];
+            }
+
+            return array_map(fn($result) => PeerInformationFieldRecord::fromArray($result), $results);
+        }
+
+        /**
+         * Deletes a property from a peer's information record.
+         *
+         * @param string|PeerDatabaseRecord $peerUuid The UUID of the peer to delete the property from.
+         * @param InformationFieldName $property The name of the property to delete.
+         * @return void
+         * @throws DatabaseOperationException Thrown if the operation fails.
+         */
+        public static function deleteField(string|PeerDatabaseRecord $peerUuid, InformationFieldName $property): void
+        {
+            if($peerUuid instanceof PeerDatabaseRecord)
+            {
+                $peerUuid = $peerUuid->getUuid();
+            }
+
+            try
+            {
+                $stmt = Database::getConnection()->prepare('DELETE FROM peer_information WHERE peer_uuid=:peer_uuid AND property_name=:property_name');
+                $stmt->bindValue(':peer_uuid', $peerUuid);
+                $propertyName = $property->value;
+                $stmt->bindValue(':property_name', $propertyName);
+                $stmt->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException(sprintf('Failed to delete property %s for peer %s', $property->value, $peerUuid), $e);
+            }
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Managers/RegisteredPeerManager.php b/src/Socialbox/Managers/RegisteredPeerManager.php
new file mode 100644
index 0000000..c7cc831
--- /dev/null
+++ b/src/Socialbox/Managers/RegisteredPeerManager.php
@@ -0,0 +1,427 @@
+<?php
+
+    namespace Socialbox\Managers;
+
+    use DateTime;
+    use Exception;
+    use InvalidArgumentException;
+    use PDO;
+    use PDOException;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Classes\Database;
+    use Socialbox\Classes\Logger;
+    use Socialbox\Enums\Flags\PeerFlags;
+    use Socialbox\Enums\PrivacyState;
+    use Socialbox\Enums\ReservedUsernames;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Objects\Database\PeerDatabaseRecord;
+    use Socialbox\Objects\PeerAddress;
+    use Socialbox\Objects\Standard\Peer;
+    use Symfony\Component\Uid\Uuid;
+
+    class RegisteredPeerManager
+    {
+        /**
+         * Checks if a username already exists in the database.
+         *
+         * @param string $username The username to check.
+         * @return bool True if the username exists, false otherwise.
+         * @throws DatabaseOperationException If the operation fails.
+         */
+        public static function usernameExists(string $username): bool
+        {
+            Logger::getLogger()->verbose(sprintf("Checking if username %s already exists", $username));
+
+            try
+            {
+                $statement = Database::getConnection()->prepare("SELECT COUNT(*) FROM peers WHERE username=:username AND server='host'");
+                $statement->bindParam(':username', $username);
+                $statement->execute();
+
+                $result = $statement->fetchColumn();
+                return $result > 0;
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to check if the username exists', $e);
+            }
+        }
+
+        /**
+         * Creates a new peer with the given username.
+         *
+         * @param PeerAddress $peerAddress The address of the peer to be created.
+         * @param bool $enabled True if the peer should be enabled, false otherwise.
+         * @return string The UUID of the newly created peer.
+         * @throws DatabaseOperationException If the operation fails.
+         */
+        public static function createPeer(PeerAddress $peerAddress, bool $enabled=false): string
+        {
+            Logger::getLogger()->verbose(sprintf("Registering peer %s", $peerAddress->getAddress()));
+            $uuid = Uuid::v4()->toRfc4122();
+            $server = $peerAddress->getDomain();
+
+            if($server === Configuration::getInstanceConfiguration()->getDomain())
+            {
+                $server = 'host';
+            }
+
+            try
+            {
+                $statement = Database::getConnection()->prepare('INSERT INTO peers (uuid, username, server, enabled) VALUES (?, ?, ?, ?)');
+                $statement->bindParam(1, $uuid);
+                $username = $peerAddress->getUsername();
+                $statement->bindParam(2, $username);
+                $statement->bindParam(3, $server);
+                $statement->bindParam(4, $enabled, PDO::PARAM_BOOL);
+                $statement->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to create the peer in the database', $e);
+            }
+
+            return $uuid;
+        }
+
+        /**
+         * Deletes a peer from the database based on the given UUID or RegisteredPeerRecord.
+         * WARNING: This operation is cascading and will delete all associated data.
+         *
+         * @param string|PeerDatabaseRecord $uuid The UUID or RegisteredPeerRecord instance representing the peer to be deleted.
+         * @return void
+         * @throws DatabaseOperationException If the operation fails.
+         */
+        public static function deletePeer(string|PeerDatabaseRecord $uuid): void
+        {
+            if($uuid instanceof PeerDatabaseRecord)
+            {
+                $uuid = $uuid->getUuid();
+            }
+
+            Logger::getLogger()->verbose(sprintf("Deleting peer %s", $uuid));
+
+            try
+            {
+                $statement = Database::getConnection()->prepare('DELETE FROM peers WHERE uuid=?');
+                $statement->bindParam(1, $uuid);
+                $statement->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to delete the peer from the database', $e);
+            }
+        }
+
+        /**
+         * Retrieves a registered peer record based on the given unique identifier or RegisteredPeerRecord object.
+         *
+         * @param string|PeerDatabaseRecord $uuid The unique identifier of the registered peer, or an instance of RegisteredPeerRecord.
+         * @return PeerDatabaseRecord Returns a RegisteredPeerRecord object containing the peer's information.
+         * @throws DatabaseOperationException If there is an error during the database operation.
+         */
+        public static function getPeer(string|PeerDatabaseRecord $uuid): PeerDatabaseRecord
+        {
+            if($uuid instanceof PeerDatabaseRecord)
+            {
+                $uuid = $uuid->getUuid();
+            }
+
+            Logger::getLogger()->verbose(sprintf("Retrieving peer %s from the database", $uuid));
+
+            try
+            {
+                $statement = Database::getConnection()->prepare('SELECT * FROM peers WHERE uuid=?');
+                $statement->bindParam(1, $uuid);
+                $statement->execute();
+
+                $result = $statement->fetch(PDO::FETCH_ASSOC);
+
+                if($result === false)
+                {
+                    throw new DatabaseOperationException(sprintf("The requested peer '%s' does not exist", $uuid));
+                }
+
+                return new PeerDatabaseRecord($result);
+            }
+            catch(Exception $e)
+            {
+                throw new DatabaseOperationException('Failed to get the peer from the database', $e);
+            }
+        }
+
+        /**
+         * Retrieves a peer record by the given username.
+         *
+         * @param PeerAddress $address The address of the peer to be retrieved.
+         * @return PeerDatabaseRecord|null The record of the peer associated with the given username.
+         * @throws DatabaseOperationException If there is an error while querying the database.
+         */
+        public static function getPeerByAddress(PeerAddress $address): ?PeerDatabaseRecord
+        {
+            Logger::getLogger()->verbose(sprintf("Retrieving peer %s from the database", $address->getAddress()));
+
+            try
+            {
+                $statement = Database::getConnection()->prepare('SELECT * FROM peers WHERE username=:username AND server=:server');
+                $username = $address->getUsername();
+                $statement->bindParam(':username', $username);
+                $server = $address->getDomain();
+
+                // Convert to 'host' if the domain is the same as the server's host
+                if($server === Configuration::getInstanceConfiguration()->getDomain())
+                {
+                    $server = 'host';
+                }
+
+                $statement->bindParam(':server', $server);
+                $statement->execute();
+
+                $result = $statement->fetch(PDO::FETCH_ASSOC);
+
+                if($result === false)
+                {
+                    return null;
+                }
+
+                return new PeerDatabaseRecord($result);
+            }
+            catch(Exception $e)
+            {
+                throw new DatabaseOperationException('Failed to get the peer from the database', $e);
+            }
+        }
+
+        /**
+         * Synchronizes the provided external peer by adding its details to the registered peers in the database.
+         *
+         * @param Peer $peer The peer object representing the external peer to be synchronized.
+         * @return void This method does not return any value.
+         * @throws InvalidArgumentException If the given peer is not an external peer or if it represents a host peer.
+         * @throws DatabaseOperationException If there is an error during the database operation to insert the peer's details.
+         */
+        public static function synchronizeExternalPeer(Peer $peer): void
+        {
+            if($peer->getPeerAddress()->getDomain() === Configuration::getInstanceConfiguration()->getDomain())
+            {
+                throw new InvalidArgumentException('Given peer is not an external peer');
+            }
+
+            if($peer->getPeerAddress()->getUsername() === ReservedUsernames::HOST->value)
+            {
+                throw new InvalidArgumentException('Cannot synchronize an external host peer');
+            }
+
+            $existingPeer = self::getPeerByAddress($peer->getPeerAddress());
+            if($existingPeer !== null)
+            {
+                // getUpdated is DateTime() if it's older than 1 hour, update it
+                if($existingPeer->getUpdated()->diff(new DateTime())->h < 1)
+                {
+                    return;
+                }
+
+                try
+                {
+                    $statement = Database::getConnection()->prepare('UPDATE peers SET updated=? WHERE uuid=?');
+                    $updated = new DateTime();
+                    $statement->bindParam(':updated', $updated);
+                    $uuid = $existingPeer->getUuid();
+                    $statement->bindParam(':uuid', $uuid);
+                    $statement->execute();
+                }
+                catch(PDOException $e)
+                {
+                    throw new DatabaseOperationException('Failed to update the external peer in the database', $e);
+                }
+
+                foreach($peer->getInformationFields() as $informationField)
+                {
+                    try
+                    {
+                        if(PeerInformationManager::fieldExists($existingPeer, $informationField->getName()))
+                        {
+                            PeerInformationManager::updateField($existingPeer, $informationField->getName(), $informationField->getValue());
+                        }
+                        else
+                        {
+                            PeerInformationManager::addField($existingPeer, $informationField->getName(), $informationField->getValue(), PrivacyState::PUBLIC);
+                        }
+                    }
+                    catch(DatabaseOperationException $e)
+                    {
+                        throw new DatabaseOperationException('Failed to update the external peer information in the database', $e);
+                    }
+                }
+
+                return;
+            }
+
+            $uuid = Uuid::v4()->toRfc4122();
+
+            try
+            {
+                $statement = Database::getConnection()->prepare('INSERT INTO peers (uuid, username, server, enabled) VALUES (:uuid, :username, :server, 1)');
+                $statement->bindParam(':uuid', $uuid);
+                $username = $peer->getPeerAddress()->getUsername();
+                $statement->bindParam(':username', $username);
+                $server = $peer->getPeerAddress()->getDomain();
+                $statement->bindParam(':server', $server);
+
+                $statement->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to synchronize the external peer in the database', $e);
+            }
+
+            foreach($peer->getInformationFields() as $informationField)
+            {
+                try
+                {
+                    PeerInformationManager::addField($uuid, $informationField->getName(), $informationField->getValue(), PrivacyState::PUBLIC);
+                }
+                catch(DatabaseOperationException $e)
+                {
+                    throw new DatabaseOperationException('Failed to add the external peer information in the database', $e);
+                }
+            }
+        }
+
+        /**
+         * Enables a peer identified by the given UUID or RegisteredPeerRecord.
+         *
+         * @param string|PeerDatabaseRecord $uuid The UUID or RegisteredPeerRecord instance representing the peer to be enabled.
+         * @return void
+         * @throws DatabaseOperationException If there is an error while updating the database.
+         */
+        public static function enablePeer(string|PeerDatabaseRecord $uuid): void
+        {
+            if($uuid instanceof PeerDatabaseRecord)
+            {
+                $uuid = $uuid->getUuid();
+            }
+
+            Logger::getLogger()->verbose(sprintf("Enabling peer %s", $uuid));
+
+            try
+            {
+                $statement = Database::getConnection()->prepare('UPDATE peers SET enabled=1 WHERE uuid=?');
+                $statement->bindParam(1, $uuid);
+                $statement->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to enable the peer in the database', $e);
+            }
+        }
+
+        /**
+         * Disables the peer identified by the given UUID or RegisteredPeerRecord.
+         *
+         * @param string|PeerDatabaseRecord $uuid The UUID or RegisteredPeerRecord instance representing the peer.
+         * @return void
+         * @throws DatabaseOperationException If there is an error while updating the peer's status in the database.
+         */
+        public static function disablePeer(string|PeerDatabaseRecord $uuid): void
+        {
+            if($uuid instanceof PeerDatabaseRecord)
+            {
+                $uuid = $uuid->getUuid();
+            }
+
+            Logger::getLogger()->verbose(sprintf("Disabling peer %s", $uuid));
+
+            try
+            {
+                $statement = Database::getConnection()->prepare('UPDATE peers SET enabled=0 WHERE uuid=?');
+                $statement->bindParam(1, $uuid);
+                $statement->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to disable the peer in the database', $e);
+            }
+        }
+
+        /**
+         * Adds a specific flag to the peer identified by the given UUID or RegisteredPeerRecord.
+         *
+         * @param string|PeerDatabaseRecord $uuid The UUID or RegisteredPeerRecord instance representing the peer.
+         * @param PeerFlags|array $flags The flag or array of flags to be added to the peer.
+         * @return void
+         * @throws DatabaseOperationException If there is an error while updating the database.
+         */
+        public static function addFlag(string|PeerDatabaseRecord $uuid, PeerFlags|array $flags): void
+        {
+            if($uuid instanceof PeerDatabaseRecord)
+            {
+                $uuid = $uuid->getUuid();
+            }
+
+            Logger::getLogger()->verbose(sprintf("Adding flag(s) %s to peer %s", implode(',', $flags), $uuid));
+
+            $peer = self::getPeer($uuid);
+            $existingFlags = $peer->getFlags();
+            $flags = is_array($flags) ? $flags : [$flags];
+
+            foreach($flags as $flag)
+            {
+                if(!in_array($flag, $existingFlags))
+                {
+                    $existingFlags[] = $flag;
+                }
+            }
+
+            try
+            {
+                $implodedFlags = implode(',', array_map(fn($flag) => $flag->name, $existingFlags));
+                $statement = Database::getConnection()->prepare('UPDATE peers SET flags=? WHERE uuid=?');
+                $statement->bindParam(1, $implodedFlags);
+                $statement->bindParam(2, $uuid);
+                $statement->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to add the flag to the peer in the database', $e);
+            }
+        }
+
+        /**
+         * Removes a specific flag from the peer identified by the given UUID or RegisteredPeerRecord.
+         *
+         * @param string|PeerDatabaseRecord $peer
+         * @param PeerFlags $flag The flag to be removed from the peer.
+         * @return void
+         * @throws DatabaseOperationException If there is an error while updating the database.
+         */
+        public static function removeFlag(string|PeerDatabaseRecord $peer, PeerFlags $flag): void
+        {
+            if(is_string($peer))
+            {
+                $peer = self::getPeer($peer);
+            }
+
+            Logger::getLogger()->verbose(sprintf("Removing flag %s from peer %s", $flag->value, $peer->getUuid()));
+
+            if(!$peer->flagExists($flag))
+            {
+                return;
+            }
+
+            $peer->removeFlag($flag);
+
+            try
+            {
+                $implodedFlags = PeerFlags::toString($peer->getFlags());
+                $statement = Database::getConnection()->prepare('UPDATE peers SET flags=? WHERE uuid=?');
+                $statement->bindParam(1, $implodedFlags);
+                $statement->bindParam(2, $registeredPeer);
+                $statement->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to remove the flag from the peer in the database', $e);
+            }
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Managers/ResolvedDnsRecordsManager.php b/src/Socialbox/Managers/ResolvedDnsRecordsManager.php
new file mode 100644
index 0000000..0c8c5f1
--- /dev/null
+++ b/src/Socialbox/Managers/ResolvedDnsRecordsManager.php
@@ -0,0 +1,184 @@
+<?php
+
+    namespace Socialbox\Managers;
+
+    use DateTime;
+    use Exception;
+    use PDOException;
+    use Socialbox\Classes\Database;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Objects\DnsRecord;
+
+    class ResolvedDnsRecordsManager
+    {
+        /**
+         * Checks whether a resolved server record exists in the database for the provided domain.
+         *
+         * @param string $domain The domain name to check for existence in the resolved records.
+         * @return bool True if the resolved server record exists, otherwise false.
+         * @throws DatabaseOperationException If the process encounters a database error.
+         */
+        public static function resolvedServerExists(string $domain): bool
+        {
+            try
+            {
+                $statement = Database::getConnection()->prepare("SELECT COUNT(*) FROM resolved_dns_records WHERE domain=?");
+                $statement->bindParam(1, $domain);
+                $statement->execute();
+                return $statement->fetchColumn() > 0;
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to check if a resolved server exists in the database', $e);
+            }
+        }
+
+        /**
+         * Deletes a resolved server record from the database for the provided domain.
+         *
+         * @param string $domain The domain name of the resolved server to be deleted.
+         * @return void
+         * @throws DatabaseOperationException If the deletion process encounters a database error.
+         */
+        public static function deleteResolvedServer(string $domain): void
+        {
+            try
+            {
+                $statement = Database::getConnection()->prepare("DELETE FROM resolved_dns_records WHERE domain=?");
+                $statement->bindParam(1, $domain);
+                $statement->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to delete a resolved server from the database', $e);
+            }
+        }
+
+        /**
+         * Retrieves the last updated timestamp of a resolved server from the database for a given domain.
+         *
+         * This method queries the database to fetch the timestamp indicating when the resolved server
+         * associated with the specified domain was last updated.
+         *
+         * @param string $domain The domain name for which the last updated timestamp is to be retrieved.
+         * @return DateTime The DateTime object representing the last updated timestamp of the resolved server.
+         *
+         * @throws DatabaseOperationException If the operation to retrieve the updated timestamp from the
+         *                                     database fails.
+         */
+        public static function getResolvedServerUpdated(string $domain): DateTime
+        {
+            try
+            {
+                $statement = Database::getConnection()->prepare("SELECT updated FROM resolved_dns_records WHERE domain=?");
+                $statement->bindParam(1, $domain);
+                $statement->execute();
+                $result = $statement->fetchColumn();
+                return new DateTime($result);
+            }
+            catch(Exception $e)
+            {
+                throw new DatabaseOperationException('Failed to get the updated date of a resolved server from the database', $e);
+            }
+        }
+
+        /**
+         * Retrieves a DNS record for the specified domain from the database.
+         *
+         * This method fetches the DNS record details, such as the RPC endpoint, public key,
+         * and expiration details, associated with the provided domain. If no record is found,
+         * it returns null.
+         *
+         * @param string $domain The domain name for which the DNS record is to be retrieved.
+         * @return DnsRecord|null The DNS record object if found, or null if no record exists for the given domain.
+         *
+         * @throws DatabaseOperationException If the operation to retrieve the DNS record from
+         *                                     the database fails.
+         */
+        public static function getDnsRecord(string $domain): ?DnsRecord
+        {
+            try
+            {
+                $statement = Database::getConnection()->prepare("SELECT * FROM resolved_dns_records WHERE domain=?");
+                $statement->bindParam(1, $domain);
+                $statement->execute();
+                $result = $statement->fetch();
+
+                if($result === false)
+                {
+                    return null;
+                }
+
+                return DnsRecord::fromArray([
+                    'rpc_endpoint' => $result['rpc_endpoint'],
+                    'public_key' => $result['public_key'],
+                    'expires' => $result['expires']
+                ]);
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to get a resolved server from the database', $e);
+            }
+        }
+
+        /**
+         * Adds or updates a resolved server in the database based on the provided domain and DNS record.
+         *
+         * If a resolved server for the given domain already exists in the database, the server's details
+         * will be updated. Otherwise, a new record will be inserted into the database.
+         *
+         * @param string $domain The domain name associated with the resolved server.
+         * @param DnsRecord $dnsRecord An object containing DNS record details such as the RPC endpoint,
+         *                             public key, and expiration details.
+         * @return void
+         * @throws DatabaseOperationException If the operation to add or update the resolved server in
+         *                                     the database fails.
+         */
+        public static function addResolvedServer(string $domain, DnsRecord $dnsRecord): void
+        {
+            $endpoint = $dnsRecord->getRpcEndpoint();
+            $publicKey = $dnsRecord->getPublicSigningKey();
+
+            if($domain === null || $endpoint === null || $publicKey === null)
+            {
+                throw new DatabaseOperationException('Failed to add a resolved server to the database: Invalid parameters');
+            }
+
+            if(self::resolvedServerExists($domain))
+            {
+                try
+                {
+                    $statement = Database::getConnection()->prepare("UPDATE resolved_dns_records SET rpc_endpoint=:rpc_endpoint, public_key=:public_key, expires=:expires, updated=:updated WHERE domain=:domain");
+                    $statement->bindParam(':rpc_endpoint', $endpoint);
+                    $statement->bindParam(':public_key', $publicKey);
+                    $expires = (new DateTime())->setTimestamp($dnsRecord->getExpires())->format('Y-m-d H:i:s');
+                    $statement->bindParam(':expires', $expires);
+                    $updated = (new DateTime())->format('Y-m-d H:i:s');
+                    $statement->bindParam(':updated', $updated);
+                    $statement->bindParam(':domain', $domain);
+                    $statement->execute();
+                }
+                catch(PDOException $e)
+                {
+                    throw new DatabaseOperationException('Failed to update a resolved server in the database', $e);
+                }
+
+                return;
+            }
+
+            try
+            {
+                $statement = Database::getConnection()->prepare("INSERT INTO resolved_dns_records (domain, rpc_endpoint, public_key, expires) VALUES (:domain, :rpc_endpoint, :public_key, :expires)");
+                $statement->bindParam(':domain', $domain);
+                $statement->bindParam(':rpc_endpoint', $endpoint);
+                $statement->bindParam(':public_key', $publicKey);
+                $expires = (new DateTime())->setTimestamp($dnsRecord->getExpires())->format('Y-m-d H:i:s');
+                $statement->bindParam(':expires', $expires);
+                $statement->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to add a resolved server to the database', $e);
+            }
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Managers/SessionManager.php b/src/Socialbox/Managers/SessionManager.php
index 4a9ab6b..3cd7d4d 100644
--- a/src/Socialbox/Managers/SessionManager.php
+++ b/src/Socialbox/Managers/SessionManager.php
@@ -7,48 +7,140 @@
     use InvalidArgumentException;
     use PDO;
     use PDOException;
+    use Socialbox\Classes\Configuration;
     use Socialbox\Classes\Cryptography;
     use Socialbox\Classes\Database;
-    use Socialbox\Classes\Utilities;
+    use Socialbox\Classes\Logger;
+    use Socialbox\Enums\Flags\SessionFlags;
     use Socialbox\Enums\SessionState;
     use Socialbox\Enums\StandardError;
     use Socialbox\Exceptions\DatabaseOperationException;
-    use Socialbox\Exceptions\StandardException;
-    use Socialbox\Objects\SessionRecord;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Objects\Database\PeerDatabaseRecord;
+    use Socialbox\Objects\Database\SessionRecord;
+    use Socialbox\Objects\KeyPair;
     use Symfony\Component\Uid\Uuid;
 
     class SessionManager
     {
         /**
-         * Creates a new session with the given public key.
-         *
-         * @param string $publicKey The public key to associate with the new session.
+         * Creates a new session for a given peer and client details, and stores it in the database.
          *
+         * @param PeerDatabaseRecord $peer The peer record for which the session is being created.
+         * @param string $clientName The name of the client application.
+         * @param string $clientVersion The version of the client application.
+         * @param string $clientPublicSigningKey The client's public signing key, which must be a valid Ed25519 key.
+         * @param string $clientPublicEncryptionKey The client's public encryption key, which must be a valid X25519 key.
+         * @param KeyPair $serverEncryptionKeyPair The server's key pair for encryption, including both public and private keys.
          * @return string The UUID of the newly created session.
-         *
-         * @throws InvalidArgumentException If the public key is empty or invalid.
-         * @throws DatabaseOperationException If there is an error while creating the session in the database.
+         * @throws InvalidArgumentException If the provided public signing key or encryption key is invalid.
+         * @throws DatabaseOperationException If there is an error during the session creation in the database.
          */
-        public static function createSession(string $publicKey): string
+        public static function createSession(PeerDatabaseRecord $peer, string $clientName, string $clientVersion, string $clientPublicSigningKey, string $clientPublicEncryptionKey, KeyPair $serverEncryptionKeyPair): string
         {
-            if($publicKey === '')
+            if($clientPublicSigningKey === '' || Cryptography::validatePublicSigningKey($clientPublicSigningKey) === false)
             {
-                throw new InvalidArgumentException('The public key cannot be empty', 400);
+                throw new InvalidArgumentException('The public key is not a valid Ed25519 public key');
             }
 
-            if(!Cryptography::validatePublicKey($publicKey))
+            if($clientPublicEncryptionKey === '' || Cryptography::validatePublicEncryptionKey($clientPublicEncryptionKey) === false)
             {
-                throw new InvalidArgumentException('The given public key is invalid', 400);
+                throw new InvalidArgumentException('The public key is not a valid X25519 public key');
             }
 
-            $publicKey = Utilities::base64decode($publicKey);
             $uuid = Uuid::v4()->toRfc4122();
+            $flags = [];
+
+            // TODO: Update this to support `host` peers
+            if($peer->isExternal())
+            {
+                $flags[] = SessionFlags::AUTHENTICATION_REQUIRED;
+                $flags[] = SessionFlags::VER_AUTHENTICATION;
+            }
+            else if($peer->isEnabled())
+            {
+                $flags[] = SessionFlags::AUTHENTICATION_REQUIRED;
+
+                if(PasswordManager::usesPassword($peer->getUuid()))
+                {
+                    $flags[] = SessionFlags::VER_PASSWORD;
+                }
+
+                if(Configuration::getRegistrationConfiguration()->isImageCaptchaVerificationRequired())
+                {
+                    $flags[] = SessionFlags::VER_IMAGE_CAPTCHA;
+                }
+            }
+            else
+            {
+                $flags[] = SessionFlags::REGISTRATION_REQUIRED;
+
+                if(Configuration::getRegistrationConfiguration()->isDisplayNameRequired())
+                {
+                    $flags[] = SessionFlags::SET_DISPLAY_NAME;
+                }
+
+                if(Configuration::getRegistrationConfiguration()->isDisplayPictureRequired())
+                {
+                    $flags[] = SessionFlags::SET_DISPLAY_PICTURE;
+                }
+
+                if(Configuration::getRegistrationConfiguration()->isImageCaptchaVerificationRequired())
+                {
+                    $flags[] = SessionFlags::VER_IMAGE_CAPTCHA;
+                }
+
+                if(Configuration::getRegistrationConfiguration()->isPasswordRequired())
+                {
+                    $flags[] = SessionFlags::SET_PASSWORD;
+                }
+
+                if(Configuration::getRegistrationConfiguration()->isOtpRequired())
+                {
+                    $flags[] = SessionFlags::SET_OTP;
+                }
+
+                if(Configuration::getRegistrationConfiguration()->isAcceptPrivacyPolicyRequired())
+                {
+                    $flags[] = SessionFlags::VER_PRIVACY_POLICY;
+                }
+
+                if(Configuration::getRegistrationConfiguration()->isAcceptTermsOfServiceRequired())
+                {
+                    $flags[] = SessionFlags::VER_TERMS_OF_SERVICE;
+                }
+
+                if(Configuration::getRegistrationConfiguration()->isAcceptCommunityGuidelinesRequired())
+                {
+                    $flags[] = SessionFlags::VER_COMMUNITY_GUIDELINES;
+                }
+            }
+
+            if(count($flags) > 0)
+            {
+                $implodedFlags = SessionFlags::toString($flags);
+            }
+            else
+            {
+                $implodedFlags = null;
+            }
+
+            $peerUuid = $peer->getUuid();
 
             try
             {
-                $statement = Database::getConnection()->prepare("INSERT INTO sessions (uuid, public_key) VALUES (?, ?)");
-                $statement->bindParam(1, $uuid);
-                $statement->bindParam(2, $publicKey);
+                $statement = Database::getConnection()->prepare("INSERT INTO sessions (uuid, peer_uuid, client_name, client_version, client_public_signing_key, client_public_encryption_key, server_public_encryption_key, server_private_encryption_key, flags) VALUES (:uuid, :peer_uuid, :client_name, :client_version, :client_public_signing_key, :client_public_encryption_key, :server_public_encryption_key, :server_private_encryption_key, :flags)");
+                $statement->bindParam(':uuid', $uuid);
+                $statement->bindParam(':peer_uuid', $peerUuid);
+                $statement->bindParam(':client_name', $clientName);
+                $statement->bindParam(':client_version', $clientVersion);
+                $statement->bindParam(':client_public_signing_key', $clientPublicSigningKey);
+                $statement->bindParam(':client_public_encryption_key', $clientPublicEncryptionKey);
+                $serverPublicEncryptionKey = $serverEncryptionKeyPair->getPublicKey();
+                $statement->bindParam(':server_public_encryption_key', $serverPublicEncryptionKey);
+                $serverPrivateEncryptionKey = $serverEncryptionKeyPair->getPrivateKey();
+                $statement->bindParam(':server_private_encryption_key', $serverPrivateEncryptionKey);
+                $statement->bindParam(':flags', $implodedFlags);
                 $statement->execute();
             }
             catch(PDOException $e)
@@ -87,12 +179,13 @@
          * Retrieves a session record by its unique identifier.
          *
          * @param string $uuid The unique identifier of the session.
-         * @return SessionRecord The session record corresponding to the given UUID.
+         * @return SessionRecord|null The session record corresponding to the given UUID.
          * @throws DatabaseOperationException If the session record cannot be found or if there is an error during retrieval.
-         * @throws StandardException
          */
-        public static function getSession(string $uuid): SessionRecord
+        public static function getSession(string $uuid): ?SessionRecord
         {
+            Logger::getLogger()->verbose(sprintf("Retrieving session %s from the database", $uuid));
+
             try
             {
                 $statement = Database::getConnection()->prepare("SELECT * FROM sessions WHERE uuid=?");
@@ -102,14 +195,22 @@
 
                 if ($data === false)
                 {
-                    throw new StandardException(sprintf("The requested session '%s' does not exist"), StandardError::SESSION_NOT_FOUND);
+                    return null;
                 }
 
                 // Convert the timestamp fields to DateTime objects
                 $data['created'] = new DateTime($data['created']);
-                $data['last_request'] = new DateTime($data['last_request']);
+                if(isset($data['last_request']) && $data['last_request'] !== null)
+                {
+                    $data['last_request'] = new DateTime($data['last_request']);
+                }
+                else
+                {
+                    $data['last_request'] = null;
+                }
 
                 return SessionRecord::fromArray($data);
+
             }
             catch (PDOException | DateMalformedStringException $e)
             {
@@ -117,35 +218,17 @@
             }
         }
 
-        /**
-         * Update the authenticated peer associated with the given session UUID.
-         *
-         * @param string $uuid The UUID of the session to update.
-         * @return void
-         */
-        public static function updateAuthenticatedPeer(string $uuid): void
-        {
-            try
-            {
-                $statement = Database::getConnection()->prepare("UPDATE sessions SET authenticated_peer_uuid=? WHERE uuid=?");
-                $statement->bindParam(1, $uuid);
-                $statement->bindParam(2, $uuid);
-                $statement->execute();
-            }
-            catch (PDOException $e)
-            {
-                throw new DatabaseOperationException('Failed to update authenticated peer', $e);
-            }
-        }
-
         /**
          * Updates the last request timestamp for a given session by its UUID.
          *
          * @param string $uuid The UUID of the session to be updated.
          * @return void
+         * @throws DatabaseOperationException
          */
         public static function updateLastRequest(string $uuid): void
         {
+            Logger::getLogger()->verbose(sprintf("Updating last request timestamp for session %s", $uuid));
+
             try
             {
                 $formattedTime = (new DateTime('@' . time()))->format('Y-m-d H:i:s');
@@ -166,19 +249,215 @@
          * @param string $uuid The unique identifier of the session to update.
          * @param SessionState $state The new state to be set for the session.
          * @return void No return value.
+         * @throws DatabaseOperationException
          */
         public static function updateState(string $uuid, SessionState $state): void
         {
+            Logger::getLogger()->verbose(sprintf("Updating state of session %s to %s", $uuid, $state->value));
+
             try
             {
                 $state_value = $state->value;
                 $statement = Database::getConnection()->prepare('UPDATE sessions SET state=? WHERE uuid=?');
                 $statement->bindParam(1, $state_value);
                 $statement->bindParam(2, $uuid);
+
+                $statement->execute();
             }
             catch(PDOException $e)
             {
                 throw new DatabaseOperationException('Failed to update session state', $e);
             }
         }
+
+        /**
+         * Updates the encryption keys and session state for a specific session UUID in the database.
+         *
+         * @param string $uuid The unique identifier for the session to update.
+         * @param string $privateSharedSecret The private shared secret to secure communication.
+         * @param string $clientEncryptionKey The client's encryption key used for transport security.
+         * @param string $serverEncryptionKey The server's encryption key used for transport security.
+         * @return void
+         * @throws DatabaseOperationException If an error occurs during the database operation.
+         */
+        public static function setEncryptionKeys(string $uuid, string $privateSharedSecret, string $clientEncryptionKey, string $serverEncryptionKey): void
+        {
+            Logger::getLogger()->verbose(sprintf('Setting the encryption key for %s', $uuid));
+
+            try
+            {
+                $state_value = SessionState::ACTIVE->value;
+                $statement = Database::getConnection()->prepare('UPDATE sessions SET state=:state, private_shared_secret=:private_shared_secret, client_transport_encryption_key=:client_transport_encryption_key, server_transport_encryption_key=:server_transport_encryption_key WHERE uuid=:uuid');
+                $statement->bindParam(':state', $state_value);
+                $statement->bindParam(':private_shared_secret', $privateSharedSecret);
+                $statement->bindParam(':client_transport_encryption_key', $clientEncryptionKey);
+                $statement->bindParam(':server_transport_encryption_key', $serverEncryptionKey);
+                $statement->bindParam(':uuid', $uuid);
+
+                $statement->execute();
+            }
+            catch(PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to set the encryption key', $e);
+            }
+        }
+
+        /**
+         * Retrieves the flags associated with a specific session.
+         *
+         * @param string $uuid The UUID of the session to retrieve flags for.
+         * @return SessionFlags[] An array of flags associated with the specified session.
+         * @throws DatabaseOperationException If there
+         */
+        private static function getFlags(string $uuid): array
+        {
+            Logger::getLogger()->verbose(sprintf("Retrieving flags for session %s", $uuid));
+
+            try
+            {
+                $statement = Database::getConnection()->prepare("SELECT flags FROM sessions WHERE uuid=?");
+                $statement->bindParam(1, $uuid);
+                $statement->execute();
+                $data = $statement->fetch(PDO::FETCH_ASSOC);
+
+                if ($data === false)
+                {
+                    throw new DatabaseOperationException(sprintf("The session '%s' does not exist", $uuid));
+                }
+
+                return SessionFlags::fromString($data['flags']);
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException(sprintf('Failed to retrieve flags for session %s', $uuid), $e);
+            }
+        }
+
+        /**
+         * Adds the specified flags to the session identified by the given UUID.
+         *
+         * @param string $uuid The unique identifier of the session to which the flags will be added.
+         * @param array $flags The flags to add to the session.
+         * @return void
+         * @throws DatabaseOperationException|StandardRpcException If there is an error while updating the session in the database.
+         */
+        public static function addFlags(string $uuid, array $flags): void
+        {
+            Logger::getLogger()->verbose(sprintf("Adding flags to session %s", $uuid));
+
+            // First get the existing flags
+            $existingFlags = self::getFlags($uuid);
+
+            // Merge the new flags with the existing ones
+            $flags = array_unique(array_merge($existingFlags, $flags));
+
+            try
+            {
+                $statement = Database::getConnection()->prepare("UPDATE sessions SET flags=? WHERE uuid=?");
+                $statement->bindValue(1, SessionFlags::toString($flags));
+                $statement->bindParam(2, $uuid);
+                $statement->execute();
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to add flags to session', $e);
+            }
+        }
+
+        /**
+         * Removes specified flags from the session associated with the given UUID.
+         *
+         * @param string $uuid The UUID of the session from which the flags will be removed.
+         * @param SessionFlags[] $flags An array of flags to be removed from the session.
+         * @return void
+         * @throws DatabaseOperationException If there is an error while updating the session in the database.
+         */
+        public static function removeFlags(string $uuid, array $flags): void
+        {
+            Logger::getLogger()->verbose(sprintf("Removing flags from session %s", $uuid));
+
+            $existingFlags = array_map(fn(SessionFlags $flag) => $flag->value, self::getFlags($uuid));
+            $flagsToRemove = array_map(fn(SessionFlags $flag) => $flag->value, $flags);
+            $updatedFlags = array_diff($existingFlags, $flagsToRemove);
+            $flagString = SessionFlags::toString(array_map(fn(string $value) => SessionFlags::from($value), $updatedFlags));
+
+            try
+            {
+                // Update the session flags in the database
+                $statement = Database::getConnection()->prepare("UPDATE sessions SET flags=? WHERE uuid=?");
+                $statement->bindValue(1, $flagString); // Use the stringified updated flags
+                $statement->bindParam(2, $uuid);
+                $statement->execute();
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to remove flags from session', $e);
+            }
+        }
+
+        /**
+         * Updates the authentication status for the specified session.
+         *
+         * @param string $uuid The unique identifier of the session to be updated.
+         * @param bool $authenticated The authentication status to set for the session.
+         * @return void
+         * @throws DatabaseOperationException If the database operation fails.
+         */
+        public static function setAuthenticated(string $uuid, bool $authenticated): void
+        {
+            Logger::getLogger()->verbose(sprintf("Setting session %s as authenticated: %s", $uuid, $authenticated ? 'true' : 'false'));
+
+            try
+            {
+                $statement = Database::getConnection()->prepare("UPDATE sessions SET authenticated=? WHERE uuid=?");
+                $statement->bindParam(1, $authenticated);
+                $statement->bindParam(2, $uuid);
+                $statement->execute();
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to update authenticated peer', $e);
+            }
+        }
+
+        /**
+         * Marks the session as complete if all necessary conditions are met.
+         *
+         * @param SessionRecord $session The session record to evaluate and potentially mark as complete.
+         * @param array $flagsToRemove An array of flags to remove from the session if it is marked as complete.
+         * @return void
+         * @throws DatabaseOperationException If there is an error while updating the session in the database.
+         */
+        public static function updateFlow(SessionRecord $session, array $flagsToRemove=[]): void
+        {
+            // Don't do anything if the session is already authenticated
+            if (!$session->flagExists(SessionFlags::AUTHENTICATION_REQUIRED) && !$session->flagExists(SessionFlags::REGISTRATION_REQUIRED))
+            {
+                return;
+            }
+
+            // Don't do anything if the flags to remove are not present
+            if(!$session->flagExists($flagsToRemove))
+            {
+                return;
+            }
+
+            // Remove & update the session flags
+            self::removeFlags($session->getUuid(), $flagsToRemove);
+            $sessionUuid = $session->getUuid();
+            $session = self::getSession($sessionUuid);
+
+            if($session === null)
+            {
+                throw new DatabaseOperationException(sprintf('The session %s was not found', $sessionUuid));
+            }
+
+            // Check if all registration/authentication requirements are met
+            if(SessionFlags::isComplete($session->getFlags()))
+            {
+                SessionManager::removeFlags($sessionUuid, [SessionFlags::REGISTRATION_REQUIRED, SessionFlags::AUTHENTICATION_REQUIRED]); // Remove the registration/authentication flags
+                SessionManager::setAuthenticated($sessionUuid, true); // Mark the session as authenticated
+                RegisteredPeerManager::enablePeer($session->getPeerUuid()); // Enable the peer
+            }
+        }
     }
\ No newline at end of file
diff --git a/src/Socialbox/Managers/SigningKeysManager.php b/src/Socialbox/Managers/SigningKeysManager.php
new file mode 100644
index 0000000..3dde942
--- /dev/null
+++ b/src/Socialbox/Managers/SigningKeysManager.php
@@ -0,0 +1,267 @@
+<?php
+
+    namespace Socialbox\Managers;
+
+    use DateTime;
+    use InvalidArgumentException;
+    use ncc\ThirdParty\Symfony\Uid\UuidV4;
+    use PDOException;
+    use Socialbox\Classes\Cryptography;
+    use Socialbox\Classes\Database;
+    use Socialbox\Enums\SigningKeyState;
+    use Socialbox\Exceptions\CryptographyException;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Objects\Database\SigningKeyRecord;
+
+    class SigningKeysManager
+    {
+
+        /**
+         * Retrieves the count of signing keys associated with a specific peer UUID.
+         *
+         * @param string $peerUuid The UUID of the peer for which to count the signing keys.
+         * @return int The number of signing keys associated with the given peer UUID.
+         * @throws DatabaseOperationException If there is an error during the database operation.
+         */
+        public static function getSigningKeyCount(string $peerUuid): int
+        {
+            try
+            {
+                $statement = Database::getConnection()->prepare("SELECT COUNT(*) FROM signing_keys WHERE peer_uuid=:peer_uuid");
+                $statement->bindParam(':peer_uuid', $peerUuid);
+                $statement->execute();
+
+                return $statement->fetchColumn();
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to get the signing key count from the database', $e);
+            }
+        }
+
+        /**
+         * Adds a signing key to the database for a specific peer.
+         *
+         * @param string $peerUuid The unique identifier of the peer associated with the signing key.
+         * @param string $publicKey The public signing key to be added. Must be valid according to the Cryptography::validatePublicSigningKey method.
+         * @param string $name Optional name associated with the signing key. Must not exceed 64 characters in length.
+         * @param int|null $expires Optional expiration timestamp for the signing key. Can be null if the key does not expire.
+         * @return string The UUID of the newly added signing key.
+         * @throws DatabaseOperationException If the operation to add the signing key to the database fails.
+         */
+        public static function addSigningKey(string $peerUuid, string $publicKey, string $name, ?int $expires=null): string
+        {
+            if(!Cryptography::validatePublicSigningKey($publicKey))
+            {
+                throw new InvalidArgumentException('The public key is invalid');
+            }
+
+
+            if(empty($name))
+            {
+                throw new InvalidArgumentException('The name cannot be empty');
+            }
+
+            if(strlen($name) > 64)
+            {
+                throw new InvalidArgumentException('The name is too long');
+            }
+
+            if($expires !== null)
+            {
+                if($expires === 0)
+                {
+                    $expires = null;
+                }
+                else
+                {
+                    if($expires < time())
+                    {
+                        throw new InvalidArgumentException('The expiration time is in the past');
+                    }
+
+                    if($expires < time() + 3600)
+                    {
+                        throw new InvalidArgumentException('The expiration time is too soon, must be at least 1 hour in the future');
+                    }
+
+                    $expires = (new DateTime())->setTimestamp($expires)->format('Y-m-d H:i:s');
+                }
+            }
+
+            $uuid = UuidV4::v4()->toRfc4122();
+
+            try
+            {
+                $statement = Database::getConnection()->prepare("INSERT INTO signing_keys (uuid, peer_uuid, public_key, expires, name) VALUES (:uuid, :peer_uuid, :public_key, :expires, :name)");
+                $statement->bindParam(':uuid', $uuid);
+                $statement->bindParam(':peer_uuid', $peerUuid);
+                $statement->bindParam(':public_key', $publicKey);
+                $statement->bindParam(':expires', $expires);
+                $statement->bindParam(':name', $name);
+                $statement->execute();
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to add a signing key to the database', $e);
+            }
+
+            return $uuid;
+        }
+
+        /**
+         * Updates the state of a signing key in the database identified by its UUID.
+         *
+         * @param string $peerUuid The UUID of the peer associated with the signing key.
+         * @param string $uuid The unique identifier of the signing key to update.
+         * @param SigningKeyState $state The new state to set for the signing key.
+         * @return void
+         * @throws DatabaseOperationException
+         */
+        public static function updateSigningKeyState(string $peerUuid, string $uuid, SigningKeyState $state): void
+        {
+            $state = $state->value;
+
+            try
+            {
+                $statement = Database::getConnection()->prepare("UPDATE signing_keys SET state=:state WHERE peer_uuid=:peer_uuid AND uuid=:uuid");
+                $statement->bindParam(':state', $state);
+                $statement->bindParam(':peer_uuid', $peerUuid);
+                $statement->bindParam(':uuid', $uuid);
+                $statement->execute();
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to update the signing key state in the database', $e);
+            }
+        }
+
+        /**
+         * Retrieves a signing key from the database using the provided UUID.
+         *
+         * @param string $peerUuid The UUID of the peer associated with the signing key.
+         * @param string $uuid The UUID of the signing key to retrieve.
+         * @return SigningKeyRecord|null The signing key record if found, or null if no record exists.
+         * @throws DatabaseOperationException If a database error occurs during the operation.
+         */
+        public static function getSigningKey(string $peerUuid, string $uuid): ?SigningKeyRecord
+        {
+            try
+            {
+                $statement = Database::getConnection()->prepare("SELECT * FROM signing_keys WHERE uuid=:uuid AND peer_uuid=:peer_uuid");
+                $statement->bindParam(':uuid', $uuid);
+                $statement->bindParam(':peer_uuid', $peerUuid);
+                $statement->execute();
+
+                if($row = $statement->fetch())
+                {
+                    return SigningKeyRecord::fromArray($row);
+                }
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to get the signing key from the database', $e);
+            }
+
+            return null;
+        }
+
+        /**
+         * Retrieves the signing keys associated with a specific peer UUID.
+         *
+         * @param string $peerUuid The UUID of the peer whose signing keys are to be retrieved.
+         * @return SigningKeyRecord[] An array of SigningKeyRecord objects representing the signing keys.
+         * @throws DatabaseOperationException If an error occurs during the database operation.
+         */
+        public static function getSigningKeys(string $peerUuid): array
+        {
+            try
+            {
+                $statement = Database::getConnection()->prepare("SELECT * FROM signing_keys WHERE peer_uuid=:peer_uuid");
+                $statement->bindParam(':peer_uuid', $peerUuid);
+                $statement->execute();
+
+                $signingKeys = [];
+                while($row = $statement->fetch())
+                {
+                    $signingKeys[] = SigningKeyRecord::fromArray($row);
+                }
+
+                return $signingKeys;
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to get the signing keys from the database', $e);
+            }
+        }
+
+        /**
+         * Checks if a signing key exists in the database using the provided UUID.
+         *
+         * @param string $peerUuid The UUID of the peer associated with the signing key.
+         * @param string $uuid The UUID of the signing key to check.
+         * @return bool True if the signing key exists, false otherwise.
+         * @throws DatabaseOperationException If a database error occurs during the operation.
+         */
+        public static function signingKeyExists(string $peerUuid, string $uuid): bool
+        {
+            try
+            {
+                $statement = Database::getConnection()->prepare("SELECT COUNT(*) FROM signing_keys WHERE uuid=:uuid AND peer_uuid=:peer_uuid");
+                $statement->bindParam(':uuid', $uuid);
+                $statement->bindParam(':peer_uuid', $peerUuid);
+                $statement->execute();
+
+                return $statement->fetchColumn() > 0;
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to check if the signing key exists in the database', $e);
+            }
+        }
+
+        /**
+         * Deletes a signing key from the database using the provided UUID.
+         *
+         * @param string $peerUuid The UUID of the peer associated with the signing key.
+         * @param string $uuid The UUID of the signing key to delete.
+         * @return void
+         * @throws DatabaseOperationException If a database error occurs during the operation.
+         */
+        public static function deleteSigningKey(string $peerUuid, string $uuid): void
+        {
+            try
+            {
+                $statement = Database::getConnection()->prepare("DELETE FROM signing_keys WHERE uuid=:uuid AND peer_uuid=:peer_uuid");
+                $statement->bindParam(':uuid', $uuid);
+                $statement->bindParam(':peer_uuid', $peerUuid);
+                $statement->execute();
+            }
+            catch (PDOException $e)
+            {
+                throw new DatabaseOperationException('Failed to delete the signing key from the database', $e);
+            }
+        }
+
+        /**
+         * Verifies the digital signature of a message using the signing key associated with a specific UUID.
+         *
+         * @param string $message The message whose signature needs to be verified.
+         * @param string $signature The digital signature to be verified.
+         * @param string $uuid The UUID used to retrieve the corresponding signing key.
+         * @return bool True if the signature is valid, false otherwise.
+         * @throws CryptographyException If an error occurs during the cryptographic operation.
+         * @throws DatabaseOperationException If an error occurs during the database operation.
+         */
+        public static function verifySignature(string $message, string $signature, string $uuid): bool
+        {
+            // TODO: Complete this
+            $signingKey = self::getSigningKey($uuid);
+            if($signingKey === null)
+            {
+                return false;
+            }
+
+            return Cryptography::verifyMessage($message, $signature, $signingKey->getPublicKey());
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Client/EncryptionChannelInstance.php b/src/Socialbox/Objects/Client/EncryptionChannelInstance.php
new file mode 100644
index 0000000..7457dc1
--- /dev/null
+++ b/src/Socialbox/Objects/Client/EncryptionChannelInstance.php
@@ -0,0 +1,26 @@
+<?php
+
+    namespace Socialbox\Objects\Client;
+
+    use Socialbox\SocialClient;
+
+    class EncryptionChannelInstance
+    {
+        private SocialClient $client;
+
+        /**
+         * Public constructor
+         *
+         * @param SocialClient $client The client to use
+         * @param EncryptionChannelSecret $secret The secret to use
+         */
+        public function __construct(SocialClient $client, EncryptionChannelSecret $secret)
+        {
+            $this->client = $client;
+        }
+
+        public function sendMessage(string $message): void
+        {
+            $this->client->sendMessage($message);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Client/EncryptionChannelSecret.php b/src/Socialbox/Objects/Client/EncryptionChannelSecret.php
new file mode 100644
index 0000000..d631910
--- /dev/null
+++ b/src/Socialbox/Objects/Client/EncryptionChannelSecret.php
@@ -0,0 +1,129 @@
+<?php
+
+    namespace Socialbox\Objects\Client;
+
+    use Socialbox\Classes\Cryptography;
+    use Socialbox\Exceptions\CryptographyException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\PeerAddress;
+
+    class EncryptionChannelSecret implements SerializableInterface
+    {
+        private string $channelUuid;
+        private PeerAddress $recipient;
+        private string $localPublicEncryptionKey;
+        private string $localPrivateEncryptionKey;
+        private ?string $receivingPublicEncryptionKey;
+
+        /**
+         * Public constructor
+         *
+         * @param array $data The data to create the object
+         */
+        public function __construct(array $data)
+        {
+            $this->channelUuid = $data['channel_uuid'];
+            $this->recipient = PeerAddress::fromAddress($data['recipient']);
+            $this->localPublicEncryptionKey = $data['local_public_encryption_key'];
+            $this->localPrivateEncryptionKey = $data['local_private_encryption_key'];
+            $this->receivingPublicEncryptionKey = $data['receiving_public_encryption_key'] ?? null;
+        }
+
+        /**
+         * Returns the channel UUID
+         *
+         * @return string
+         */
+        public function getChannelUuid(): string
+        {
+            return $this->channelUuid;
+        }
+
+        /**
+         * Returns the receiver
+         *
+         * @return PeerAddress
+         */
+        public function getRecipient(): PeerAddress
+        {
+            return $this->recipient;
+        }
+
+        /**
+         * Returns the calling public encryption key
+         *
+         * @return string
+         */
+        public function getLocalPublicEncryptionKey(): string
+        {
+            return $this->localPublicEncryptionKey;
+        }
+
+        /**
+         * Returns the calling private encryption key
+         *
+         * @return string
+         */
+        public function getLocalPrivateEncryptionKey(): string
+        {
+            return $this->localPrivateEncryptionKey;
+        }
+
+        /**
+         * Returns the receiving public encryption key
+         *
+         * @return string|null
+         */
+        public function getReceivingPublicEncryptionKey(): ?string
+        {
+            return $this->receivingPublicEncryptionKey;
+        }
+
+        /**
+         * Sets the receiving public encryption key
+         *
+         * @param string $receivingPublicEncryptionKey The receiving public encryption key
+         */
+        public function setReceivingPublicEncryptionKey(string $receivingPublicEncryptionKey): void
+        {
+            $this->receivingPublicEncryptionKey = $receivingPublicEncryptionKey;
+        }
+
+        /**
+         * Preform a Diffie-Hellman Exchange to get the shared secret between the two peers
+         *
+         * @return string The shared secret
+         * @throws CryptographyException If the receiving public encryption key is not set
+         */
+        public function getSharedSecret(): string
+        {
+            if($this->receivingPublicEncryptionKey === null)
+            {
+                throw new CryptographyException('The receiving public encryption key is not set');
+            }
+
+            return Cryptography::performDHE($this->receivingPublicEncryptionKey, $this->localPrivateEncryptionKey);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): EncryptionChannelSecret
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'channel_uuid' => $this->channelUuid,
+                'recipient' => $this->recipient->getAddress(),
+                'local_public_encryption_key' => $this->localPublicEncryptionKey,
+                'local_private_encryption_key' => $this->localPrivateEncryptionKey,
+                'receiving_public_encryption_key' => $this->receivingPublicEncryptionKey
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Client/ExportedSession.php b/src/Socialbox/Objects/Client/ExportedSession.php
new file mode 100644
index 0000000..8a18d36
--- /dev/null
+++ b/src/Socialbox/Objects/Client/ExportedSession.php
@@ -0,0 +1,330 @@
+<?php
+
+    namespace Socialbox\Objects\Client;
+
+    use Socialbox\Interfaces\SerializableInterface;
+
+    /**
+     * Represents an exported session containing cryptographic keys, identifiers, and endpoints.
+     */
+    class ExportedSession implements SerializableInterface
+    {
+        private string $peerAddress;
+        private string $rpcEndpoint;
+        private string $remoteServer;
+        private string $sessionUUID;
+        private string $transportEncryptionAlgorithm;
+        private int $serverKeypairExpires;
+        private string $serverPublicSigningKey;
+        private string $serverPublicEncryptionKey;
+        private string $clientPublicSigningKey;
+        private string $clientPrivateSigningKey;
+        private string $clientPublicEncryptionKey;
+        private string $clientPrivateEncryptionKey;
+        private string $privateSharedSecret;
+        private string $clientTransportEncryptionKey;
+        private string $serverTransportEncryptionKey;
+        private ?string $defaultSigningKey;
+        /**
+         * @var SignatureKeyPair[]
+         */
+        private array $signingKeys;
+        /**
+         * @var EncryptionChannelSecret[]
+         */
+        private array $encryptionChannelSecrets;
+
+        /**
+         * Constructor method to initialize class properties from the provided data array.
+         *
+         * @param array $data Associative array containing the required properties such as:
+         *                    'peer_address', 'rpc_endpoint', 'session_uuid',
+         *                    'server_public_signing_key', 'server_public_encryption_key',
+         *                    'client_public_signing_key', 'client_private_signing_key',
+         *                    'client_public_encryption_key', 'client_private_encryption_key',
+         *                    'private_shared_secret', 'client_transport_encryption_key',
+         *                    'server_transport_encryption_key'.
+         *
+         * @return void
+         */
+        public function __construct(array $data)
+        {
+            $this->peerAddress = $data['peer_address'];
+            $this->rpcEndpoint = $data['rpc_endpoint'];
+            $this->remoteServer = $data['remote_server'];
+            $this->sessionUUID = $data['session_uuid'];
+            $this->transportEncryptionAlgorithm = $data['transport_encryption_algorithm'];
+            $this->serverKeypairExpires = $data['server_keypair_expires'];
+            $this->serverPublicSigningKey = $data['server_public_signing_key'];
+            $this->serverPublicEncryptionKey = $data['server_public_encryption_key'];
+            $this->clientPublicSigningKey = $data['client_public_signing_key'];
+            $this->clientPrivateSigningKey = $data['client_private_signing_key'];
+            $this->clientPublicEncryptionKey = $data['client_public_encryption_key'];
+            $this->clientPrivateEncryptionKey = $data['client_private_encryption_key'];
+            $this->privateSharedSecret = $data['private_shared_secret'];
+            $this->clientTransportEncryptionKey = $data['client_transport_encryption_key'];
+            $this->serverTransportEncryptionKey = $data['server_transport_encryption_key'];
+            $this->defaultSigningKey = $data['default_signing_key'] ?? null;
+            $this->signingKeys = array_map(fn($key) => SignatureKeyPair::fromArray($key), $data['signing_keys']);
+            $this->encryptionChannelSecrets = array_map(fn($key) => EncryptionChannelSecret::fromArray($key), $data['encryption_channel_secrets']);
+        }
+
+        /**
+         * Retrieves the peer address associated with the current instance.
+         *
+         * @return string The peer address.
+         */
+        public function getPeerAddress(): string
+        {
+            return $this->peerAddress;
+        }
+
+        /**
+         * Retrieves the RPC endpoint.
+         *
+         * @return string The RPC endpoint.
+         */
+        public function getRpcEndpoint(): string
+        {
+            return $this->rpcEndpoint;
+        }
+
+        /**
+         * Retrieves the remote server.
+         *
+         * @return string The remote server.
+         */
+        public function getRemoteServer(): string
+        {
+            return $this->remoteServer;
+        }
+
+        /**
+         * Retrieves the session UUID associated with the current instance.
+         *
+         * @return string The session UUID.
+         */
+        public function getSessionUUID(): string
+        {
+            return $this->sessionUUID;
+        }
+
+        /**
+         * Retrieves the transport encryption algorithm being used.
+         *
+         * @return string The transport encryption algorithm.
+         */
+        public function getTransportEncryptionAlgorithm(): string
+        {
+            return $this->transportEncryptionAlgorithm;
+        }
+
+        /**
+         * Retrieves the expiration time of the server key pair.
+         *
+         * @return int The expiration timestamp of the server key pair.
+         */
+        public function getServerKeypairExpires(): int
+        {
+            return $this->serverKeypairExpires;
+        }
+
+        /**
+         * Retrieves the public signing key of the server.
+         *
+         * @return string The server's public signing key.
+         */
+        public function getServerPublicSigningKey(): string
+        {
+            return $this->serverPublicSigningKey;
+        }
+
+        /**
+         * Retrieves the server's public encryption key.
+         *
+         * @return string The server's public encryption key.
+         */
+        public function getServerPublicEncryptionKey(): string
+        {
+            return $this->serverPublicEncryptionKey;
+        }
+
+        /**
+         * Retrieves the client's public signing key.
+         *
+         * @return string The client's public signing key.
+         */
+        public function getClientPublicSigningKey(): string
+        {
+            return $this->clientPublicSigningKey;
+        }
+
+        /**
+         * Retrieves the client's private signing key.
+         *
+         * @return string The client's private signing key.
+         */
+        public function getClientPrivateSigningKey(): string
+        {
+            return $this->clientPrivateSigningKey;
+        }
+
+        /**
+         * Retrieves the public encryption key of the client.
+         *
+         * @return string The client's public encryption key.
+         */
+        public function getClientPublicEncryptionKey(): string
+        {
+            return $this->clientPublicEncryptionKey;
+        }
+
+        /**
+         * Retrieves the client's private encryption key.
+         *
+         * @return string The client's private encryption key.
+         */
+        public function getClientPrivateEncryptionKey(): string
+        {
+            return $this->clientPrivateEncryptionKey;
+        }
+
+        /**
+         * Retrieves the private shared secret associated with the current instance.
+         *
+         * @return string The private shared secret.
+         */
+        public function getPrivateSharedSecret(): string
+        {
+            return $this->privateSharedSecret;
+        }
+
+        /**
+         * Retrieves the client transport encryption key.
+         *
+         * @return string The client transport encryption key.
+         */
+        public function getClientTransportEncryptionKey(): string
+        {
+            return $this->clientTransportEncryptionKey;
+        }
+
+        /**
+         * Retrieves the server transport encryption key associated with the current instance.
+         *
+         * @return string The server transport encryption key.
+         */
+        public function getServerTransportEncryptionKey(): string
+        {
+            return $this->serverTransportEncryptionKey;
+        }
+
+        /**
+         * Retrieves the default signing key associated with the current instance.
+         *
+         * @return string|null The default signing key.
+         */
+        public function getDefaultSigningKey(): ?string
+        {
+            return $this->defaultSigningKey;
+        }
+
+        /**
+         * Retrieves the signing keys associated with the current instance.
+         *
+         * @return SignatureKeyPair[] The signing keys.
+         */
+        public function getSigningKeys(): array
+        {
+            return $this->signingKeys;
+        }
+
+        /**
+         * Retrieves the encrypted channel keys associated with the current instance.
+         *
+         * @return EncryptionChannelSecret[] The encrypted channel keys.
+         */
+        public function getEncryptionChannelSecrets(): array
+        {
+            return $this->encryptionChannelSecrets;
+        }
+
+        /**
+         * Retrieves the signing key associated with the provided UUID.
+         *
+         * @param string $uuid The UUID of the signing key.
+         * @return SignatureKeyPair|null The signing key.
+         */
+        public function getEncryptionChannelSecret(string $uuid): ?EncryptionChannelSecret
+        {
+            return $this->encryptionChannelSecrets[$uuid] ?? null;
+        }
+
+        /**
+         * Adds a new signing key to the current instance.
+         *
+         * @param EncryptionChannelSecret $key The signing key to add.
+         * @return void
+         */
+        public function addEncryptionChannelSecret(EncryptionChannelSecret $key): void
+        {
+            $this->encryptionChannelSecrets[$key->getChannelUuid()] = $key;
+        }
+
+        /**
+         * Removes the signing key associated with the provided UUID.
+         *
+         * @param string $uuid The UUID of the signing key to remove.
+         * @return void
+         */
+        public function removeEncryptionChannelSecret(string $uuid): void
+        {
+            unset($this->encryptionChannelSecrets[$uuid]);
+        }
+
+        /**
+         * Checks if a signing key exists for the provided UUID.
+         *
+         * @param string $uuid The UUID of the signing key.
+         * @return bool True if the signing key exists, false otherwise.
+         */
+        public function encryptionChannelSecretExists(string $uuid): bool
+        {
+            return isset($this->encryptionChannelSecrets[$uuid]);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'peer_address' => $this->peerAddress,
+                'rpc_endpoint' => $this->rpcEndpoint,
+                'remote_server' => $this->remoteServer,
+                'session_uuid' => $this->sessionUUID,
+                'transport_encryption_algorithm' => $this->transportEncryptionAlgorithm,
+                'server_keypair_expires' => $this->serverKeypairExpires,
+                'server_public_signing_key' => $this->serverPublicSigningKey,
+                'server_public_encryption_key' => $this->serverPublicEncryptionKey,
+                'client_public_signing_key' => $this->clientPublicSigningKey,
+                'client_private_signing_key' => $this->clientPrivateSigningKey,
+                'client_public_encryption_key' => $this->clientPublicEncryptionKey,
+                'client_private_encryption_key' => $this->clientPrivateEncryptionKey,
+                'private_shared_secret' => $this->privateSharedSecret,
+                'client_transport_encryption_key' => $this->clientTransportEncryptionKey,
+                'server_transport_encryption_key' => $this->serverTransportEncryptionKey,
+                'default_signing_key' => $this->defaultSigningKey,
+                'signing_keys' => array_map(fn($key) => $key->toArray(), $this->signingKeys),
+                'encryption_channel_secrets' => array_map(fn($key) => $key->toArray(), $this->encryptionChannelSecrets),
+            ];
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): ExportedSession
+        {
+            return new ExportedSession($data);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Client/SignatureKeyPair.php b/src/Socialbox/Objects/Client/SignatureKeyPair.php
new file mode 100644
index 0000000..c758db8
--- /dev/null
+++ b/src/Socialbox/Objects/Client/SignatureKeyPair.php
@@ -0,0 +1,100 @@
+<?php
+
+    namespace Socialbox\Objects\Client;
+
+    use Socialbox\Interfaces\SerializableInterface;
+
+    class SignatureKeyPair implements SerializableInterface
+    {
+        private string $uuid;
+        private ?string $name;
+        private string $publicKey;
+        private string $privateKey;
+        private ?int $expires;
+
+        /**
+         * Public constructor
+         *
+         * @param array $data The data to create the object
+         */
+        public function __construct(array $data)
+        {
+            $this->uuid = $data['uuid'];
+            $this->name = $data['name'] ?? null;
+            $this->publicKey = $data['public_key'];
+            $this->privateKey = $data['private_key'];
+            $this->expires = (int)$data['expires'] ?? null;
+        }
+
+        /**
+         * Returns the UUID of the key pair
+         *
+         * @return string The UUID of the key pair
+         */
+        public function getUuid(): string
+        {
+            return $this->uuid;
+        }
+
+        /**
+         * Returns the name of the key pair
+         *
+         * @return string|null The name of the key pair
+         */
+        public function getName(): ?string
+        {
+            return $this->name;
+        }
+
+        /**
+         * Returns the public key of the key pair
+         *
+         * @return string The public key of the key pair
+         */
+        public function getPublicKey(): string
+        {
+            return $this->publicKey;
+        }
+
+        /**
+         * Returns the private key of the key pair
+         *
+         * @return string The private key of the key pair
+         */
+        public function getPrivateKey(): string
+        {
+            return $this->privateKey;
+        }
+
+        /**
+         * Returns the expiration date of the key pair
+         *
+         * @return int|null The expiration date of the key pair
+         */
+        public function getExpires(): ?int
+        {
+            return $this->expires;
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): SignatureKeyPair
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'uuid' => $this->uuid,
+                'name' => $this->name,
+                'public_key' => $this->publicKey,
+                'private_key' => $this->privateKey,
+                'expires' => $this->expires
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/ClientRequest.php b/src/Socialbox/Objects/ClientRequest.php
index ecb942a..4e9ef07 100644
--- a/src/Socialbox/Objects/ClientRequest.php
+++ b/src/Socialbox/Objects/ClientRequest.php
@@ -1,142 +1,337 @@
 <?php
 
-namespace Socialbox\Objects;
+    namespace Socialbox\Objects;
 
-use RuntimeException;
-use Socialbox\Classes\Cryptography;
-use Socialbox\Enums\StandardError;
-use Socialbox\Enums\StandardHeaders;
-use Socialbox\Exceptions\CryptographyException;
-use Socialbox\Exceptions\DatabaseOperationException;
-use Socialbox\Exceptions\StandardException;
-use Socialbox\Managers\SessionManager;
+    use Socialbox\Classes\Cryptography;
+    use Socialbox\Enums\StandardHeaders;
+    use Socialbox\Enums\Types\RequestType;
+    use Socialbox\Exceptions\CryptographyException;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\RequestException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Managers\RegisteredPeerManager;
+    use Socialbox\Managers\SessionManager;
+    use Socialbox\Objects\Database\PeerDatabaseRecord;
+    use Socialbox\Objects\Database\SessionRecord;
 
-class ClientRequest
-{
-    /**
-     * @var array
-     */
-    private array $headers;
-
-    /**
-     * @var RpcRequest[]
-     */
-    private array $requests;
-
-    /**
-     * @var string
-     */
-    private string $requestHash;
-
-    /**
-     * ClientRequest constructor.
-     *
-     * @param array $headers The headers of the request
-     * @param RpcRequest[] $requests The RPC requests of the client
-     */
-    public function __construct(array $headers, array $requests, string $requestHash)
+    class ClientRequest
     {
-        $this->headers = $headers;
-        $this->requests = $requests;
-        $this->requestHash = $requestHash;
-    }
+        private array $headers;
+        private ?RequestType $requestType;
+        private ?string $requestBody;
 
-    /**
-     * @return array
-     */
-    public function getHeaders(): array
-    {
-        return $this->headers;
-    }
+        private ?string $clientName;
+        private ?string $clientVersion;
+        private ?string $identifyAs;
+        private ?string $sessionUuid;
+        private ?string $signature;
 
-    /**
-     * @return RpcRequest[]
-     */
-    public function getRequests(): array
-    {
-        return $this->requests;
-    }
-
-    public function getHash(): string
-    {
-        return $this->requestHash;
-    }
-
-    public function getClientName(): string
-    {
-        return $this->headers[StandardHeaders::CLIENT_NAME->value];
-    }
-
-    public function getClientVersion(): string
-    {
-        return $this->headers[StandardHeaders::CLIENT_VERSION->value];
-    }
-
-    public function getSessionUuid(): ?string
-    {
-        if(!isset($this->headers[StandardHeaders::SESSION_UUID->value]))
+        /**
+         * Initializes the instance with the provided request headers and optional request body.
+         *
+         * @param array $headers An associative array of request headers used to set properties such as client name, version, and others.
+         * @param string|null $requestBody The optional body of the request, or null if not provided.
+         *
+         * @return void
+         */
+        public function __construct(array $headers, ?string $requestBody)
         {
-            return null;
+            $parsedHeaders = [];
+            foreach($headers as $key => $value)
+            {
+                $parsedHeaders[strtolower($key)] = $value;
+            }
+
+            $this->headers = $parsedHeaders;
+            $this->requestBody = $requestBody;
+
+            $this->clientName = $parsedHeaders[strtolower(StandardHeaders::CLIENT_NAME->value)] ?? null;
+            $this->clientVersion = $parsedHeaders[strtolower(StandardHeaders::CLIENT_VERSION->value)] ?? null;
+            $this->requestType = RequestType::tryFrom($parsedHeaders[strtolower(StandardHeaders::REQUEST_TYPE->value)]);
+            $this->identifyAs = $parsedHeaders[strtolower(StandardHeaders::IDENTIFY_AS->value)] ?? null;
+            $this->sessionUuid = $parsedHeaders[strtolower(StandardHeaders::SESSION_UUID->value)] ?? null;
+            $this->signature = $parsedHeaders[strtolower(StandardHeaders::SIGNATURE->value)] ?? null;
         }
 
-        return $this->headers[StandardHeaders::SESSION_UUID->value];
-    }
-
-    public function getFromPeer(): ?PeerAddress
-    {
-        if(!isset($this->headers[StandardHeaders::FROM_PEER->value]))
+        /**
+         * Retrieves the headers.
+         *
+         * @return array Returns an array of headers.
+         */
+        public function getHeaders(): array
         {
-            return null;
+            return $this->headers;
         }
 
-        return PeerAddress::fromAddress($this->headers[StandardHeaders::FROM_PEER->value]);
-    }
-
-    public function getSignature(): ?string
-    {
-        if(!isset($this->headers[StandardHeaders::SIGNATURE->value]))
+        /**
+         * Checks if the specified header exists in the collection of headers.
+         *
+         * @param StandardHeaders|string $header The header to check, either as a StandardHeaders enum or a string.
+         * @return bool Returns true if the header exists, otherwise false.
+         */
+        public function headerExists(StandardHeaders|string $header): bool
         {
-            return null;
+            if(is_string($header))
+            {
+                return isset($this->headers[strtolower($header)]);
+            }
+
+            return isset($this->headers[strtolower($header->value)]);
         }
 
-        return $this->headers[StandardHeaders::SIGNATURE->value];
-    }
-
-    /**
-     * @return bool
-     * @throws DatabaseOperationException
-     */
-    public function verifySignature(): bool
-    {
-        $signature = $this->getSignature();
-        $sessionUuid = $this->getSessionUuid();
-
-        if($signature == null || $sessionUuid == null)
+        /**
+         * Retrieves the value of a specified header.
+         *
+         * @param StandardHeaders|string $header The header to retrieve, provided as either a StandardHeaders enum or a string key.
+         * @return string|null Returns the header value if it exists, or null if the header does not exist.
+         */
+        public function getHeader(StandardHeaders|string $header): ?string
         {
-            return false;
+            if(!$this->headerExists($header))
+            {
+                return null;
+            }
+
+            if(is_string($header))
+            {
+                return $this->headers[strtolower($header)];
+            }
+
+            return $this->headers[strtolower($header->value)];
         }
 
-        try
+        /**
+         * Retrieves the request body.
+         *
+         * @return string|null Returns the request body as a string if available, or null if not set.
+         */
+        public function getRequestBody(): ?string
         {
-            $session = SessionManager::getSession($sessionUuid);
+            return $this->requestBody;
         }
-        catch(StandardException $e)
+
+        /**
+         * Retrieves the name of the client.
+         *
+         * @return string|null Returns the client's name if set, or null if not available.
+         */
+        public function getClientName(): ?string
         {
-            if($e->getStandardError() == StandardError::SESSION_NOT_FOUND)
+            return $this->clientName;
+        }
+
+        /**
+         * Retrieves the client version.
+         *
+         * @return string|null Returns the client version if available, or null if not set.
+         */
+        public function getClientVersion(): ?string
+        {
+            return $this->clientVersion;
+        }
+
+        /**
+         * Retrieves the request type associated with the current instance.
+         *
+         * @return RequestType|null Returns the associated RequestType if available, or null if not set.
+         */
+        public function getRequestType(): ?RequestType
+        {
+            return $this->requestType;
+        }
+
+        /**
+         * Retrieves the peer address the instance identifies as.
+         *
+         * @return PeerAddress|null Returns a PeerAddress instance if the identification address is set, or null otherwise.
+         */
+        public function getIdentifyAs(): ?PeerAddress
+        {
+            if($this->identifyAs === null)
+            {
+                return null;
+            }
+
+            return PeerAddress::fromAddress($this->identifyAs);
+        }
+
+        /**
+         * Retrieves the UUID of the current session.
+         *
+         * @return string|null Returns the session UUID if available, or null if it is not set.
+         */
+        public function getSessionUuid(): ?string
+        {
+            return $this->sessionUuid;
+        }
+
+        /**
+         * Retrieves the current session associated with the session UUID.
+         *
+         * @return SessionRecord|null Returns the associated SessionRecord if the session UUID exists, or null if no session UUID is set.
+         * @throws DatabaseOperationException Thrown if an error occurs while retrieving the session.
+         */
+        public function getSession(): ?SessionRecord
+        {
+            if($this->sessionUuid === null)
+            {
+                return null;
+            }
+
+            return SessionManager::getSession($this->sessionUuid);
+        }
+
+        /**
+         * Retrieves the associated peer for the current session.
+         *
+         * @return PeerDatabaseRecord|null Returns the associated RegisteredPeerRecord if available, or null if no session exists.
+         * @throws DatabaseOperationException Thrown if an error occurs while retrieving the peer.
+         */
+        public function getPeer(): ?PeerDatabaseRecord
+        {
+            $session = $this->getSession();
+
+            if($session === null)
+            {
+                return null;
+            }
+
+            return RegisteredPeerManager::getPeer($session->getPeerUuid());
+        }
+
+        /**
+         * Returns the Peer Database Record of the identified peer of the request
+         *
+         * @return PeerDatabaseRecord|null The Peer Database Record of the identified peer or null if not set
+         * @throws DatabaseOperationException Thrown if an error occurs while retrieving the peer.
+         */
+        public function getIdentifiedAsPeer(): ?PeerDatabaseRecord
+        {
+            $identifiedAs = $this->getIdentifyAs();
+            if($identifiedAs === null)
+            {
+                return null;
+            }
+
+            return RegisteredPeerManager::getPeerByAddress($identifiedAs);
+        }
+
+        /**
+         * Returns whether the request is external or not. As in, if the request is coming from server rather than
+         * a client.
+         *
+         * @return bool True if the request is external, false otherwise.
+         * @throws DatabaseOperationException Thrown if an error occurs while retrieving the peer.
+         */
+        public function isExternal(): bool
+        {
+            return $this->getPeer()->isExternal();
+        }
+
+        /**
+         * Retrieves the signature value.
+         *
+         * @return string|null The signature value or null if not set
+         */
+        public function getSignature(): ?string
+        {
+            return $this->signature;
+        }
+
+        /**
+         * Verifies the signature of the provided decrypted content.
+         *
+         * @param string $decryptedContent The decrypted content to verify the signature against.
+         * @return bool True if the signature is valid, false otherwise.
+         * @throws DatabaseOperationException Thrown if an error occurs while retrieving the client's public signing key.
+         * @throws StandardRpcException Thrown if the session UUID is invalid.
+         */
+        private function verifySignature(string $decryptedContent): bool
+        {
+            if($this->getSignature() == null || $this->getSessionUuid() == null)
             {
                 return false;
             }
 
-            throw new RuntimeException($e);
+            try
+            {
+                return Cryptography::verifyMessage(
+                    message: $decryptedContent,
+                    signature: $this->getSignature(),
+                    publicKey: $this->getSession()->getClientPublicSigningKey()
+                );
+            }
+            catch(CryptographyException)
+            {
+                return false;
+            }
         }
 
-        try
+        /**
+         * Handles a POST request, returning an array of RpcRequest objects
+         * expects a JSON encoded body with either a single RpcRequest object or an array of RpcRequest objects
+         *
+         * @return RpcRequest[] The parsed RpcRequest objects
+         * @throws RequestException Thrown if the request is invalid
+         */
+        public function getRpcRequests(string $json): array
         {
-            return Cryptography::verifyContent($this->getHash(), $signature, $session->getPublicKey());
+            $body = json_decode($json, true);
+            if($body === false)
+            {
+                throw new RequestException('Malformed JSON', 400);
+            }
+
+            // If the body only contains a method, we assume it's a single request
+            if(isset($body['method']))
+            {
+                return [$this->parseRequest($body)];
+            }
+
+            // Otherwise, we assume it's an array of requests
+            return array_map(fn($request) => $this->parseRequest($request), $body);
         }
-        catch(CryptographyException $e)
+
+        /**
+         * Parses the raw request data into an RpcRequest object
+         *
+         * @param array $data The raw request data
+         * @return RpcRequest The parsed RpcRequest object
+         * @throws RequestException If the request is invalid
+         */
+        private function parseRequest(array $data): RpcRequest
         {
-            return false;
+            if(!isset($data['method']))
+            {
+                throw new RequestException("Missing 'method' key in request", 400);
+            }
+
+            if(isset($data['id']))
+            {
+                if(!is_string($data['id']))
+                {
+                    throw new RequestException("Invalid 'id' key in request: Expected string", 400);
+                }
+
+                if(strlen($data['id']) === 0)
+                {
+                    throw new RequestException("Invalid 'id' key in request: Expected non-empty string", 400);
+                }
+
+                if(strlen($data['id']) > 8)
+                {
+                    throw new RequestException("Invalid 'id' key in request: Expected string of length <= 8", 400);
+                }
+            }
+
+            if(isset($data['parameters']))
+            {
+                if(!is_array($data['parameters']))
+                {
+                    throw new RequestException("Invalid 'parameters' key in request: Expected array", 400);
+                }
+            }
+
+            return new RpcRequest($data['method'], $data['id'] ?? null, $data['parameters'] ?? null);
         }
-    }
-}
\ No newline at end of file
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Database/CaptchaRecord.php b/src/Socialbox/Objects/Database/CaptchaRecord.php
new file mode 100644
index 0000000..72b77e2
--- /dev/null
+++ b/src/Socialbox/Objects/Database/CaptchaRecord.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Socialbox\Objects\Database;
+
+use DateTime;
+use Socialbox\Classes\Configuration;
+use Socialbox\Enums\Status\CaptchaStatus;
+use Socialbox\Interfaces\SerializableInterface;
+
+class CaptchaRecord implements SerializableInterface
+{
+    private string $uuid;
+    private string $peerUuid;
+    private CaptchaStatus $status;
+    private ?string $answer;
+    private ?DateTime $answered;
+    private DateTime $created;
+
+    public function __construct(array $data)
+    {
+        $this->uuid = (string)$data['uuid'];
+        $this->peerUuid = (string)$data['peer_uuid'];
+        $this->status = CaptchaStatus::tryFrom((string)$data['status']);
+        $this->answer = isset($data['answer']) ? (string)$data['answer'] : null;
+        $this->answered = isset($data['answered']) ? new DateTime((string)$data['answered']) : null;
+        $this->created = new DateTime((string)$data['created']);
+    }
+
+    public function getUuid(): string
+    {
+        return $this->uuid;
+    }
+
+    public function getPeerUuid(): string
+    {
+        return $this->peerUuid;
+    }
+
+    public function getStatus(): CaptchaStatus
+    {
+        return $this->status;
+    }
+
+    public function getAnswer(): ?string
+    {
+        return $this->answer;
+    }
+
+    public function getAnswered(): ?DateTime
+    {
+        return $this->answered;
+    }
+
+    public function getCreated(): DateTime
+    {
+        return $this->created;
+    }
+
+    public function getExpires(): int
+    {
+        return $this->created->getTimestamp() + Configuration::getSecurityConfiguration()->getCaptchaTtl();
+    }
+
+    public function isExpired(): bool
+    {
+        return time() > $this->getExpires();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function fromArray(array $data): object
+    {
+        return new self($data);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function toArray(): array
+    {
+        return [
+            'uuid' => $this->uuid,
+            'peer_uuid' => $this->peerUuid,
+            'status' => $this->status->value,
+            'answer' => $this->answer,
+            'answered' => $this->answered?->format('Y-m-d H:i:s'),
+            'created' => $this->created->format('Y-m-d H:i:s')
+        ];
+    }
+}
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Database/ContactDatabaseRecord.php b/src/Socialbox/Objects/Database/ContactDatabaseRecord.php
new file mode 100644
index 0000000..d10914b
--- /dev/null
+++ b/src/Socialbox/Objects/Database/ContactDatabaseRecord.php
@@ -0,0 +1,153 @@
+<?php
+
+    namespace Socialbox\Objects\Database;
+
+    use DateMalformedStringException;
+    use DateTime;
+    use InvalidArgumentException;
+    use Socialbox\Enums\Types\ContactRelationshipType;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\Standard\Contact;
+
+    class ContactDatabaseRecord implements SerializableInterface
+    {
+        private string $uuid;
+        private string $peerUuid;
+        private string $contactPeerAddress;
+        private ContactRelationshipType $relationship;
+        private DateTime $created;
+
+        /**
+         * Constructor for initializing the class with provided data.
+         *
+         * @param array $data An associative array containing the initialization data:
+         *                    - 'uuid': string The unique identifier.
+         *                    - 'peer_uuid': string The peer unique identifier.
+         *                    - 'contact_peer_address': string The contact peer address.
+         *                    - 'relationship': mixed The contact relationship type, as a string or ContactRelationshipType.
+         *                    - 'created': mixed The creation date as a string, integer timestamp, or DateTime instance.
+         * @throws DateMalformedStringException If the created date is not a valid date string.
+         * @throws InvalidArgumentException If one or more of the provided data is invalid.
+         */
+        public function __construct(array $data)
+        {
+            $this->uuid = $data['uuid'];
+            $this->peerUuid = $data['peer_uuid'];
+            $this->contactPeerAddress = $data['contact_peer_address'];
+
+            if(is_string($data['relationship']))
+            {
+                $this->relationship = ContactRelationshipType::from($data['relationship']);
+            }
+            elseif($data['relationship'] instanceof ContactRelationshipType)
+            {
+                $this->relationship = $data['relationship'];
+            }
+            else
+            {
+                throw new InvalidArgumentException('Invalid relationship type');
+            }
+
+            if(is_int($data['created']))
+            {
+                $this->created = (new DateTime())->setTimestamp($data['created']);
+            }
+            elseif(is_string($data['created']))
+            {
+                $this->created = new DateTime($data['created']);
+            }
+            elseif($data['created'] instanceof DateTime)
+            {
+                $this->created = $data['created'];
+            }
+            else
+            {
+                throw new InvalidArgumentException('Invalid created date');
+            }
+        }
+
+        /**
+         *
+         * @return string Returns the UUID as a string.
+         */
+        public function getUuid(): string
+        {
+            return $this->uuid;
+        }
+
+        /**
+         * Retrieves the UUID of the peer.
+         *
+         * @return string The UUID of the peer.
+         */
+        public function getPeerUuid(): string
+        {
+            return $this->peerUuid;
+        }
+
+        /**
+         * Retrieves the contact peer address.
+         *
+         * @return string The contact peer address.
+         */
+        public function getContactPeerAddress(): string
+        {
+            return $this->contactPeerAddress;
+        }
+
+        /**
+         * Retrieves the relationship type of the contact.
+         *
+         * @return ContactRelationshipType The relationship type of the contact.
+         */
+        public function getRelationship(): ContactRelationshipType
+        {
+            return $this->relationship;
+        }
+
+        /**
+         * Retrieves the created date and time.
+         *
+         * @return DateTime The DateTime object representing when the entity was created.
+         */
+        public function getCreated(): DateTime
+        {
+            return $this->created;
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): ContactDatabaseRecord
+        {
+            return new self($data);
+        }
+
+        /**
+         * Converts the object to a standard contact record.
+         *
+         * @return Contact The standard contact record.
+         */
+        public function toStandard(): Contact
+        {
+            return new Contact([
+                'address' => $this->contactPeerAddress,
+                'relationship' => $this->relationship,
+                'added_timestamp' => $this->created->getTimestamp()
+            ]);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'uuid' => $this->uuid,
+                'peer_uuid' => $this->peerUuid,
+                'contact_peer_address' => $this->contactPeerAddress,
+                'relationship' => $this->relationship->value,
+                'created' => $this->created->format('Y-m-d H:i:s')
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Database/ContactKnownKeyRecord.php b/src/Socialbox/Objects/Database/ContactKnownKeyRecord.php
new file mode 100644
index 0000000..ca2d075
--- /dev/null
+++ b/src/Socialbox/Objects/Database/ContactKnownKeyRecord.php
@@ -0,0 +1,214 @@
+<?php
+
+    namespace Socialbox\Objects\Database;
+
+    use DateTime;
+    use InvalidArgumentException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\Standard\KnownSigningKey;
+
+    class ContactKnownKeyRecord implements SerializableInterface
+    {
+        private string $contactUuid;
+        private string $signatureUuid;
+        private string $signatureName;
+        private string $signatureKey;
+        private ?DateTime $expires;
+        private DateTime $created;
+        private DateTime $trustedOn;
+
+        /**
+         * Constructs a new instance with the provided parameters.
+         *
+         * @param array $data The array of data to use for the object.
+         * @throws \DateMalformedStringException If the date string is malformed.
+         */
+        public function __construct(array $data)
+        {
+            $this->contactUuid = $data['contact_uuid'];
+            $this->signatureUuid = $data['signature_uuid'];
+            $this->signatureName = $data['signature_name'];
+            $this->signatureKey = $data['signature_key'];
+
+            if(!isset($data['expires']))
+            {
+                $this->expires = null;
+            }
+            else
+            {
+                if(is_string($data['expires']))
+                {
+                    $this->expires = new DateTime($data['expires']);
+                }
+                elseif(is_int($data['expires']))
+                {
+                    $this->expires = (new DateTime())->setTimestamp($data['expires']);
+                }
+                elseif($data['expires'] instanceof DateTime)
+                {
+                    $this->expires = $data['expires'];
+                }
+                else
+                {
+                    throw new InvalidArgumentException('Invalid expires property, got type ' . gettype($data['expires']));
+                }
+            }
+
+            if(!isset($data['created']))
+            {
+                throw new InvalidArgumentException('Missing created property');
+            }
+            else
+            {
+                if(is_string($data['created']))
+                {
+                    $this->created = new DateTime($data['created']);
+                }
+                elseif(is_int($data['created']))
+                {
+                    $this->created = (new DateTime())->setTimestamp($data['created']);
+                }
+                elseif($data['created'] instanceof DateTime)
+                {
+                    $this->created = $data['created'];
+                }
+                else
+                {
+                    throw new InvalidArgumentException('Invalid created property, got type ' . gettype($data['created']));
+                }
+            }
+
+            if(!isset($data['trusted_on']))
+            {
+                throw new InvalidArgumentException('Missing trusted_on property');
+            }
+            else
+            {
+                if(is_string($data['trusted_on']))
+                {
+                    $this->trustedOn = new DateTime($data['trusted_on']);
+                }
+                elseif(is_int($data['trusted_on']))
+                {
+                    $this->trustedOn = (new DateTime())->setTimestamp($data['trusted_on']);
+                }
+                elseif($data['trusted_on'] instanceof DateTime)
+                {
+                    $this->trustedOn = $data['trusted_on'];
+                }
+                else
+                {
+                    throw new InvalidArgumentException('Invalid trusted_on property, got type ' . gettype($data['trusted_on']));
+                }
+            }
+        }
+
+        /**
+         * Gets the contact UUID.
+         *
+         * @return string The contact UUID.
+         */
+        public function getContactUuid(): string
+        {
+            return $this->contactUuid;
+        }
+
+        /**
+         * Gets the signature UUID.
+         *
+         * @return string The signature UUID.
+         */
+        public function getSignatureUuid(): string
+        {
+            return $this->signatureUuid;
+        }
+
+        /**
+         * Gets the signature name.
+         *
+         * @return string The signature name.
+         */
+        public function getSignatureName(): string
+        {
+            return $this->signatureName;
+        }
+
+        /**
+         * Gets the signature key.
+         *
+         * @return string The signature key.
+         */
+        public function getSignatureKey(): string
+        {
+            return $this->signatureKey;
+        }
+
+        /**
+         * Gets the expiration date.
+         *
+         * @return DateTime|null The expiration date.
+         */
+        public function getExpires(): ?DateTime
+        {
+            return $this->expires;
+        }
+
+        /**
+         * Gets the creation date.
+         *
+         * @return DateTime The creation date.
+         */
+        public function getCreated(): DateTime
+        {
+            return $this->created;
+        }
+
+        /**
+         * Gets the trusted on date.
+         *
+         * @return DateTime The trusted on date.
+         */
+        public function getTrustedOn(): DateTime
+        {
+            return $this->trustedOn;
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): ContactKnownKeyRecord
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toStandard(): KnownSigningKey
+        {
+            return new KnownSigningKey([
+                'uuid' => $this->signatureUuid,
+                'name' => $this->signatureName,
+                'public_key' => $this->signatureKey,
+                'expires' => $this->expires?->getTimestamp(),
+                'created' => $this->created->getTimestamp(),
+                'trusted_on' => $this->trustedOn->getTimestamp()
+            ]);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'contact_uuid' => $this->contactUuid,
+                'signature_uuid' => $this->signatureUuid,
+                'signature_name' => $this->signatureName,
+                'signature_key' => $this->signatureKey,
+                'expires' => $this->expires?->getTimestamp(),
+                'created' => $this->created->getTimestamp(),
+                'trusted_on' => $this->trustedOn->getTimestamp()
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Database/EncryptionChannelMessageRecord.php b/src/Socialbox/Objects/Database/EncryptionChannelMessageRecord.php
new file mode 100644
index 0000000..0949ec0
--- /dev/null
+++ b/src/Socialbox/Objects/Database/EncryptionChannelMessageRecord.php
@@ -0,0 +1,205 @@
+<?php
+
+    namespace Socialbox\Objects\Database;
+
+    use DateMalformedStringException;
+    use DateTime;
+    use InvalidArgumentException;
+    use Socialbox\Enums\Status\EncryptionChannelMessageStatus;
+    use Socialbox\Enums\Types\EncryptionMessageRecipient;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\PeerAddress;
+    use Socialbox\Objects\Standard\EncryptionChannelMessage;
+
+    class EncryptionChannelMessageRecord implements SerializableInterface
+    {
+        private string $uuid;
+        private string $channelUuid;
+        private EncryptionMessageRecipient $recipient;
+        private EncryptionChannelMessageStatus $status;
+        private string $hash;
+        private string $data;
+        private DateTime $timestamp;
+
+        /**
+         * Constructs the Channel
+         *
+         * @param array $data
+         */
+        public function __construct(array $data)
+        {
+            $this->uuid = $data['uuid'];
+            $this->channelUuid = $data['channel_uuid'];
+            $this->recipient = EncryptionMessageRecipient::from($data['recipient']);
+            $this->status = EncryptionChannelMessageStatus::from($data['status']);
+            $this->hash = $data['hash'];
+            $this->data = $data['data'];
+
+            if($data['timestamp'] instanceof DateTime)
+            {
+                $this->timestamp = $data['timestamp'];
+            }
+            elseif(is_int($data['timestamp']))
+            {
+                $this->timestamp = (new DateTime())->setTimestamp($data['timestamp']);
+            }
+            elseif(is_string($data['timestamp']))
+            {
+                try
+                {
+                    $this->timestamp = new DateTime($data['timestamp']);
+                }
+                catch (DateMalformedStringException $e)
+                {
+                    throw new InvalidArgumentException('Invalid DateTime format for timestamp, got: ' . $data['timestamp'], $e->getCode(), $e);
+                }
+            }
+            else
+            {
+                throw new InvalidArgumentException('Invalid timestamp type, got: ' . gettype($data['timestamp']));
+            }
+        }
+
+        /**
+         * Returns the Unique Universal Identifier for the message
+         *
+         * @return string The Message's Unique Universal Identifier
+         */
+        public function getUuid(): string
+        {
+            return $this->uuid;
+        }
+
+        /**
+         * Returns the Unique Universal Identifier of the channel that this message belongs to
+         *
+         * @return string The Channel's Unique Universal Identifier
+         */
+        public function getChannelUuid(): string
+        {
+            return $this->channelUuid;
+        }
+
+        /**
+         * Returns the recipient of the message
+         *
+         * @return EncryptionMessageRecipient The recipient of the message
+         */
+        public function getRecipient(): EncryptionMessageRecipient
+        {
+            return $this->recipient;
+        }
+
+        /**
+         * Returns the status of the message
+         *
+         * @return EncryptionChannelMessageStatus The status of the message
+         */
+        public function getStatus(): EncryptionChannelMessageStatus
+        {
+            return $this->status;
+        }
+
+        /**
+         * Returns the SHA512 hash of the decrypted content
+         *
+         * @return string The SHA512 hash of the decrypted content
+         */
+        public function getHash(): string
+        {
+            return $this->hash;
+        }
+
+        /**
+         * Returns the encrypted content of the message
+         *
+         * @return string The encrypted content of the message
+         */
+        public function getData(): string
+        {
+            return $this->data;
+        }
+
+        /**
+         * Returns the Timestamp for when this message was created
+         *
+         * @return DateTime The Timestamp for when the message was created
+         */
+        public function getTimestamp(): DateTime
+        {
+            return $this->timestamp;
+        }
+
+        /**
+         * Returns the owner of the message
+         *
+         * @param EncryptionChannelRecord $channelRecord The channel record to use
+         * @return PeerAddress The owner of the message
+         */
+        public function getOwner(EncryptionChannelRecord $channelRecord): PeerAddress
+        {
+            if($this->recipient === EncryptionMessageRecipient::SENDER)
+            {
+                return $channelRecord->getCallingPeerAddress();
+            }
+
+            return $channelRecord->getReceivingPeerAddress();
+        }
+
+        /**
+         * Returns the receiver of the message
+         *
+         * @param EncryptionChannelRecord $channelRecord The channel record to use
+         * @return PeerAddress The receiver of the message
+         */
+        public function getReceiver(EncryptionChannelRecord $channelRecord): PeerAddress
+        {
+            if($this->recipient === EncryptionMessageRecipient::SENDER)
+            {
+                return $channelRecord->getReceivingPeerAddress();
+            }
+
+            return $channelRecord->getCallingPeerAddress();
+        }
+
+        /**
+         * Converts the record to a standard message
+         *
+         * @return EncryptionChannelMessage The standard message
+         */
+        public function toStandard(): EncryptionChannelMessage
+        {
+            return new EncryptionChannelMessage([
+                'message_uuid' => $this->uuid,
+                'channel_uuid' => $this->channelUuid,
+                'status' => $this->status->value,
+                'hash' => $this->hash,
+                'data' => $this->data,
+                'timestamp' => $this->timestamp->getTimestamp()
+            ]);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): EncryptionChannelMessageRecord
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'uuid' => $this->uuid,
+                'channel_uuid' => $this->channelUuid,
+                'recipient' => $this->recipient->value,
+                'status' => $this->status->value,
+                'hash' => $this->hash,
+                'data' => $this->data,
+                'timestamp' => $this->timestamp->getTimestamp()
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Database/EncryptionChannelRecord.php b/src/Socialbox/Objects/Database/EncryptionChannelRecord.php
new file mode 100644
index 0000000..5406cc3
--- /dev/null
+++ b/src/Socialbox/Objects/Database/EncryptionChannelRecord.php
@@ -0,0 +1,282 @@
+<?php
+
+    namespace Socialbox\Objects\Database;
+
+    use DateMalformedStringException;
+    use DateTime;
+    use InvalidArgumentException;
+    use Socialbox\Enums\Status\EncryptionChannelStatus;
+    use Socialbox\Enums\Types\EncryptionMessageRecipient;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\PeerAddress;
+    use Socialbox\Objects\Standard\EncryptionChannel;
+    use Socialbox\Objects\Standard\Peer;
+
+    class EncryptionChannelRecord implements SerializableInterface
+    {
+        private string $uuid;
+        private EncryptionChannelStatus $status;
+        private PeerAddress $callingPeerAddress;
+        private string $callingPublicEncryptionKey;
+        private PeerAddress $receivingPeerAddress;
+        private ?string $receivingPublicEncryptionKey;
+        private DateTime $created;
+
+        /**
+         * Constructs the Encryption Channel Record from an array representation of the object, requires the following
+         * fields:
+         *  - uuid
+         *  - status
+         *  - calling_peer_address
+         *  - calling_public_encryption_key
+         *  - receiving_peer_address
+         *  - created
+         * The only optional field is `receiving_public_encryption_key`
+         *
+         * @param array $data
+         */
+        public function __construct(array $data)
+        {
+            $this->uuid = $data['uuid'];
+            $this->status = EncryptionChannelStatus::from($data['status']);
+            $this->callingPeerAddress = PeerAddress::fromAddress($data['calling_peer_address']);
+            $this->callingPublicEncryptionKey = $data['calling_public_encryption_key'];
+            $this->receivingPeerAddress = PeerAddress::fromAddress($data['receiving_peer_address']);
+            $this->receivingPublicEncryptionKey = $data['receiving_public_encryption_key'] ?? null;
+
+            if($data['created'] instanceof DateTime)
+            {
+                $this->created = $data['created'];
+            }
+            elseif(is_int($data['created']))
+            {
+                $this->created = (new DateTime())->setTimestamp($data['created']);
+            }
+            elseif(is_string($data['created']))
+            {
+                try
+                {
+                    $this->created = new DateTime($data['created']);
+                }
+                catch (DateMalformedStringException $e)
+                {
+                    throw new InvalidArgumentException('Invalid DateTime given in created, got: ' . $data['created'], $e->getCode(), $e);
+                }
+            }
+            else
+            {
+                throw new InvalidArgumentException('Invalid created type, got: ' . gettype($data['created']));
+            }
+        }
+
+        /**
+         * Returns the Universal Unique Identifier of the encryption channel record
+         *
+         * @return string The UUID V4
+         */
+        public function getUuid(): string
+        {
+            return $this->uuid;
+        }
+
+        /**
+         * Returns the current status of the encryption channel record
+         *
+         * @return EncryptionChannelStatus The current status of the encryption channel record
+         */
+        public function getStatus(): EncryptionChannelStatus
+        {
+            return $this->status;
+        }
+
+        /**
+         * Returns the PeerAddress of the calling peer for the encryption channel record
+         *
+         * @return PeerAddress The address of the calling peer
+         */
+        public function getCallingPeerAddress(): PeerAddress
+        {
+            return $this->callingPeerAddress;
+        }
+
+        /**
+         * Returns the public encryption key of the calling peer
+         *
+         * @return string The public encryption key of the caller
+         */
+        public function getCallingPublicEncryptionKey(): string
+        {
+            return $this->callingPublicEncryptionKey;
+        }
+
+        /**
+         * Returns the PeerAddress of the receiving peer for the encryption channel record
+         *
+         * @return PeerAddress
+         */
+        public function getReceivingPeerAddress(): PeerAddress
+        {
+            return $this->receivingPeerAddress;
+        }
+
+        /**
+         * Returns the public encryption key of the receiving peer
+         *
+         * @return string|null The public encryption key of the receiver
+         */
+        public function getReceivingPublicEncryptionKey(): ?string
+        {
+            return $this->receivingPublicEncryptionKey;
+        }
+
+        /**
+         * The DateTime object of when the record was created
+         *
+         * @return DateTime The DateTime object of the record's creation date
+         */
+        public function getCreated(): DateTime
+        {
+            return $this->created;
+        }
+
+        /**
+         * Checks if the given peer address is a participant in the encryption channel
+         *
+         * @param string|PeerAddress $peerAddress The peer address to check
+         * @return bool True if the peer address is a participant in the encryption channel
+         */
+        public function isParticipant(string|PeerAddress $peerAddress): bool
+        {
+            if($peerAddress instanceof PeerAddress)
+            {
+                $peerAddress = $peerAddress->getAddress();
+            }
+
+            return $this->callingPeerAddress->getAddress() === $peerAddress || $this->receivingPeerAddress->getAddress() === $peerAddress;
+        }
+
+        /**
+         * Returns the external peer address of the encryption channel
+         *
+         * @return PeerAddress|null The external peer address of the encryption channel, or null if there is none
+         */
+        public function getExternalPeer(): ?PeerAddress
+        {
+            if($this->callingPeerAddress->isExternal())
+            {
+                return $this->callingPeerAddress;
+            }
+
+            if($this->receivingPeerAddress->isExternal())
+            {
+                return $this->receivingPeerAddress;
+            }
+
+            return null;
+        }
+
+        /**
+         * Determines the recipient of the encryption message based on the requester
+         *
+         * @param string|PeerAddress $requester The requester of the message
+         * @return EncryptionMessageRecipient|null The recipient of the message, or null if the requester is not a participant
+         */
+        public function determineRecipient(string|PeerAddress $requester, bool $reverse=false): ?EncryptionMessageRecipient
+        {
+            if($requester instanceof PeerAddress)
+            {
+                $requester = $requester->getAddress();
+            }
+
+            if($reverse)
+            {
+                if($this->callingPeerAddress->getAddress() === $requester)
+                {
+                    return EncryptionMessageRecipient::SENDER;
+                }
+                elseif($this->receivingPeerAddress->getAddress() === $requester)
+                {
+                    return EncryptionMessageRecipient::RECEIVER;
+                }
+
+                return null;
+            }
+
+            if($this->callingPeerAddress->getAddress() === $requester)
+            {
+                return EncryptionMessageRecipient::RECEIVER;
+            }
+            elseif($this->receivingPeerAddress->getAddress() === $requester)
+            {
+                return EncryptionMessageRecipient::SENDER;
+            }
+
+            return null;
+        }
+
+        /**
+         * Determines the receiver of the encryption message based on the sender
+         *
+         * @param string|PeerAddress $sender The sender of the message
+         * @return PeerAddress|null The receiver of the message, or null if the sender is not a participant
+         */
+        public function  determineReceiver(string|PeerAddress $sender): ?PeerAddress
+        {
+            if($sender instanceof PeerAddress)
+            {
+                $sender = $sender->getAddress();
+            }
+
+            if($this->callingPeerAddress->getAddress() === $sender)
+            {
+                return $this->receivingPeerAddress;
+            }
+            elseif($this->receivingPeerAddress->getAddress() === $sender)
+            {
+                return $this->callingPeerAddress;
+            }
+
+            return null;
+        }
+
+        /**
+         * Returns a standard representation object representation of this internal database object
+         *
+         * @return EncryptionChannel
+         */
+        public function toStandard(): EncryptionChannel
+        {
+            return new EncryptionChannel([
+                'uuid' => $this->uuid,
+                'status' => $this->status->value,
+                'calling_peer' => $this->callingPeerAddress->getAddress(),
+                'calling_public_encryption_key' => $this->callingPublicEncryptionKey,
+                'receiving_peer' => $this->receivingPeerAddress->getAddress(),
+                'receiving_public_encryption_key' => $this->receivingPublicEncryptionKey,
+                'created' => $this->created
+            ]);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): EncryptionChannelRecord
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'uuid' => $this->uuid,
+                'status' => $this->status->value,
+                'calling_peer_address' => $this->callingPeerAddress->getAddress(),
+                'calling_public_encryption_key' => $this->callingPublicEncryptionKey,
+                'receiving_peer_address' => $this->receivingPeerAddress->getAddress(),
+                'created' => $this->created->getTimestamp()
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Database/PeerDatabaseRecord.php b/src/Socialbox/Objects/Database/PeerDatabaseRecord.php
new file mode 100644
index 0000000..97c61fa
--- /dev/null
+++ b/src/Socialbox/Objects/Database/PeerDatabaseRecord.php
@@ -0,0 +1,237 @@
+<?php
+
+    namespace Socialbox\Objects\Database;
+
+    use DateTime;
+    use InvalidArgumentException;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Enums\Flags\PeerFlags;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\Standard\InformationFieldState;
+    use Socialbox\Objects\Standard\Peer;
+
+    class PeerDatabaseRecord implements SerializableInterface
+    {
+        private string $uuid;
+        private string $username;
+        private string $server;
+        /**
+         * @var PeerFlags[]
+         */
+        private ?array $flags;
+        private bool $enabled;
+        private DateTime $created;
+        private DateTime $updated;
+
+        /**
+         * Constructor for initializing class properties from provided data.
+         *
+         * @param array $data Array containing initialization data.
+         */
+        public function __construct(array $data)
+        {
+            $this->uuid = $data['uuid'];
+            $this->username = $data['username'];
+            $this->server = $data['server'];
+
+            if($data['flags'])
+            {
+                $this->flags = PeerFlags::fromString($data['flags']);
+            }
+            else
+            {
+                $this->flags = [];
+            }
+
+            $this->enabled = $data['enabled'];
+
+            if(!isset($data['created']))
+            {
+                $this->created = new DateTime();
+            }
+            elseif(is_int($data['created']))
+            {
+                $this->created = (new DateTime())->setTimestamp($data['created']);
+            }
+            elseif(is_string($data['created']))
+            {
+                $this->created = new DateTime($data['created']);
+            }
+            else
+            {
+                throw new InvalidArgumentException("The created field must be a valid timestamp or date string.");
+            }
+
+            if(!isset($data['updated']))
+            {
+                $this->updated = new DateTime();
+            }
+            elseif(is_int($data['updated']))
+            {
+                $this->updated = (new DateTime())->setTimestamp($data['updated']);
+            }
+            elseif(is_string($data['updated']))
+            {
+                $this->updated = new DateTime($data['updated']);
+            }
+            else
+            {
+                throw new InvalidArgumentException("The updated field must be a valid timestamp or date string.");
+            }
+        }
+
+        /**
+         * Retrieves the UUID of the current instance.
+         *
+         * @return string The UUID.
+         */
+        public function getUuid(): string
+        {
+            return $this->uuid;
+        }
+
+        /**
+         * Retrieves the username.
+         *
+         * @return string The username.
+         */
+        public function getUsername(): string
+        {
+            return $this->username;
+        }
+
+        /**
+         * Retrieves the server.
+         *
+         * @return string The server.
+         */
+        public function getServer(): string
+        {
+            return $this->server;
+        }
+
+        /**
+         * Constructs and retrieves the peer address using the current instance's username and the domain from the configuration.
+         *
+         * @return string The constructed peer address.
+         */
+        public function getAddress(): string
+        {
+            return sprintf("%s@%s", $this->username, Configuration::getInstanceConfiguration()->getDomain());
+        }
+
+        /**
+         * Retrieves the flags.
+         *
+         * @return PeerFlags[] The flags.
+         */
+        public function getFlags(): array
+        {
+            return $this->flags;
+        }
+
+        /**
+         * Adds a flag to the current instance.
+         *
+         * @param PeerFlags $flag The flag to add.
+         */
+        public function flagExists(PeerFlags $flag): bool
+        {
+            return in_array($flag, $this->flags, true);
+        }
+
+        /**
+         * Adds a flag to the current instance.
+         *
+         * @param PeerFlags $flag The flag to add.
+         */
+        public function removeFlag(PeerFlags $flag): void
+        {
+            $key = array_search($flag, $this->flags, true);
+            if($key !== false)
+            {
+                unset($this->flags[$key]);
+            }
+        }
+
+        /**
+         * Checks if the current instance is enabled.
+         *
+         * @return bool True if enabled, false otherwise.
+         */
+        public function isEnabled(): bool
+        {
+            return $this->enabled;
+        }
+
+        /**
+         * Retrieves the creation date and time.
+         *
+         * @return DateTime The creation date and time.
+         */
+        public function getCreated(): DateTime
+        {
+            return $this->created;
+        }
+
+        /**
+         * Retrieves the last update date and time.
+         *
+         * @return DateTime The last update date and time.
+         */
+        public function getUpdated(): DateTime
+        {
+            return $this->updated;
+        }
+
+        /**
+         * Determines if the user is considered external by checking if the username is 'host' and the server
+         * is not the same as the domain from the configuration.
+         *
+         * @return bool True if the user is external, false otherwise.
+         */
+        public function isExternal(): bool
+        {
+            return $this->username === 'host' || $this->server !== Configuration::getInstanceConfiguration()->getDomain();
+        }
+
+        /**
+         * Converts the current instance to a Peer object.
+         *
+         * @param PeerInformationFieldRecord[]|InformationFieldState[]|array $informationFields 
+         * @return Peer The Peer representation of the current instance.
+         */
+        public function toStandardPeer(array $informationFields): Peer
+        {
+            return Peer::fromArray([
+                'address' => $this->getAddress(),
+                'information_fields' => $informationFields,
+                'flags' => array_map(fn(PeerFlags $flag) => $flag->value, $this->flags),
+                'registered' => $this->created->getTimestamp()
+            ]);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): object
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'uuid' => $this->uuid,
+                'username' => $this->username,
+                'server' => $this->server,
+                'flags' => PeerFlags::toString($this->flags),
+                'enabled' => $this->enabled,
+                'created' => $this->created,
+                'updated' => $this->updated
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Database/PeerInformationFieldRecord.php b/src/Socialbox/Objects/Database/PeerInformationFieldRecord.php
new file mode 100644
index 0000000..2647476
--- /dev/null
+++ b/src/Socialbox/Objects/Database/PeerInformationFieldRecord.php
@@ -0,0 +1,105 @@
+<?php
+
+    namespace Socialbox\Objects\Database;
+
+    use Socialbox\Enums\PrivacyState;
+    use Socialbox\Enums\Types\InformationFieldName;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\Standard\InformationField;
+    use Socialbox\Objects\Standard\InformationFieldState;
+
+    class PeerInformationFieldRecord implements SerializableInterface
+    {
+        private string $peerUuid;
+        private InformationFieldName $propertyName;
+        private string $propertyValue;
+        private PrivacyState $privacyState;
+
+        public function __construct(array $data)
+        {
+            $this->peerUuid = $data['peer_uuid'];
+            $this->propertyName = InformationFieldName::from($data['property_name']);
+            $this->propertyValue = $data['property_value'];
+            $this->privacyState = PrivacyState::from($data['privacy_state']);
+        }
+
+        /**
+         * @return string
+         */
+        public function getPeerUuid(): string
+        {
+            return $this->peerUuid;
+        }
+
+        /**
+         * @return InformationFieldName
+         */
+        public function getPropertyName(): InformationFieldName
+        {
+            return $this->propertyName;
+        }
+
+        /**
+         * @return string
+         */
+        public function getPropertyValue(): string
+        {
+            return $this->propertyValue;
+        }
+
+        /**
+         * @return PrivacyState
+         */
+        public function getPrivacyState(): PrivacyState
+        {
+            return $this->privacyState;
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): PeerInformationFieldRecord
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'peer_uuid' => $this->peerUuid,
+                'property_name' => $this->propertyName->value,
+                'property_value' => $this->propertyValue,
+                'privacy_state' => $this->privacyState->value
+            ];
+        }
+
+        /**
+         * Converts the record to a standard InformationField object
+         *
+         * @return InformationField
+         */
+        public function toInformationField(): InformationField
+        {
+            return new InformationField([
+                'name' => $this->propertyName->value,
+                'value' => $this->propertyValue
+            ]);
+        }
+
+        /**
+         * Converts the record to a standard InformationFieldState object
+         *
+         * @return InformationFieldState
+         */
+        public function toInformationFieldState(): InformationFieldState
+        {
+            return new InformationFieldState([
+                'name' => $this->propertyName->value,
+                'value' => $this->propertyValue,
+                'privacy_state' => $this->privacyState->value
+            ]);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Database/ResolvedServerRecord.php b/src/Socialbox/Objects/Database/ResolvedServerRecord.php
new file mode 100644
index 0000000..5488c87
--- /dev/null
+++ b/src/Socialbox/Objects/Database/ResolvedServerRecord.php
@@ -0,0 +1,144 @@
+<?php
+
+    namespace Socialbox\Objects\Database;
+
+    use DateTime;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\DnsRecord;
+
+    class ResolvedServerRecord implements SerializableInterface
+    {
+        private string $domain;
+        private string $endpoint;
+        private string $publicKey;
+        private DateTime $expires;
+        private DateTime $updated;
+
+        /**
+         * Constructs a new instance of the class.
+         *
+         * @param array $data An associative array containing the domain, endpoint, public_key, and updated values.
+         * @throws \DateMalformedStringException
+         */
+        public function __construct(array $data)
+        {
+            $this->domain = (string)$data['domain'];
+            $this->endpoint = (string)$data['endpoint'];
+            $this->publicKey = (string)$data['public_key'];
+
+            if(is_null($data['expires']))
+            {
+                $this->expires = new DateTime();
+            }
+            elseif (is_int($data['expires']))
+            {
+                $this->expires = (new DateTime())->setTimestamp($data['expires']);
+            }
+            elseif (is_string($data['expires']))
+            {
+                $this->expires = new DateTime($data['expires']);
+            }
+            else
+            {
+                $this->expires = $data['expires'];
+            }
+
+            if(is_null($data['updated']))
+            {
+                $this->updated = new DateTime();
+            }
+            elseif (is_int($data['updated']))
+            {
+                $this->updated = (new DateTime())->setTimestamp($data['updated']);
+            }
+            elseif (is_string($data['updated']))
+            {
+                $this->updated = new DateTime($data['updated']);
+            }
+            else
+            {
+                $this->updated = $data['updated'];
+            }
+        }
+
+        /**
+         * Retrieves the domain value.
+         *
+         * @return string The domain as a string.
+         */
+        public function getDomain(): string
+        {
+            return $this->domain;
+        }
+
+        /**
+         * Retrieves the configured endpoint.
+         *
+         * @return string The endpoint as a string.
+         */
+        public function getEndpoint(): string
+        {
+            return $this->endpoint;
+        }
+
+        /**
+         * Retrieves the public key.
+         *
+         * @return string The public key as a string.
+         */
+        public function getPublicKey(): string
+        {
+            return $this->publicKey;
+        }
+
+        /**
+         * Retrieves the expiration timestamp.
+         *
+         * @return DateTime The DateTime object representing the expiration time.
+         */
+        public function getExpires(): DateTime
+        {
+            return $this->expires;
+        }
+
+        /**
+         * Retrieves the timestamp of the last update.
+         *
+         * @return DateTime The DateTime object representing the last update time.
+         */
+        public function getUpdated(): DateTime
+        {
+            return $this->updated;
+        }
+
+        /**
+         * Fetches the DNS record based on the provided endpoint, public key, and expiration time.
+         *
+         * @return DnsRecord An instance of the DnsRecord containing the endpoint, public key, and expiration timestamp.
+         */
+        public function getDnsRecord(): DnsRecord
+        {
+            return new DnsRecord($this->endpoint, $this->publicKey, $this->expires->getTimestamp());
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): object
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'domain' => $this->domain,
+                'endpoint' => $this->endpoint,
+                'public_key' => $this->publicKey,
+                'updated' => $this->updated->format('Y-m-d H:i:s')
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Database/SessionRecord.php b/src/Socialbox/Objects/Database/SessionRecord.php
new file mode 100644
index 0000000..1315f62
--- /dev/null
+++ b/src/Socialbox/Objects/Database/SessionRecord.php
@@ -0,0 +1,326 @@
+<?php
+
+    namespace Socialbox\Objects\Database;
+
+    use DateTime;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Enums\Flags\SessionFlags;
+    use Socialbox\Enums\SessionState;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\RegisteredPeerManager;
+
+    class SessionRecord implements SerializableInterface
+    {
+        private string $uuid;
+        private ?string $peerUuid;
+        private string $clientName;
+        private string $clientVersion;
+        private bool $authenticated;
+        private string $clientPublicSigningKey;
+        public string $clientPublicEncryptionKey;
+        private string $serverPublicEncryptionKey;
+        private string $serverPrivateEncryptionKey;
+        private ?string $clientTransportEncryptionKey;
+        private ?string $serverTransportEncryptionKey;
+        private SessionState $state;
+        /**
+         * @var SessionFlags[]
+         */
+        private array $flags;
+        private DateTime $created;
+        private ?DateTime $lastRequest;
+
+        /**
+         * Constructs a new instance using the provided data array.
+         *
+         * @param array $data An associative array containing the initialization data,
+         *                    which should include keys such as 'uuid', 'peer_uuid',
+         *                    'authenticated', 'public_key', 'created', 'last_request',
+         *                    'flags', and 'state'.
+         *
+         * @return void
+         */
+        public function __construct(array $data)
+        {
+            $this->uuid = $data['uuid'];
+            $this->peerUuid = $data['peer_uuid'] ?? null;
+            $this->clientName = $data['client_name'];
+            $this->clientVersion = $data['client_version'];
+            $this->authenticated = $data['authenticated'] ?? false;
+            $this->clientPublicSigningKey = $data['client_public_signing_key'];
+            $this->clientPublicEncryptionKey = $data['client_public_encryption_key'];
+            $this->serverPublicEncryptionKey = $data['server_public_encryption_key'];
+            $this->serverPrivateEncryptionKey = $data['server_private_encryption_key'];
+            $this->clientTransportEncryptionKey = $data['client_transport_encryption_key'] ?? null;
+            $this->serverTransportEncryptionKey = $data['server_transport_encryption_key'] ?? null;
+            $this->created = $data['created'];
+            $this->lastRequest = $data['last_request'];
+            $this->flags = SessionFlags::fromString($data['flags']);
+
+            if(SessionState::tryFrom($data['state']) == null)
+            {
+                $this->state = SessionState::CLOSED;
+            }
+            else
+            {
+                $this->state = SessionState::from($data['state']);
+            }
+
+        }
+
+        /**
+         * Retrieves the UUID.
+         *
+         * @return string The UUID of the object.
+         */
+        public function getUuid(): string
+        {
+            return $this->uuid;
+        }
+
+        /**
+         * Retrieves the UUID of the peer.
+         *
+         * @return string|null The UUID of the peer or null if not set.
+         */
+        public function getPeerUuid(): ?string
+        {
+            return $this->peerUuid;
+        }
+
+        /**
+         * Checks whether the user is authenticated.
+         *
+         * @return bool Returns true if the user is authenticated; otherwise, false.
+         */
+        public function isAuthenticated(): bool
+        {
+            if($this->peerUuid === null)
+            {
+                return false;
+            }
+
+            return $this->authenticated;
+        }
+
+        /**
+         * Retrieves the public key associated with the instance.
+         *
+         * @return string Returns the public key as a string.
+         */
+        public function getClientPublicSigningKey(): string
+        {
+            return $this->clientPublicSigningKey;
+        }
+
+        /**
+         * Retrieves the encryption key associated with the instance.
+         *
+         * @return string|null Returns the encryption key as a string, or null if not set.
+         */
+        public function getClientPublicEncryptionKey(): ?string
+        {
+            return $this->clientPublicEncryptionKey;
+        }
+
+        /**
+         * @return string
+         */
+        public function getServerPublicEncryptionKey(): string
+        {
+            return $this->serverPublicEncryptionKey;
+        }
+
+        /**
+         * @return string
+         */
+        public function getServerPrivateEncryptionKey(): string
+        {
+            return $this->serverPrivateEncryptionKey;
+        }
+
+        /**
+         * Retrieves the client encryption key associated with the instance.
+         *
+         * @return string|null Returns the client encryption key as a string, or null if not set.
+         */
+        public function getClientTransportEncryptionKey(): ?string
+        {
+            return $this->clientTransportEncryptionKey;
+        }
+
+        /**
+         * Retrieves the server encryption key associated with the instance.
+         *
+         * @return string|null Returns the server encryption key as a string, or null if not set.
+         */
+        public function getServerTransportEncryptionKey(): ?string
+        {
+            return $this->serverTransportEncryptionKey;
+        }
+
+        /**
+         * Retrieves the current session state.
+         *
+         * @return SessionState Returns the current state of the session.
+         */
+        public function getState(): SessionState
+        {
+            $expires = time() + Configuration::getPoliciesConfiguration()->getSessionInactivityExpires();
+            if($this->lastRequest !== null && $this->lastRequest->getTimestamp() > $expires)
+            {
+                return SessionState::EXPIRED;
+            }
+
+            return $this->state;
+        }
+
+        /**
+         * Retrieves the creation date and time of the object.
+         *
+         * @return DateTime Returns a DateTime object representing when the object was created.
+         */
+        public function getCreated(): DateTime
+        {
+            return $this->created;
+        }
+
+        /**
+         * @return DateTime
+         */
+        public function getExpires(): DateTime
+        {
+            return new DateTime('@' . time() + Configuration::getPoliciesConfiguration()->getSessionInactivityExpires());
+        }
+
+        /**
+         * Retrieves the flags associated with the session.
+         *
+         * @param bool $asString Determines whether the flags should be returned as strings.
+         * @return array An array of session flags, either as objects or strings depending on the $asString parameter.
+         */
+        public function getFlags(bool $asString=false): array
+        {
+            if($asString)
+            {
+                return array_map(fn(SessionFlags $flag) => $flag->value, $this->flags);
+            }
+
+            return $this->flags;
+        }
+
+        /**
+         * Checks if a given flag exists in the list of session flags.
+         *
+         * @param string|SessionFlags|array $flag The flag to check, either as a string or a SessionFlags object. If an array is provided, all flags must exist.
+         * @return bool True if the flag exists, false otherwise.
+         */
+        public function flagExists(string|SessionFlags|array $flag): bool
+        {
+            if(is_array($flag))
+            {
+                foreach($flag as $f)
+                {
+                    if(!$this->flagExists($f))
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            if(is_string($flag))
+            {
+                $flag = SessionFlags::tryFrom($flag);
+                if($flag === null)
+                {
+                    return false;
+                }
+            }
+
+            return in_array($flag, $this->flags);
+        }
+
+        /**
+         * Retrieves the timestamp of the last request made.
+         *
+         * @return DateTime|null The DateTime object representing the last request time, or null if no request has been made.
+         */
+        public function getLastRequest(): ?DateTime
+        {
+            return $this->lastRequest;
+        }
+
+        /**
+         * Retrieves the client name.
+         *
+         * @return string Returns the client name.
+         */
+        public function getClientName(): string
+        {
+            return $this->clientName;
+        }
+
+        /**
+         * Retrieves the client version.
+         *
+         * @return string Returns the client version.
+         */
+        public function getClientVersion(): string
+        {
+            return $this->clientVersion;
+        }
+
+        /**
+         * Returns whether the session is external.
+         *
+         * @return bool True if the session is external, false otherwise.
+         * @throws DatabaseOperationException Thrown if the peer record cannot be retrieved.
+         */
+        public function isExternal(): bool
+        {
+            return RegisteredPeerManager::getPeer($this->peerUuid)->isExternal();
+        }
+
+        /**
+         * Converts the current session state into a standard session state object.
+         *
+         * @return \Socialbox\Objects\Standard\SessionState The standardized session state object.
+         */
+        public function toStandardSessionState(): \Socialbox\Objects\Standard\SessionState
+        {
+            return \Socialbox\Objects\Standard\SessionState::fromSessionRecord($this);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): object
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'uuid' => $this->uuid,
+                'peer_uuid' => $this->peerUuid,
+                'authenticated' => $this->authenticated,
+                'client_public_signing_key' => $this->clientPublicSigningKey,
+                'client_public_encryption_key' => $this->clientPublicEncryptionKey,
+                'server_public_encryption_key' => $this->serverPublicEncryptionKey,
+                'server_private_encryption_key' => $this->serverPrivateEncryptionKey,
+                'client_transport_encryption_key' => $this->clientTransportEncryptionKey,
+                'server_transport_encryption_key' => $this->serverTransportEncryptionKey,
+                'state' => $this->state->value,
+                'flags' => SessionFlags::toString($this->flags),
+                'created' => $this->created,
+                'last_request' => $this->lastRequest,
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Database/SigningKeyRecord.php b/src/Socialbox/Objects/Database/SigningKeyRecord.php
new file mode 100644
index 0000000..c3f100d
--- /dev/null
+++ b/src/Socialbox/Objects/Database/SigningKeyRecord.php
@@ -0,0 +1,197 @@
+<?php
+
+    namespace Socialbox\Objects\Database;
+
+    use DateTime;
+    use InvalidArgumentException;
+    use Socialbox\Enums\SigningKeyState;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\Standard\Signature;
+
+    class SigningKeyRecord implements SerializableInterface
+    {
+        private string $peerUuid;
+        private string $uuid;
+        private string $name;
+        private string $publicKey;
+        private SigningKeyState $state;
+        private int $expires;
+        private int $created;
+
+        /**
+         * Constructs a new instance of this class and initializes its properties with the provided data.
+         *
+         * @param array $data An associative array containing initialization data. Expected keys:
+         *                    - 'peer_uuid' (string): The peer UUID.
+         *                    - 'uuid' (string): The unique identifier.
+         *                    - 'name' (string|null): The name, which is optional.
+         *                    - 'public_key' (string): The associated public key.
+         *                    - 'state' (string|null): The state, which will be cast to a SigningKeyState instance.
+         *                    - 'expires' (int|DateTime): The expiration time as a timestamp or DateTime object.
+         *                    - 'created' (int|DateTime): The creation time as a timestamp or DateTime object.
+         * @return void
+         */
+        public function __construct(array $data)
+        {
+            $this->peerUuid = $data['peer_uuid'];
+            $this->uuid = $data['uuid'];
+            $this->name = $data['name'];
+            $this->publicKey = $data['public_key'];
+            $this->state = SigningKeyState::tryFrom($data['state']);
+
+            if(is_int($data['expires']))
+            {
+                $this->expires = $data['expires'];
+            }
+            elseif($data['expires'] instanceof DateTime)
+            {
+                $this->expires = $data['expires']->getTimestamp();
+            }
+            elseif(is_string($data['expires']))
+            {
+                if(empty($data['expires']))
+                {
+                    $this->expires = 0;
+                }
+                else
+                {
+                    $this->expires = strtotime($data['expires']);
+                }
+            }
+            elseif($data['expires'] === null)
+            {
+                $this->expires = 0;
+            }
+            else
+            {
+                throw new InvalidArgumentException('Invalid expires value, got type: ' . gettype($data['expires']));
+            }
+
+            if(is_int($data['created']))
+            {
+                $this->created = $data['created'];
+            }
+            elseif($data['created'] instanceof DateTime)
+            {
+                $this->created = $data['created']->getTimestamp();
+            }
+            elseif(is_string($data['created']))
+            {
+                if(empty($data['created']))
+                {
+                    $this->created = 0;
+                }
+                else
+                {
+                    $this->created = strtotime($data['created']);
+                }
+            }
+            else
+            {
+                throw new InvalidArgumentException('Invalid created value type, got ' . gettype($data['created']));
+            }
+        }
+
+        /**
+         * Retrieves the UUID of the peer.
+         *
+         * @return string The UUID of the peer.
+         */
+        public function getPeerUuid(): string
+        {
+            return $this->peerUuid;
+        }
+
+        /**
+         * Retrieves the UUID associated with this instance.
+         *
+         * @return string The UUID as a string.
+         */
+        public function getUuid(): string
+        {
+            return $this->uuid;
+        }
+
+        /**
+         * Retrieves the name.
+         *
+         * @return string The name, or null if not set.
+         */
+        public function getName(): string
+        {
+            return $this->name;
+        }
+
+        /**
+         * Retrieves the public key.
+         *
+         * @return string The public key.
+         */
+        public function getPublicKey(): string
+        {
+            return $this->publicKey;
+        }
+
+        /**
+         * Retrieves the current state of the signing key.
+         *
+         * @return SigningKeyState The state of the signing key.
+         */
+        public function getState(): SigningKeyState
+        {
+            return $this->state;
+        }
+
+        /**
+         * Retrieves the expiration timestamp.
+         *
+         * @return int The expiration timestamp as an integer.
+         */
+        public function getExpires(): int
+        {
+            return $this->expires;
+        }
+
+        /**
+         *
+         * @return int Returns the created timestamp as an integer.
+         */
+        public function getCreated(): int
+        {
+            return $this->created;
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): SigningKeyRecord
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'peer_uuid' => $this->peerUuid,
+                'uuid' => $this->uuid,
+                'name' => $this->name,
+                'public_key' => $this->publicKey,
+                'state' => $this->state->value,
+                'expires' => (new DateTime())->setTimestamp($this->expires),
+                'created' => (new DateTime())->setTimestamp($this->created)
+            ];
+        }
+
+        /**
+         * Converts the current signing key record to its standard format.
+         *
+         * @return Signature The signing key in its standard format.
+         */
+        public function toStandard(): Signature
+        {
+            return Signature::fromSigningKeyRecord($this);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/DnsRecord.php b/src/Socialbox/Objects/DnsRecord.php
new file mode 100644
index 0000000..6a1ca33
--- /dev/null
+++ b/src/Socialbox/Objects/DnsRecord.php
@@ -0,0 +1,67 @@
+<?php
+
+    namespace Socialbox\Objects;
+
+    class DnsRecord
+    {
+        private string $rpcEndpoint;
+        private string $publicSigningKey;
+        private int $expires;
+
+        /**
+         * Constructor for initializing the class with required parameters.
+         *
+         * @param string $rpcEndpoint The RPC endpoint.
+         * @param string $publicSigningKey The public signing key.
+         * @param int $expires The expiration time in seconds.
+         * @return void
+         */
+        public function __construct(string $rpcEndpoint, string $publicSigningKey, int $expires)
+        {
+            $this->rpcEndpoint = $rpcEndpoint;
+            $this->publicSigningKey = $publicSigningKey;
+            $this->expires = $expires;
+        }
+
+        /**
+         * Retrieves the RPC endpoint.
+         *
+         * @return string The RPC endpoint.
+         */
+        public function getRpcEndpoint(): string
+        {
+            return $this->rpcEndpoint;
+        }
+
+        /**
+         * Retrieves the public signing key.
+         *
+         * @return string Returns the public signing key as a string.
+         */
+        public function getPublicSigningKey(): string
+        {
+            return $this->publicSigningKey;
+        }
+
+        /**
+         * Retrieves the expiration time.
+         *
+         * @return int The expiration timestamp as an integer.
+         */
+        public function getExpires(): int
+        {
+            return $this->expires;
+        }
+
+        /**
+         * Creates a new instance of DnsRecord from the provided array of data.
+         *
+         * @param array $data An associative array containing the keys 'rpc_endpoint', 'public_key', and 'expires'
+         *                    required to instantiate a DnsRecord object.
+         * @return DnsRecord Returns a new DnsRecord instance populated with the data from the array.
+         */
+        public static function fromArray(array $data): DnsRecord
+        {
+            return new DnsRecord($data['rpc_endpoint'], $data['public_key'], $data['expires']);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/KeyPair.php b/src/Socialbox/Objects/KeyPair.php
index df50c98..b3e91fa 100644
--- a/src/Socialbox/Objects/KeyPair.php
+++ b/src/Socialbox/Objects/KeyPair.php
@@ -1,25 +1,43 @@
 <?php
 
-namespace Socialbox\Objects;
+    namespace Socialbox\Objects;
 
-class KeyPair
-{
-    private string $publicKey;
-    private string $privateKey;
-
-    public function __construct(string $publicKey, string $privateKey)
+    class KeyPair
     {
-        $this->publicKey = $publicKey;
-        $this->privateKey = $privateKey;
-    }
+        private string $publicKey;
+        private string $privateKey;
 
-    public function getPublicKey(): string
-    {
-        return $this->publicKey;
-    }
+        /**
+         * Constructor method for initializing the class with a public key and private key.
+         *
+         * @param string $publicKey The public key to be used.
+         * @param string $privateKey The private key to be used.
+         *
+         * @return void
+         */
+        public function __construct(string $publicKey, string $privateKey)
+        {
+            $this->publicKey = $publicKey;
+            $this->privateKey = $privateKey;
+        }
 
-    public function getPrivateKey(): string
-    {
-        return $this->privateKey;
-    }
-}
\ No newline at end of file
+        /**
+         * Retrieves the public key associated with this instance.
+         *
+         * @return string The public key.
+         */
+        public function getPublicKey(): string
+        {
+            return $this->publicKey;
+        }
+
+        /**
+         * Retrieves the private key associated with the instance.
+         *
+         * @return string The private key as a string.
+         */
+        public function getPrivateKey(): string
+        {
+            return $this->privateKey;
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/PeerAddress.php b/src/Socialbox/Objects/PeerAddress.php
index 42af2be..27e7b22 100644
--- a/src/Socialbox/Objects/PeerAddress.php
+++ b/src/Socialbox/Objects/PeerAddress.php
@@ -1,96 +1,122 @@
 <?php
 
-namespace Socialbox\Objects;
+    namespace Socialbox\Objects;
 
-use InvalidArgumentException;
-use Socialbox\Classes\Validator;
-use Socialbox\Enums\ReservedUsernames;
+    use InvalidArgumentException;
+    use Socialbox\Classes\Configuration;
+    use Socialbox\Classes\Validator;
+    use Socialbox\Enums\ReservedUsernames;
 
-class PeerAddress
-{
-    private string $username;
-    private string $domain;
-
-    /**
-     * Constructs a PeerAddress object from a given username and domain
-     *
-     * @param string $username The username of the peer
-     * @param string $domain The domain of the peer
-     */
-    public function __construct(string $username, string $domain)
+    class PeerAddress
     {
-        $this->username = $username;
-        $this->domain = $domain;
-    }
+        private string $username;
+        private string $domain;
 
-    /**
-     * Constructs a PeerAddress from a full peer address (eg; john@example.com)
-     *
-     * @param string $address The full address of the peer
-     * @return PeerAddress The constructed PeerAddress object
-     */
-    public static function fromAddress(string $address): PeerAddress
-    {
-        if(!Validator::validatePeerAddress($address))
+        /**
+         * Constructs a PeerAddress object from a given username and domain
+         *
+         * @param string $username The username of the peer
+         * @param string $domain The domain of the peer
+         */
+        public function __construct(string $username, string $domain)
         {
-            throw new InvalidArgumentException("Invalid peer address: $address");
+            $this->username = $username;
+            $this->domain = $domain;
         }
 
-        $parts = explode('@', $address);
-        return new PeerAddress($parts[0], $parts[1]);
-    }
-
-    /**
-     * Returns the username of the peer
-     *
-     * @return string
-     */
-    public function getUsername(): string
-    {
-        return $this->username;
-    }
-
-    /**
-     * Returns the domain of the peer
-     *
-     * @return string
-     */
-    public function getDomain(): string
-    {
-        return $this->domain;
-    }
-
-    /**
-     * Returns whether the peer is the host
-     *
-     * @return bool True if the peer is the host, false otherwise
-     */
-    public function isHost(): bool
-    {
-        return $this->username === ReservedUsernames::HOST->value;
-    }
-
-    /**
-     * Returns whether the peer requires authentication, for example, the anonymous user does not require authentication
-     *
-     * @return bool True if authentication is required, false otherwise
-     */
-    public function authenticationRequired(): bool
-    {
-        return match($this->username)
+        /**
+         * Constructs a PeerAddress from a full peer address (eg; john@example.com)
+         *
+         * @param string $address The full address of the peer
+         * @return PeerAddress The constructed PeerAddress object
+         */
+        public static function fromAddress(string $address): PeerAddress
         {
-            ReservedUsernames::ANONYMOUS->value => false,
-            default => true
-        };
-    }
+            if(!Validator::validatePeerAddress($address))
+            {
+                throw new InvalidArgumentException("Invalid peer address: $address");
+            }
 
-    /**
-     * Returns the full address of the peer
-     *
-     * @return string The full address of the peer
-     */
-    public function getAddress(): string
-    {
-        return sprintf("%s@%s", $this->username, $this->domain);
-    }
-}
\ No newline at end of file
+            $parts = explode('@', $address);
+            return new PeerAddress($parts[0], $parts[1]);
+        }
+
+        /**
+         * Returns the username of the peer
+         *
+         * @return string
+         */
+        public function getUsername(): string
+        {
+            return $this->username;
+        }
+
+        /**
+         * Returns the domain of the peer
+         *
+         * @return string
+         */
+        public function getDomain(): string
+        {
+            return $this->domain;
+        }
+
+        /**
+         * Returns whether the peer is the host
+         *
+         * @return bool True if the peer is the host, false otherwise
+         */
+        public function isHost(): bool
+        {
+            return $this->username === ReservedUsernames::HOST->value && $this->domain === Configuration::getInstanceConfiguration()->getDomain();
+        }
+
+        /**
+         * Determines if the peer is external.
+         *
+         * @return bool True if the peer is external, false otherwise.
+         */
+        public function isExternal(): bool
+        {
+            if($this->isHost())
+            {
+                return false;
+            }
+
+            return $this->domain !== Configuration::getInstanceConfiguration()->getDomain();
+        }
+
+        /**
+         * Returns whether the peer requires authentication, for example, the anonymous user does not require authentication
+         *
+         * @return bool True if authentication is required, false otherwise
+         */
+        public function authenticationRequired(): bool
+        {
+            return match($this->username)
+            {
+                ReservedUsernames::ANONYMOUS->value => false,
+                default => true
+            };
+        }
+
+        /**
+         * Returns the full address of the peer
+         *
+         * @return string The full address of the peer
+         */
+        public function getAddress(): string
+        {
+            return sprintf("%s@%s", $this->username, $this->domain);
+        }
+
+        /**
+         * Returns the string representation of the object
+         *
+         * @return string The string representation of the object
+         */
+        public function __toString(): string
+        {
+            return $this->getAddress();
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/ResolvedServer.php b/src/Socialbox/Objects/ResolvedServer.php
index 4ecd4e5..8683aa6 100644
--- a/src/Socialbox/Objects/ResolvedServer.php
+++ b/src/Socialbox/Objects/ResolvedServer.php
@@ -1,25 +1,11 @@
 <?php
 
-namespace Socialbox\Objects;
+    namespace Socialbox\Objects;
 
-class ResolvedServer
-{
-    private string $endpoint;
-    private string $publicKey;
+    use Socialbox\Objects\Standard\ServerInformation;
 
-    public function __construct(string $endpoint, string $publicKey)
+    class ResolvedServer
     {
-        $this->endpoint = $endpoint;
-        $this->publicKey = $publicKey;
-    }
-
-    public function getEndpoint(): string
-    {
-        return $this->endpoint;
-    }
-
-    public function getPublicKey(): string
-    {
-        return $this->publicKey;
-    }
-}
\ No newline at end of file
+        private DnsRecord $dnsRecord;
+        private ServerInformation $serverInformation;
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/ResolvedServerOld.php b/src/Socialbox/Objects/ResolvedServerOld.php
new file mode 100644
index 0000000..4ecd4e5
--- /dev/null
+++ b/src/Socialbox/Objects/ResolvedServerOld.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Socialbox\Objects;
+
+class ResolvedServer
+{
+    private string $endpoint;
+    private string $publicKey;
+
+    public function __construct(string $endpoint, string $publicKey)
+    {
+        $this->endpoint = $endpoint;
+        $this->publicKey = $publicKey;
+    }
+
+    public function getEndpoint(): string
+    {
+        return $this->endpoint;
+    }
+
+    public function getPublicKey(): string
+    {
+        return $this->publicKey;
+    }
+}
\ No newline at end of file
diff --git a/src/Socialbox/Objects/RpcError.php b/src/Socialbox/Objects/RpcError.php
index 99694d4..5e1bfc2 100644
--- a/src/Socialbox/Objects/RpcError.php
+++ b/src/Socialbox/Objects/RpcError.php
@@ -1,98 +1,112 @@
 <?php
 
-namespace Socialbox\Objects;
+    namespace Socialbox\Objects;
 
-use Socialbox\Enums\StandardError;
-use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Exceptions\RpcException;
+    use Socialbox\Interfaces\SerializableInterface;
 
-class RpcError implements SerializableInterface
-{
-    private string $id;
-    private string $error;
-    private StandardError $code;
-
-    /**
-     * Constructs the RPC error object.
-     *
-     * @param string $id The ID of the RPC request
-     * @param StandardError $code The error code
-     * @param string $error The error message
-     */
-    public function __construct(string $id, StandardError $code, ?string $error)
+    class RpcError implements SerializableInterface
     {
-        $this->id = $id;
-        $this->code = $code;
+        private string $id;
+        private StandardError $code;
+        private string $error;
 
-        if($error === null)
+        /**
+         * Constructs the RPC error object.
+         *
+         * @param string $id The ID of the RPC request
+         * @param StandardError|int $code The error code
+         * @param string|null $error The error message
+         */
+        public function __construct(string $id, StandardError|int $code, ?string $error)
         {
-            $this->error = $code->getMessage();
-        }
-        else
-        {
-            $this->error = $error;
+            $this->id = $id;
+
+            if(is_int($code))
+            {
+                $code = StandardError::tryFrom($code);
+                if($code === null)
+                {
+                    $code = StandardError::UNKNOWN;
+                }
+            }
+
+            $this->code = $code;
+
+            if($error === null)
+            {
+                $this->error = $code->getMessage();
+            }
+            else
+            {
+                $this->error = $error;
+            }
+
         }
 
-    }
-
-    /**
-     * Returns the ID of the RPC request.
-     *
-     * @return string The ID of the RPC request.
-     */
-    public function getId(): string
-    {
-        return $this->id;
-    }
-
-    /**
-     * Returns the error message.
-     *
-     * @return string The error message.
-     */
-    public function getError(): string
-    {
-        return $this->error;
-    }
-
-    /**
-     * Returns the error code.
-     *
-     * @return StandardError The error code.
-     */
-    public function getCode(): StandardError
-    {
-        return $this->code;
-    }
-
-    /**
-     * Returns an array representation of the object.
-     *
-     * @return array The array representation of the object.
-     */
-    public function toArray(): array
-    {
-        return [
-            'id' => $this->id,
-            'error' => $this->error,
-            'code' => $this->code->value
-        ];
-    }
-
-    /**
-     * Returns the RPC error object from an array of data.
-     *
-     * @param array $data The data to construct the RPC error from.
-     * @return RpcError The RPC error object.
-     */
-    public static function fromArray(array $data): RpcError
-    {
-        $errorCode = StandardError::tryFrom($data['code']);
-
-        if($errorCode == null)
+        /**
+         * Returns the ID of the RPC request.
+         *
+         * @return string The ID of the RPC request.
+         */
+        public function getId(): string
         {
-            $errorCode = StandardError::UNKNOWN;
+            return $this->id;
         }
 
-        return new RpcError($data['id'], $data['error'], $errorCode);
-    }
-}
\ No newline at end of file
+        /**
+         * Returns the error code.
+         *
+         * @return StandardError The error code.
+         */
+        public function getCode(): StandardError
+        {
+            return $this->code;
+        }
+
+        /**
+         * Returns the error message.
+         *
+         * @return string The error message.
+         */
+        public function getError(): string
+        {
+            return $this->error;
+        }
+
+        /**
+         * Returns an array representation of the object.
+         *
+         * @return array The array representation of the object.
+         */
+        public function toArray(): array
+        {
+            return [
+                'id' => $this->id,
+                'code' => $this->code->value,
+                'error' => $this->error
+            ];
+        }
+
+        /**
+         * Converts the current object to an RpcException instance.
+         *
+         * @return RpcException The RpcException generated from the current object.
+         */
+        public function toRpcException(): RpcException
+        {
+            return new RpcException($this->error, $this->code->value);
+        }
+
+        /**
+         * Returns the RPC error object from an array of data.
+         *
+         * @param array $data The data to construct the RPC error from.
+         * @return RpcError The RPC error object.
+         */
+        public static function fromArray(array $data): RpcError
+        {
+            return new RpcError($data['id'], $data['code'], $data['error']);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/RpcRequest.php b/src/Socialbox/Objects/RpcRequest.php
index 366700f..43f9d5a 100644
--- a/src/Socialbox/Objects/RpcRequest.php
+++ b/src/Socialbox/Objects/RpcRequest.php
@@ -1,191 +1,229 @@
 <?php
 
-namespace Socialbox\Objects;
+    namespace Socialbox\Objects;
 
-use InvalidArgumentException;
-use ncc\ThirdParty\nikic\PhpParser\Node\Expr\BinaryOp\BooleanOr;
-use Socialbox\Enums\StandardError;
-use Socialbox\Exceptions\RpcException;
-use Socialbox\Exceptions\StandardException;
-use Socialbox\Interfaces\SerializableInterface;
+    use InvalidArgumentException;
+    use Socialbox\Classes\Logger;
+    use Socialbox\Classes\Utilities;
+    use Socialbox\Enums\StandardError;
+    use Socialbox\Enums\StandardMethods;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Interfaces\SerializableInterface;
 
-class RpcRequest implements SerializableInterface
-{
-    private ?string $id;
-    private string $method;
-    private ?array $parameters;
-
-    /**
-     * Constructs the object from an array of data.
-     *
-     * @param string $method The method of the request.
-     * @param string|null $id The ID of the request.
-     * @param array|null $parameters The parameters of the request.
-     */
-    public function __construct(string $method, ?string $id, ?array $parameters)
+    class RpcRequest implements SerializableInterface
     {
-        $this->method = $method;
-        $this->parameters = $parameters;
-        $this->id = $id;
-    }
+        private ?string $id;
+        private string $method;
+        private ?array $parameters;
 
-    /**
-     * Returns the ID of the request.
-     *
-     * @return string|null The ID of the request.
-     */
-    public function getId(): ?string
-    {
-        return $this->id;
-    }
-
-    /**
-     * Returns the method of the request.
-     *
-     * @return string The method of the request.
-     */
-    public function getMethod(): string
-    {
-        return $this->method;
-    }
-
-    /**
-     * Returns the parameters of the request.
-     *
-     * @return array|null The parameters of the request, null if the request is a notification.
-     */
-    public function getParameters(): ?array
-    {
-        return $this->parameters;
-    }
-
-    /**
-     * Checks if the parameter exists within the RPC request
-     *
-     * @param string $parameter The parameter to check
-     * @return bool True if the parameter exists, False otherwise.
-     */
-    public function containsParameter(string $parameter): bool
-    {
-        return isset($this->parameters[$parameter]);
-    }
-
-    /**
-     * Returns the parameter value from the RPC request
-     *
-     * @param string $parameter The parameter name to get
-     * @return mixed The parameter value, null if the parameter value is null or not found.
-     */
-    public function getParameter(string $parameter): mixed
-    {
-        if(!$this->containsParameter($parameter))
+        /**
+         * Constructs the object from an array of data.
+         *
+         * @param string|StandardMethods $method The method of the request.
+         * @param string|null $id The ID of the request. If 'RANDOM' a random crc32 hash will be used.
+         * @param array|null $parameters The parameters of the request.
+         */
+        public function __construct(string|StandardMethods $method, ?string $id='RANDOM', ?array $parameters=null)
         {
-            return null;
+            if($method instanceof StandardMethods)
+            {
+                $method = $method->value;
+            }
+
+            if($id === 'RANDOM')
+            {
+                $id = Utilities::randomCrc32();;
+            }
+
+            $this->method = $method;
+            $this->parameters = $parameters;
+            $this->id = $id;
         }
 
-        return $this->parameters[$parameter];
-    }
-
-    /**
-     * Produces a response based off the request, null if the request is a notification
-     *
-     * @param mixed|null $result
-     * @return RpcResponse|null
-     */
-    public function produceResponse(mixed $result=null): ?RpcResponse
-    {
-        if($this->id == null)
+        /**
+         * Returns the ID of the request.
+         *
+         * @return string|null The ID of the request.
+         */
+        public function getId(): ?string
         {
-            return null;
+            return $this->id;
         }
 
-        $valid = false;
-        if(is_array($result))
+        /**
+         * Returns the method of the request.
+         *
+         * @return string The method of the request.
+         */
+        public function getMethod(): string
         {
-            $valid = true;
-        }
-        elseif($result instanceof SerializableInterface)
-        {
-            $valid = true;
-        }
-        elseif(is_string($result))
-        {
-            $valid = true;
-        }
-        elseif(is_bool($result))
-        {
-            $valid = true;
-        }
-        elseif(is_int($result))
-        {
-            $valid = true;
-        }
-        elseif(is_null($result))
-        {
-            $valid = true;
+            return $this->method;
         }
 
-        if(!$valid)
+        /**
+         * Returns the parameters of the request.
+         *
+         * @return array|null The parameters of the request, null if the request is a notification.
+         */
+        public function getParameters(): ?array
         {
-            throw new InvalidArgumentException('The \'$result\' property must either be string, boolean, integer, array, null or SerializableInterface');
+            return $this->parameters;
         }
 
-        return new RpcResponse($this->id, $result);
-    }
-
-    /**
-     * Produces an error response based off the request, null if the request is a notification
-     *
-     * @param StandardError $error
-     * @param string|null $message
-     * @return RpcError|null
-     */
-    public function produceError(StandardError $error, ?string $message=null): ?RpcError
-    {
-        if($this->id == null)
+        /**
+         * Checks if the parameter exists within the RPC request
+         *
+         * @param string $parameter The parameter to check
+         * @param bool $strict True if the parameter value cannot be null (or empty), False otherwise.
+         * @return bool True if the parameter exists, False otherwise.
+         */
+        public function containsParameter(string $parameter, bool $strict=true): bool
         {
-            return null;
+            if($strict)
+            {
+                if(!isset($this->parameters[$parameter]))
+                {
+                    return false;
+                }
+
+                if(is_string($this->parameters[$parameter]) && strlen($this->parameters[$parameter]) == 0)
+                {
+                    return false;
+                }
+
+                if(is_array($this->parameters[$parameter]) && count($this->parameters[$parameter]) == 0)
+                {
+                    return false;
+                }
+
+                if(is_null($this->parameters[$parameter]))
+                {
+                    return false;
+                }
+
+                return true;
+            }
+
+            return isset($this->parameters[$parameter]);
         }
 
-        if($message == null)
+        /**
+         * Returns the parameter value from the RPC request
+         *
+         * @param string $parameter The parameter name to get
+         * @return mixed The parameter value, null if the parameter value is null or not found.
+         */
+        public function getParameter(string $parameter): mixed
         {
-            $message = $error->getMessage();
+            if(!$this->containsParameter($parameter))
+            {
+                return null;
+            }
+
+            return $this->parameters[$parameter];
         }
 
-        return new RpcError($this->id, $error, $message);
-    }
+        /**
+         * Produces a response based off the request, null if the request is a notification
+         *
+         * @param mixed|null $result
+         * @return RpcResponse|null
+         */
+        public function produceResponse(mixed $result=null): ?RpcResponse
+        {
+            if($this->id == null)
+            {
+                return null;
+            }
 
-    /**
-     * @param StandardException $e
-     * @return RpcError|null
-     */
-    public function handleStandardException(StandardException $e): ?RpcError
-    {
-        return $this->produceError($e->getStandardError(), $e->getMessage());
-    }
+            $valid = false;
+            if(is_array($result))
+            {
+                $valid = true;
+            }
+            elseif($result instanceof SerializableInterface)
+            {
+                $valid = true;
+            }
+            elseif(is_string($result))
+            {
+                $valid = true;
+            }
+            elseif(is_bool($result))
+            {
+                $valid = true;
+            }
+            elseif(is_int($result))
+            {
+                $valid = true;
+            }
+            elseif(is_null($result))
+            {
+                $valid = true;
+            }
 
-    /**
-     * Returns an array representation of the object.
-     *
-     * @return array
-     */
-    public function toArray(): array
-    {
-        return [
-            'id' => $this->id,
-            'method' => $this->method,
-            'parameters' => $this->parameters
-        ];
-    }
+            if(!$valid)
+            {
+                throw new InvalidArgumentException('The \'$result\' property must either be string, boolean, integer, array, null or SerializableInterface');
+            }
 
-    /**
-     * Returns the request object from an array of data.
-     *
-     * @param array $data The data to construct the object from.
-     * @return RpcRequest The request object.
-     */
-    public static function fromArray(array $data): RpcRequest
-    {
-        return new RpcRequest($data['method'], $data['id'] ?? null, $data['parameters'] ?? null);
-    }
-}
\ No newline at end of file
+            Logger::getLogger()->verbose(sprintf('Producing response for request %s', $this->id));
+            return new RpcResponse($this->id, $result);
+        }
+
+        /**
+         * Produces an error response based off the request, null if the request is a notification
+         *
+         * @param StandardError $error
+         * @param string|null $message
+         * @return RpcError|null
+         */
+        public function produceError(StandardError $error, ?string $message=null): ?RpcError
+        {
+            if($this->id == null)
+            {
+                return null;
+            }
+
+            if($message == null)
+            {
+                $message = $error->getMessage();
+            }
+
+            return new RpcError($this->id, $error, $message);
+        }
+
+        /**
+         * @param StandardRpcException $e
+         * @return RpcError|null
+         */
+        public function handleStandardException(StandardRpcException $e): ?RpcError
+        {
+            return $this->produceError($e->getStandardError(), $e->getMessage());
+        }
+
+        /**
+         * Returns an array representation of the object.
+         *
+         * @return array
+         */
+        public function toArray(): array
+        {
+            return [
+                'id' => $this->id,
+                'method' => $this->method,
+                'parameters' => $this->parameters
+            ];
+        }
+
+        /**
+         * Returns the request object from an array of data.
+         *
+         * @param array $data The data to construct the object from.
+         * @return RpcRequest The request object.
+         */
+        public static function fromArray(array $data): RpcRequest
+        {
+            return new RpcRequest($data['method'], $data['id'] ?? null, $data['parameters'] ?? null);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/RpcResponse.php b/src/Socialbox/Objects/RpcResponse.php
index a109eab..2ec8238 100644
--- a/src/Socialbox/Objects/RpcResponse.php
+++ b/src/Socialbox/Objects/RpcResponse.php
@@ -1,84 +1,104 @@
 <?php
 
-namespace Socialbox\Objects;
+    namespace Socialbox\Objects;
 
-use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Interfaces\SerializableInterface;
 
-class RpcResponse implements SerializableInterface
-{
-    private string $id;
-    private mixed $result;
-
-    /**
-     * Constructs the response object.
-     *
-     * @param string $id The ID of the response.
-     * @param mixed|null $result The result of the response.
-     */
-    public function __construct(string $id, mixed $result)
+    class RpcResponse implements SerializableInterface
     {
-        $this->id = $id;
-        $this->result = $result;
-    }
+        private string $id;
+        private mixed $result;
 
-    /**
-     * Returns the ID of the response.
-     *
-     * @return string The ID of the response.
-     */
-    public function getId(): string
-    {
-        return $this->id;
-    }
-
-    /**
-     * Returns the result of the response.
-     *
-     * @return mixed|null The result of the response.
-     */
-    public function getResult(): mixed
-    {
-        return $this->result;
-    }
-
-    /**
-     * Converts the given data to an array.
-     *
-     * @param mixed $data The data to be converted. This can be an instance of SerializableInterface, an array, or a scalar value.
-     * @return mixed The converted data as an array if applicable, or the original data.
-     */
-    private function convertToArray(mixed $data): mixed
-    {
-        // If the data is an instance of SerializableInterface, call toArray on it
-        if ($data instanceof SerializableInterface)
+        /**
+         * Constructs the response object.
+         *
+         * @param string $id The ID of the response.
+         * @param mixed|null $result The result of the response.
+         */
+        public function __construct(string $id, mixed $result)
         {
-            return $data->toArray();
+            $this->id = $id;
+            $this->result = $result;
         }
 
-        return $data;
-    }
+        /**
+         * Returns the ID of the response.
+         *
+         * @return string The ID of the response.
+         */
+        public function getId(): string
+        {
+            return $this->id;
+        }
 
-    /**
-     * Returns an array representation of the object.
-     *
-     * @return array The array representation of the object.
-     */
-    public function toArray(): array
-    {
-        return [
-            'id' => $this->id,
-            'result' => $this->convertToArray($this->result)
-        ];
-    }
+        /**
+         * Returns the result of the response.
+         *
+         * @return mixed|null The result of the response.
+         */
+        public function getResult(): mixed
+        {
+            return $this->result;
+        }
 
-    /**
-     * Returns the response object from an array of data.
-     *
-     * @param array $data The data to construct the response from.
-     * @return RpcResponse The response object.
-     */
-    public static function fromArray(array $data): RpcResponse
-    {
-        return new RpcResponse($data['id'], $data['result']);
-    }
-}
\ No newline at end of file
+        /**
+         * Converts the given data to an array.
+         *
+         * @param mixed $data The data to be converted. This can be an instance of SerializableInterface, an array, or a scalar value.
+         * @return mixed The converted data as an array if applicable, or the original data.
+         */
+        private function convertToArray(mixed $data): mixed
+        {
+            // If the data is an instance of SerializableInterface, call toArray on it
+            if ($data instanceof SerializableInterface)
+            {
+                return $data->toArray();
+            }
+
+            // If the data is an array, recursively call this function on each element
+            if(is_array($data))
+            {
+                foreach($data as $key => $value)
+                {
+                    if(is_array($value))
+                    {
+                        $data[$key] = $this->convertToArray($value);
+                    }
+                    elseif($value instanceof SerializableInterface)
+                    {
+                        $data[$key] = $value->toArray();
+                    }
+                    else
+                    {
+                        $data[$key] = $value;
+                    }
+                }
+            }
+
+            return $data;
+        }
+
+        /**
+         * Returns an array representation of the object.
+         *
+         * @return array The array representation of the object.
+         */
+        public function toArray(): array
+        {
+            return [
+                'id' => $this->id,
+                'result' => $this->convertToArray($this->result)
+            ];
+        }
+
+        /**
+         * Returns the response object from an array of data.
+         *
+         * @param array $data The data to construct the response from.
+         * @return RpcResponse The response object.
+         */
+        public static function fromArray(array $data): RpcResponse
+        {
+            return new RpcResponse($data['id'], $data['result']);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/RpcResult.php b/src/Socialbox/Objects/RpcResult.php
new file mode 100644
index 0000000..7ffd443
--- /dev/null
+++ b/src/Socialbox/Objects/RpcResult.php
@@ -0,0 +1,95 @@
+<?php
+
+    namespace Socialbox\Objects;
+
+    class RpcResult
+    {
+        private ?RpcResponse $response;
+        private ?RpcError $error;
+
+        /**
+         * Constructor for initializing the instance with a response or error.
+         *
+         * @param RpcResponse|RpcError|array $response An instance of RpcResponse, RpcError, or an associative array
+         *                                             containing error or result data to initialize the class.
+         * @return void
+         */
+        public function __construct(RpcResponse|RpcError|array $response)
+        {
+            if(is_array($response))
+            {
+                if(isset($response['error']) && isset($response['code']))
+                {
+                    $response = RpcError::fromArray($response);
+                }
+                elseif(isset($response['result']))
+                {
+                    $response = RpcResponse::fromArray($response);
+                }
+                else
+                {
+                    $response = null;
+                }
+            }
+
+            if($response === null)
+            {
+                $this->error = null;
+                $this->response = null;
+                return;
+            }
+
+            if($response instanceof RpcResponse)
+            {
+                $this->response = $response;
+                $this->error = null;
+                return;
+            }
+
+            if($response instanceof RpcError)
+            {
+                $this->error = $response;
+                $this->response = null;
+            }
+        }
+
+        /**
+         * Checks whether the operation was successful.
+         *
+         * @return bool True if there is no error, otherwise false.
+         */
+        public function isSuccess(): bool
+        {
+            return $this->error === null;
+        }
+
+        /**
+         * Checks if the instance contains no error and no response.
+         *
+         * @return bool True if both error and response are null, otherwise false.
+         */
+        public function isEmpty(): bool
+        {
+            return $this->error === null && $this->response === null;
+        }
+
+        /**
+         * Retrieves the error associated with the instance, if any.
+         *
+         * @return RpcError|null The error object if an error exists, or null if no error is present.
+         */
+        public function getError(): ?RpcError
+        {
+            return $this->error;
+        }
+
+        /**
+         * Retrieves the RPC response if available.
+         *
+         * @return RpcResponse|null The response object if set, or null if no response is present.
+         */
+        public function getResponse(): ?RpcResponse
+        {
+            return $this->response;
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/SessionRecord.php b/src/Socialbox/Objects/SessionRecord.php
deleted file mode 100644
index 5b9ee23..0000000
--- a/src/Socialbox/Objects/SessionRecord.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-namespace Socialbox\Objects;
-
-use DateTime;
-use Socialbox\Enums\SessionState;
-use Socialbox\Interfaces\SerializableInterface;
-
-class SessionRecord implements SerializableInterface
-{
-    private string $uuid;
-    private ?string $authenticatedPeerUuid;
-    private string $publicKey;
-    private SessionState $state;
-    private DateTime $created;
-    private DateTime $lastRequest;
-
-    public function __construct(array $data)
-    {
-        $this->uuid = $data['uuid'];
-        $this->authenticatedPeerUuid = $data['authenticated_peer_uuid'] ?? null;
-        $this->publicKey = $data['public_key'];
-        $this->created = $data['created'];
-        $this->lastRequest = $data['last_request'];
-
-        if(SessionState::tryFrom($data['state']) == null)
-        {
-            $this->state = SessionState::CLOSED;
-        }
-        else
-        {
-            $this->state = SessionState::from($data['state']);
-        }
-    }
-
-    public function getUuid(): string
-    {
-        return $this->uuid;
-    }
-
-    public function getAuthenticatedPeerUuid(): ?string
-    {
-        return $this->authenticatedPeerUuid;
-    }
-
-    public function getPublicKey(): string
-    {
-        return $this->publicKey;
-    }
-
-    public function getState(): SessionState
-    {
-        return $this->state;
-    }
-
-    public function getCreated(): int
-    {
-        return $this->created;
-    }
-
-    public function getLastRequest(): int
-    {
-        return $this->lastRequest;
-    }
-
-    public static function fromArray(array $data): object
-    {
-        return new self($data);
-    }
-
-    public function toArray(): array
-    {
-        return [
-            'uuid' => $this->uuid,
-            'authenticated_peer_uuid' => $this->authenticatedPeerUuid,
-            'public_key' => $this->publicKey,
-            'state' => $this->state->value,
-            'created' => $this->created,
-            'last_request' => $this->lastRequest,
-        ];
-    }
-}
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Standard/Contact.php b/src/Socialbox/Objects/Standard/Contact.php
new file mode 100644
index 0000000..4d56f5a
--- /dev/null
+++ b/src/Socialbox/Objects/Standard/Contact.php
@@ -0,0 +1,122 @@
+<?php
+
+    namespace Socialbox\Objects\Standard;
+
+    use InvalidArgumentException;
+    use Socialbox\Enums\Types\ContactRelationshipType;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\PeerAddress;
+
+    class Contact implements SerializableInterface
+    {
+        private PeerAddress $address;
+        private ContactRelationshipType $relationship;
+        /**
+         * @var KnownSigningKey[]
+         */
+        private array $knownKeys;
+        private int $addedTimestamp;
+
+        /**
+         * Constructs a new instance with the provided parameters.
+         *
+         * @param array $data The array of data to use for the object.
+         */
+        public function __construct(array $data)
+        {
+            $this->address = PeerAddress::fromAddress($data['address']);
+
+            if($data['relationship'] instanceof ContactRelationshipType)
+            {
+                $this->relationship = $data['relationship'];
+            }
+            elseif(is_string($data['relationship']))
+            {
+                $this->relationship = ContactRelationshipType::tryFrom($data['relationship']) ?? ContactRelationshipType::MUTUAL;
+            }
+            else
+            {
+                throw new InvalidArgumentException('Invalid relationship data');
+            }
+
+            $this->knownKeys = [];
+
+            foreach($data['known_keys'] as $key)
+            {
+                if(is_array($key))
+                {
+                    $this->knownKeys[] = KnownSigningKey::fromArray($key);
+                }
+                elseif($key instanceof KnownSigningKey)
+                {
+                    $this->knownKeys[] = $key;
+                }
+                else
+                {
+                    throw new InvalidArgumentException('Invalid known key data');
+                }
+            }
+            $this->addedTimestamp = $data['added_timestamp'];
+        }
+
+        /**
+         * Retrieves the address of the contact.
+         *
+         * @return PeerAddress Returns the address of the contact.
+         */
+        public function getAddress(): PeerAddress
+        {
+            return $this->address;
+        }
+
+        /**
+         * Retrieves the relationship of the contact.
+         *
+         * @return ContactRelationshipType Returns the relationship of the contact.
+         */
+        public function getRelationship(): ContactRelationshipType
+        {
+            return $this->relationship;
+        }
+
+        /**
+         * Retrieves the known keys of the contact.
+         *
+         * @return KnownSigningKey[] Returns the known keys of the contact.
+         */
+        public function getKnownKeys(): array
+        {
+            return $this->knownKeys;
+        }
+
+        /**
+         * Retrieves the timestamp when the contact was added.
+         *
+         * @return int Returns the timestamp when the contact was added.
+         */
+        public function getAddedTimestamp(): int
+        {
+            return $this->addedTimestamp;
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): Contact
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'address' => $this->address->getAddress(),
+                'relationship' => $this->relationship->value,
+                'known_keys' => array_map(function($key) {return $key->toArray();}, $this->knownKeys),
+                'added_timestamp' => $this->addedTimestamp
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Standard/EncryptionChannel.php b/src/Socialbox/Objects/Standard/EncryptionChannel.php
new file mode 100644
index 0000000..63e6028
--- /dev/null
+++ b/src/Socialbox/Objects/Standard/EncryptionChannel.php
@@ -0,0 +1,119 @@
+<?php
+
+    namespace Socialbox\Objects\Standard;
+
+    use DateMalformedStringException;
+    use DateTime;
+    use InvalidArgumentException;
+    use Socialbox\Enums\Status\EncryptionChannelStatus;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\PeerAddress;
+
+    class EncryptionChannel implements SerializableInterface
+    {
+        private string $uuid;
+        private EncryptionChannelStatus $status;
+        private PeerAddress $callingPeer;
+        private string $callingPublicEncryptionKey;
+        private PeerAddress $receivingPeer;
+        private ?string $receivingPublicEncryptionKey;
+        private int $created;
+
+        /**
+         * Public Constructor for the encryption channel
+         *
+         * @param array $data
+         */
+        public function __construct(array $data)
+        {
+            $this->uuid = $data['uuid'];
+            $this->status = EncryptionChannelStatus::from($data['status']);
+            $this->callingPeer = PeerAddress::fromAddress($data['calling_peer']);
+            $this->callingPublicEncryptionKey = $data['calling_public_encryption_key'];
+            $this->receivingPeer = PeerAddress::fromAddress($data['receiving_peer']);
+            $this->receivingPublicEncryptionKey = $data['receiving_public_encryption_key'] ?? null;
+
+            if(is_int($data['created']))
+            {
+                $this->created = $data['created'];
+            }
+            if(is_string($data['created']))
+            {
+                try
+                {
+                    $this->created = (new DateTime($data['created']))->getTimestamp();
+                }
+                catch (DateMalformedStringException $e)
+                {
+                    throw new InvalidArgumentException($e->getMessage(), $e->getCode());
+                }
+            }
+            elseif($data['created'] instanceof DateTime)
+            {
+                $this->created = $data['created']->getTimestamp();
+            }
+            else
+            {
+                throw new InvalidArgumentException('Invalid created type, got: ' . gettype($data['created']));
+            }
+        }
+
+        public function getUuid(): string
+        {
+            return $this->uuid;
+        }
+
+        public function getStatus(): EncryptionChannelStatus
+        {
+            return $this->status;
+        }
+
+        public function getCallingPeer(): PeerAddress
+        {
+            return $this->callingPeer;
+        }
+
+        public function getCallingPublicEncryptionKey(): string
+        {
+            return $this->callingPublicEncryptionKey;
+        }
+
+        public function getReceivingPeer(): PeerAddress
+        {
+            return $this->receivingPeer;
+        }
+
+        public function getReceivingPublicEncryptionKey(): ?string
+        {
+            return $this->receivingPublicEncryptionKey;
+        }
+
+        public function getCreated(): int
+        {
+            return $this->created;
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): EncryptionChannel
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'uuid' => $this->uuid,
+                'status' => $this->status->value,
+                'calling_peer' => $this->callingPeer->getAddress(),
+                'calling_public_encryption_key' => $this->callingPublicEncryptionKey,
+                'receiving_peer' => $this->receivingPeer->getAddress(),
+                'receiving_public_encryption_key' => $this->receivingPublicEncryptionKey,
+                'created' => $this->created
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Standard/EncryptionChannelMessage.php b/src/Socialbox/Objects/Standard/EncryptionChannelMessage.php
new file mode 100644
index 0000000..031d78e
--- /dev/null
+++ b/src/Socialbox/Objects/Standard/EncryptionChannelMessage.php
@@ -0,0 +1,79 @@
+<?php
+
+    namespace Socialbox\Objects\Standard;
+
+    use Socialbox\Enums\Status\EncryptionChannelStatus;
+    use Socialbox\Interfaces\SerializableInterface;
+
+    class EncryptionChannelMessage implements SerializableInterface
+    {
+        private string $messageUuid;
+        private string $channelUuid;
+        private EncryptionChannelStatus $status;
+        private string $hash;
+        private string $data;
+        private int $timestamp;
+
+        public function __construct(array $data)
+        {
+            $this->messageUuid = $data['message_uuid'];
+            $this->channelUuid = $data['channel_uuid'];
+            $this->status = EncryptionChannelStatus::from($data['status']);
+            $this->hash = $data['hash'];
+            $this->data = $data['data'];
+            $this->timestamp = $data['timestamp'];
+        }
+
+        public function getMessageUuid(): string
+        {
+            return $this->messageUuid;
+        }
+
+        public function getChannelUuid(): string
+        {
+            return $this->channelUuid;
+        }
+
+        public function getStatus(): EncryptionChannelStatus
+        {
+            return $this->status;
+        }
+
+        public function getHash(): string
+        {
+            return $this->hash;
+        }
+
+        public function getData(): string
+        {
+            return $this->data;
+        }
+
+        public function getTimestamp(): int
+        {
+            return $this->timestamp;
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): EncryptionChannelMessage
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'message_uuid' => $this->messageUuid,
+                'channel_uuid' => $this->channelUuid,
+                'status' => $this->status->value,
+                'hash' => $this->hash,
+                'data' => $this->data,
+                'timestamp' => $this->timestamp
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Standard/ExternalUrlVerification.php b/src/Socialbox/Objects/Standard/ExternalUrlVerification.php
new file mode 100644
index 0000000..2dcb333
--- /dev/null
+++ b/src/Socialbox/Objects/Standard/ExternalUrlVerification.php
@@ -0,0 +1,60 @@
+<?php
+
+    namespace Socialbox\Objects\Standard;
+
+    use Socialbox\Interfaces\SerializableInterface;
+
+    class ExternalUrlVerification implements SerializableInterface
+    {
+        private int $expires;
+        private string $url;
+
+        /**
+         * ImageCaptcha constructor.
+         * @param array $data
+         */
+        public function __construct(array $data)
+        {
+            $this->expires = $data['expires'];
+            $this->url = $data['url'];
+        }
+
+        /**
+         * Returns the expiration time of the captcha
+         *
+         * @return int The expiration time of the captcha in Unix timestamp format
+         */
+        public function getExpires(): int
+        {
+            return $this->expires;
+        }
+
+        /**
+         * Returns the URL of the external verification
+         *
+         * @return string The URL of the external verification
+         */
+        public function getUrl(): string
+        {
+            return $this->url;
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): ExternalUrlVerification
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'expires' => $this->expires,
+                'url' => $this->url
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Standard/ImageCaptchaVerification.php b/src/Socialbox/Objects/Standard/ImageCaptchaVerification.php
new file mode 100644
index 0000000..3a775c2
--- /dev/null
+++ b/src/Socialbox/Objects/Standard/ImageCaptchaVerification.php
@@ -0,0 +1,87 @@
+<?php
+
+    namespace Socialbox\Objects\Standard;
+
+    use Exception;
+    use Socialbox\Interfaces\SerializableInterface;
+
+    class ImageCaptchaVerification implements SerializableInterface
+    {
+        private int $expires;
+        private string $imageBase64;
+
+        /**
+         * ImageCaptcha constructor.
+         * @param array $data
+         */
+        public function __construct(array $data)
+        {
+            $this->expires = $data['expires'];
+            $this->imageBase64 = $data['image_base64'];
+        }
+
+        /**
+         * Returns the expiration time of the captcha
+         *
+         * @return int The expiration time of the captcha in Unix timestamp format
+         */
+        public function getExpires(): int
+        {
+            return $this->expires;
+        }
+
+        /**
+         * Returns the image data of the captcha
+         *
+         * @return string The image data of the captcha
+         */
+        public function getImageBase64(): string
+        {
+            return $this->imageBase64;
+        }
+
+        /**
+         * Saves the image to the specified path
+         *
+         * @param string $path The path to save the image to
+         * @throws Exception If the image could not be saved
+         */
+        public function saveImage(string $path): void
+        {
+            // Check if the base64 is prefixed with html data
+            if (str_starts_with($this->imageBase64, 'data:image/jpeg;base64,'))
+            {
+                $this->imageBase64 = substr($this->imageBase64, strlen('data:image/jpeg;base64,'));
+            }
+
+            $decoded = @base64_decode($this->imageBase64);
+            if($decoded === false)
+            {
+                throw new Exception('Failed to decode base64 image');
+            }
+
+            if(file_put_contents($path, $decoded) === false)
+            {
+                throw new Exception('Failed to save image');
+            }
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): ImageCaptchaVerification
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'expires' => $this->expires,
+                'image_base64' => $this->imageBase64
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Standard/InformationField.php b/src/Socialbox/Objects/Standard/InformationField.php
new file mode 100644
index 0000000..0fc1a95
--- /dev/null
+++ b/src/Socialbox/Objects/Standard/InformationField.php
@@ -0,0 +1,53 @@
+<?php
+
+    namespace Socialbox\Objects\Standard;
+
+    use Socialbox\Enums\Types\InformationFieldName;
+    use Socialbox\Interfaces\SerializableInterface;
+
+    class InformationField implements SerializableInterface
+    {
+        private InformationFieldName $name;
+        private string $value;
+
+        public function __construct(array $data)
+        {
+            $this->name = InformationFieldName::from($data['name']);
+            $this->value = $data['value'];
+        }
+
+        /**
+         * @return InformationFieldName
+         */
+        public function getName(): InformationFieldName
+        {
+            return $this->name;
+        }
+
+        /**
+         * @return string
+         */
+        public function getValue(): string
+        {
+            return $this->value;
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): InformationField
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'name' => $this->name->value,
+                'value' => $this->value,
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Standard/InformationFieldState.php b/src/Socialbox/Objects/Standard/InformationFieldState.php
new file mode 100644
index 0000000..c4f7f41
--- /dev/null
+++ b/src/Socialbox/Objects/Standard/InformationFieldState.php
@@ -0,0 +1,83 @@
+<?php
+
+    namespace Socialbox\Objects\Standard;
+
+    use Socialbox\Enums\PrivacyState;
+    use Socialbox\Enums\Types\InformationFieldName;
+    use Socialbox\Interfaces\SerializableInterface;
+
+    class InformationFieldState implements SerializableInterface
+    {
+        private InformationFieldName $name;
+        private string $value;
+        private PrivacyState $privacyState;
+
+        /**
+         * Constructor method.
+         *
+         * @param array $data An associative array containing the keys:
+         *                    - 'name': The name of the information field.
+         *                    - 'value': The value of the information field.
+         *                    - 'privacy_state': The privacy state of the information field.
+         */
+        public function __construct(array $data)
+        {
+            $this->name = InformationFieldName::from($data['name']);
+            $this->value = $data['value'];
+            $this->privacyState = PrivacyState::from($data['privacy_state']);
+        }
+
+        /**
+         * @return InformationFieldName
+         */
+        public function getName(): InformationFieldName
+        {
+            return $this->name;
+        }
+
+        /**
+         * @return string
+         */
+        public function getValue(): string
+        {
+            return $this->value;
+        }
+
+        public function getPrivacyState(): PrivacyState
+        {
+            return $this->privacyState;
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): InformationFieldState
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'name' => $this->name->value,
+                'value' => $this->value,
+                'privacy_state' => $this->privacyState->value
+            ];
+        }
+
+        /**
+         * Converts the object to an InformationField instance.
+         *
+         * @return InformationField Returns the converted InformationField instance.
+         */
+        public function toInformationField(): InformationField
+        {
+            return new InformationField([
+                'name' => $this->name->value,
+                'value' => $this->value,
+            ]);
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Standard/KnownSigningKey.php b/src/Socialbox/Objects/Standard/KnownSigningKey.php
new file mode 100644
index 0000000..b85b6be
--- /dev/null
+++ b/src/Socialbox/Objects/Standard/KnownSigningKey.php
@@ -0,0 +1,161 @@
+<?php
+
+    namespace Socialbox\Objects\Standard;
+
+    use DateTime;
+    use InvalidArgumentException;
+    use Socialbox\Interfaces\SerializableInterface;
+
+    class KnownSigningKey implements SerializableInterface
+    {
+        private string $uuid;
+        private string $name;
+        private string $publicKey;
+        private int $expires;
+        private int $created;
+        private int $trustedOn;
+
+        /**
+         * Constructs a new instance of the class, initializing its properties using the provided data.
+         *
+         * @param array $data An associative array containing initialization data.
+         *                    Expected keys are:
+         *                    - 'uuid' (string): The unique identifier for the instance.
+         *                    - 'name' (string|null): The optional name for the instance.
+         *                    - 'public_key' (string): The public key associated with the instance.
+         *                    - 'expires' (int|DateTime): The expiration timestamp or DateTime object.
+         *                    - 'created' (int|DateTime): The creation timestamp or DateTime object.
+         *                    - 'trusted_on' (int|DateTime): The trusted on timestamp or DateTime object.
+         *
+         * @return void
+         * @throws InvalidArgumentException If 'expires' or 'created' are not valid integer timestamps or DateTime instances.
+         */
+        public function __construct(array $data)
+        {
+            $this->uuid = $data['uuid'];
+            $this->name = $data['name'];
+            $this->publicKey = $data['public_key'];
+
+            if(is_int($data['expires']))
+            {
+                $this->expires = $data['expires'];
+            }
+            elseif($data['expires'] instanceof DateTime)
+            {
+                $this->expires = $data['expires']->getTimestamp();
+            }
+            else
+            {
+                throw new InvalidArgumentException('Invalid expires value');
+            }
+
+            if(is_int($data['created']))
+            {
+                $this->created = $data['created'];
+            }
+            elseif($data['created'] instanceof DateTime)
+            {
+                $this->created = $data['created']->getTimestamp();
+            }
+            else
+            {
+                throw new InvalidArgumentException('Invalid created value');
+            }
+
+            if(is_int($data['trusted_on']))
+            {
+                $this->trustedOn = $data['trusted_on'];
+            }
+            elseif($data['trusted_on'] instanceof DateTime)
+            {
+                $this->trustedOn = $data['trusted_on']->getTimestamp();
+            }
+            else
+            {
+                throw new InvalidArgumentException('Invalid trusted_on value');
+            }
+        }
+
+        /**
+         * Retrieves the UUID associated with this instance.
+         *
+         * @return string The UUID as a string.
+         */
+        public function getUuid(): string
+        {
+            return $this->uuid;
+        }
+
+        /**
+         * Retrieves the name associated with this instance.
+         *
+         * @return string|null The name as a string, or null if not set.
+         */
+        public function getName(): ?string
+        {
+            return $this->name;
+        }
+
+        /**
+         *
+         * Retrieves the public key.
+         *
+         * @return string The public key.
+         */
+        public function getPublicKey(): string
+        {
+            return $this->publicKey;
+        }
+
+        /**
+         * Retrieves the expiration time.
+         *
+         * @return int The expiration time as an integer.
+         */
+        public function getExpires(): int
+        {
+            return $this->expires;
+        }
+
+        /**
+         *
+         * @return int The timestamp representing the creation time.
+         */
+        public function getCreated(): int
+        {
+            return $this->created;
+        }
+
+        /**
+         * Retrieves the timestamp representing the time the key was trusted.
+         *
+         * @return int The timestamp representing the time the key was trusted.
+         */
+        public function getTrustedOn(): int
+        {
+            return $this->trustedOn;
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): KnownSigningKey
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'uuid' => $this->uuid,
+                'name' => $this->name,
+                'public_key' => $this->publicKey,
+                'expires' => $this->expires,
+                'created' => $this->created,
+                'trusted_on' => $this->trustedOn
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Standard/Peer.php b/src/Socialbox/Objects/Standard/Peer.php
new file mode 100644
index 0000000..7c1f32a
--- /dev/null
+++ b/src/Socialbox/Objects/Standard/Peer.php
@@ -0,0 +1,162 @@
+<?php
+
+    namespace Socialbox\Objects\Standard;
+
+    use InvalidArgumentException;
+    use Socialbox\Enums\Flags\PeerFlags;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\Database\PeerInformationFieldRecord;
+    use Socialbox\Objects\PeerAddress;
+
+    class Peer implements SerializableInterface
+    {
+        private PeerAddress $address;
+        /**
+         * @var InformationField[]
+         */
+        private array $informationFields;
+        private array $flags;
+        private int $registered;
+
+        /**
+         * Constructor method.
+         *
+         * @param array $data An associative array containing the keys:
+         *                    - 'address': A string or an instance of PeerAddress. Used to set the address property.
+         *                    - 'display_name': The display name for the entity.
+         *                    - 'flags': Flags associated with the entity.
+         *                    - 'registered': Registration status or date for the entity.
+         *
+         * @return void
+         * @throws InvalidArgumentException If the 'address' value is neither a string nor an instance of PeerAddress.
+         */
+        public function __construct(array $data)
+        {
+            if(is_string($data['address']))
+            {
+                $this->address = PeerAddress::fromAddress($data['address']);
+            }
+            elseif($data['address'] instanceof PeerAddress)
+            {
+                $this->address = $data['address'];
+            }
+            else
+            {
+                throw new InvalidArgumentException('Invalid address value type, got type ' . gettype($data['address']));
+            }
+
+            $informationFields = [];
+            foreach($data['information_fields'] as $field)
+            {
+                if($field instanceof PeerInformationFieldRecord)
+                {
+                    $informationFields[] = $field->toInformationField();
+                }
+                elseif($field instanceof InformationFieldState)
+                {
+                    $informationFields[] = $field->toInformationField();
+                }
+                elseif(is_array($field))
+                {
+                    $informationFields[] = new InformationField($field);
+                }
+                else
+                {
+                    throw new InvalidArgumentException('Invalid information field type, got type ' . gettype($field));
+                }
+            }
+
+            $this->informationFields = $informationFields;
+
+            if(is_array($data['flags']))
+            {
+                $this->flags = [];
+                foreach($data['flags'] as $flag)
+                {
+                    if($flag instanceof PeerFlags)
+                    {
+                        $this->flags[] = $flag->value;
+                    }
+                    elseif(is_string($flag))
+                    {
+                        $this->flags[] = $flag;
+                    }
+                    else
+                    {
+                        throw new InvalidArgumentException('Invalid flag type, got type ' . gettype($flag));
+                    }
+                }
+            }
+            elseif(is_string($data['flags']))
+            {
+                $this->flags = PeerFlags::fromString($data['flags']);
+            }
+            else
+            {
+                throw new InvalidArgumentException('Invalid flags value type, got type ' . gettype($data['flags']));
+            }
+
+            $this->registered = $data['registered'];
+        }
+
+        /**
+         * Retrieves the address property.
+         *
+         * @return PeerAddress The address associated with the instance.
+         */
+        public function getPeerAddress(): PeerAddress
+        {
+            return $this->address;
+        }
+
+        /**
+         * Retrieves the information fields associated with the peer.
+         *
+         * @return InformationField[] An array containing the information fields.
+         */
+        public function getInformationFields(): array
+        {
+            return $this->informationFields;
+        }
+
+        /**
+         * Retrieves the flags associated with the entity.
+         *
+         * @return array An array containing the flags.
+         */
+        public function getFlags(): array
+        {
+            return $this->flags;
+        }
+
+        /**
+         * Retrieves the registered value.
+         *
+         * @return int The registered property value.
+         */
+        public function getRegistered(): int
+        {
+            return $this->registered;
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): Peer
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'address' => $this->address->getAddress(),
+                'information_fields' => array_map(fn($field) => $field->toArray(), $this->informationFields),
+                'flags' => $this->flags,
+                'registered' => $this->registered
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Standard/SelfUser.php b/src/Socialbox/Objects/Standard/SelfUser.php
new file mode 100644
index 0000000..bf9a3c0
--- /dev/null
+++ b/src/Socialbox/Objects/Standard/SelfUser.php
@@ -0,0 +1,151 @@
+<?php
+
+    namespace Socialbox\Objects\Standard;
+
+    use DateTime;
+    use Socialbox\Enums\Flags\PeerFlags;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\Database\PeerDatabaseRecord;
+
+    class SelfUser implements SerializableInterface
+    {
+        private string $address;
+        private string $username;
+        /**
+         * @var PeerFlags[]
+         */
+        private array $flags;
+        /**
+         * @var InformationFieldState[]
+         */
+        private array $informationFieldStates;
+        private bool $passwordEnabled;
+        private ?int $passwordLastUpdated;
+        private bool $otpEnabled;
+        private ?int $otpLastUpdated;
+        private int $registered;
+
+        /**
+         * Constructor for initializing the object with provided data.
+         *
+         * @param array $data Data array containing initial values for object properties.
+         */
+        public function __construct(array $data)
+        {
+            $this->uuid = $data['uuid'];
+            $this->enabled = $data['enabled'];
+            $this->username = $data['username'];
+            $this->address = $data['address'];
+            $this->displayName = $data['display_name'] ?? null;
+
+            if(is_string($data['flags']))
+            {
+                $this->flags = PeerFlags::fromString($data['flags']);
+            }
+            elseif(is_array($data['flags']))
+            {
+                $this->flags = $data['flags'];
+            }
+            else
+            {
+                $this->flags = [];
+            }
+
+            if($data['created'] instanceof DateTime)
+            {
+                $this->registered = $data['created']->getTimestamp();
+            }
+            else
+            {
+                $this->registered = $data['created'];
+            }
+
+            return;
+        }
+
+        /**
+         * Retrieves the UUID of the object.
+         *
+         * @return string The UUID of the object.
+         */
+        public function getUuid(): string
+        {
+            return $this->uuid;
+        }
+
+        public function isEnabled(): bool
+        {
+            return $this->enabled;
+        }
+
+        /**
+         *
+         * @return string The username of the user.
+         */
+        public function getUsername(): string
+        {
+            return $this->username;
+        }
+
+        public function getAddress(): string
+        {
+            return $this->address;
+        }
+
+        /**
+         *
+         * @return string|null The display name.
+         */
+        public function getDisplayName(): ?string
+        {
+            return $this->displayName;
+        }
+
+        /**
+         *
+         * @return array
+         */
+        public function getFlags(): array
+        {
+            return $this->flags;
+        }
+
+        /**
+         *
+         * @return int The timestamp when the object was created.
+         */
+        public function getRegistered(): int
+        {
+            return $this->registered;
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): SelfUser
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            $flags = [];
+            foreach($this->flags as $flag)
+            {
+                $flags[] = $flag->value;
+            }
+
+            return [
+                'uuid' => $this->uuid,
+                'enabled' => $this->enabled,
+                'username' => $this->username,
+                'address' => $this->address,
+                'display_name' => $this->displayName,
+                'flags' => $flags,
+                'created' => $this->registered
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Standard/ServerDocument.php b/src/Socialbox/Objects/Standard/ServerDocument.php
new file mode 100644
index 0000000..2143eb2
--- /dev/null
+++ b/src/Socialbox/Objects/Standard/ServerDocument.php
@@ -0,0 +1,76 @@
+<?php
+
+    namespace Socialbox\Objects\Standard;
+
+    use Socialbox\Interfaces\SerializableInterface;
+
+    class ServerDocument implements SerializableInterface
+    {
+        private int $lastUpdated;
+        private string $title;
+        private string $content;
+
+        /**
+         * Constructor method to initialize the object with provided data.
+         *
+         * @param array $data An associative array containing 'last_updated', 'content_type', 'title', and 'content' keys.
+         * @return void
+         */
+        public function __construct(array $data)
+        {
+            $this->lastUpdated = $data['last_updated'];
+            $this->title = $data['title'];
+            $this->content = $data['content'];
+        }
+
+        /**
+         * Retrieves the timestamp of the last update.
+         *
+         * @return int The last updated timestamp.
+         */
+        public function getLastUpdated(): int
+        {
+            return $this->lastUpdated;
+        }
+
+        /**
+         * Retrieves the title property.
+         *
+         * @return string The title value.
+         */
+        public function getTitle(): string
+        {
+            return $this->title;
+        }
+
+        /**
+         * Retrieves the content stored in the instance.
+         *
+         * @return string The content as a string.
+         */
+        public function getContent(): string
+        {
+            return $this->content;
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): object
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'last_updated' => $this->lastUpdated,
+                'content_type' => $this->contentType,
+                'title' => $this->title,
+                'content' => $this->content
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Standard/ServerInformation.php b/src/Socialbox/Objects/Standard/ServerInformation.php
new file mode 100644
index 0000000..101d33a
--- /dev/null
+++ b/src/Socialbox/Objects/Standard/ServerInformation.php
@@ -0,0 +1,75 @@
+<?php
+
+    namespace Socialbox\Objects\Standard;
+
+    use Socialbox\Interfaces\SerializableInterface;
+
+    class ServerInformation implements SerializableInterface
+    {
+        private string $serverName;
+        private int $serverKeypairExpires;
+        private string $transportEncryptionAlgorithm;
+
+        /**
+         * Constructor method to initialize the object with provided data.
+         *
+         * @param array $data The array containing initialization parameters, including 'server_name', 'server_keypair_expires', and 'transport_encryption_algorithm'.
+         * @return void
+         */
+        public function __construct(array $data)
+        {
+            $this->serverName = $data['server_name'];
+            $this->serverKeypairExpires = $data['server_keypair_expires'];
+            $this->transportEncryptionAlgorithm = $data['transport_encryption_algorithm'];
+        }
+
+        /**
+         * Retrieves the name of the server.
+         *
+         * @return string The server name.
+         */
+        public function getServerName(): string
+        {
+            return $this->serverName;
+        }
+
+        /**
+         * Retrieves the expiration time of the server key pair.
+         *
+         * @return int The expiration timestamp of the server key pair.
+         */
+        public function getServerKeypairExpires(): int
+        {
+            return $this->serverKeypairExpires;
+        }
+
+        /**
+         * Retrieves the transport encryption algorithm being used.
+         *
+         * @return string The transport encryption algorithm.
+         */
+        public function getTransportEncryptionAlgorithm(): string
+        {
+            return $this->transportEncryptionAlgorithm;
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): ServerInformation
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'server_name' => $this->serverName,
+                'server_keypair_expires' => $this->serverKeypairExpires,
+                'transport_encryption_algorithm' => $this->transportEncryptionAlgorithm,
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Standard/SessionState.php b/src/Socialbox/Objects/Standard/SessionState.php
new file mode 100644
index 0000000..735aac5
--- /dev/null
+++ b/src/Socialbox/Objects/Standard/SessionState.php
@@ -0,0 +1,199 @@
+<?php
+
+    namespace Socialbox\Objects\Standard;
+
+    use DateTime;
+    use Socialbox\Enums\Flags\SessionFlags;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Managers\RegisteredPeerManager;
+    use Socialbox\Objects\Database\SessionRecord;
+
+    class SessionState implements SerializableInterface
+    {
+        private string $uuid;
+        private string $identifiedAs;
+        private bool $authenticated;
+        /**
+         * @var SessionFlags[]|null
+         */
+        private ?array $flags;
+        private int $created;
+        private int $expires;
+
+        /**
+         * Constructor for initializing the object with the provided data.
+         *
+         * @param array $data An associative array containing the values for initializing the object.
+         *                    - 'uuid': string, Unique identifier.
+         *                    - 'identified_as': mixed, The identity information.
+         *                    - 'authenticated': bool, Whether the object is authenticated.
+         *                    - 'flags': string|null, Optional flags in
+         */
+        public function __construct(array $data)
+        {
+            $this->uuid = $data['uuid'];
+            $this->identifiedAs = $data['identified_as'];
+            $this->authenticated = $data['authenticated'];
+
+            if(is_string($data['flags']))
+            {
+                $this->flags = SessionFlags::fromString($data['flags']);
+            }
+            elseif(is_array($data['flags']))
+            {
+                $this->flags = $data['flags'];
+            }
+            else
+            {
+                $this->flags = null;
+            }
+
+            if(is_int($data['created']))
+            {
+                $this->created = $data['created'];
+            }
+            elseif($data['created'] instanceof DateTime)
+            {
+                $this->created = $data['created']->getTimestamp();
+            }
+            else
+            {
+                $this->created = time();
+            }
+
+            if(is_int($data['expires']))
+            {
+                $this->expires = $data['expires'];
+            }
+            elseif($data['expires'] instanceof DateTime)
+            {
+                $this->expires = $data['expires']->getTimestamp();
+            }
+            else
+            {
+                $this->expires = time();
+            }
+        }
+
+        /**
+         * Retrieves the UUID of the current instance.
+         *
+         * @return string The UUID as a string.
+         */
+        public function getUuid(): string
+        {
+            return $this->uuid;
+        }
+
+        /**
+         * Retrieves the identifier of the current instance.
+         *
+         * @return string The identifier as a string.
+         */
+        public function getIdentifiedAs(): string
+        {
+            return $this->identifiedAs;
+        }
+
+        /**
+         * Checks if the user is authenticated.
+         *
+         * @return bool Returns true if the user is authenticated, otherwise false.
+         */
+        public function isAuthenticated(): bool
+        {
+            return $this->authenticated;
+        }
+
+        /**
+         * Retrieves the flags associated with the current instance.
+         *
+         * @return array|null An array of flags or null if no flags are set.
+         */
+        public function getFlags(): ?array
+        {
+            return $this->flags;
+        }
+
+        /**
+         * Checks if the provided flag exists within the current flags.
+         *
+         * @param string|SessionFlags $flag The flag to check, either as a string or an instance of SessionFlags.
+         * @return bool Returns true if the flag is found in the current flags, otherwise false.
+         */
+        public function containsFlag(string|SessionFlags $flag): bool
+        {
+            if($this->flags === null || count($this->flags) === 0)
+            {
+                return false;
+            }
+
+            if($flag instanceof SessionFlags)
+            {
+                $flag = $flag->value;
+            }
+
+            return in_array($flag, $this->flags);
+        }
+
+        /**
+         * Retrieves the creation timestamp of the current instance.
+         *
+         * @return int The creation timestamp as an integer.
+         */
+        public function getCreated(): int
+        {
+            return $this->created;
+        }
+
+        /**
+         * Retrieves the expiration timestamp of the current instance.
+         *
+         * @return int The expiration timestamp as an integer.
+         */
+        public function getExpires(): int
+        {
+            return $this->expires;
+        }
+
+        /**
+         * Creates a new instance of SessionState from the provided array.
+         *
+         * @param array $data The input array containing data to initialize the SessionState instance.
+         * @return SessionState A new instance of the SessionState class.
+         */
+        public static function fromArray(array $data): SessionState
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromSessionRecord(SessionRecord $sessionRecord): SessionState
+        {
+            return new self([
+                'uuid' => $sessionRecord->getUuid(),
+                'identified_as' => RegisteredPeerManager::getPeer($sessionRecord->getPeerUuid())->getAddress(),
+                'authenticated' => $sessionRecord->isAuthenticated(),
+                'flags' => $sessionRecord->getFlags(true),
+                'created' => $sessionRecord->getCreated()->getTimestamp(),
+                'expires' => $sessionRecord->getExpires()->getTimestamp()
+            ]);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'uuid' => $this->uuid,
+                'identified_as' => $this->identifiedAs,
+                'authenticated' => $this->authenticated,
+                'flags' => $this->flags,
+                'created' => $this->created,
+                'expires' => $this->expires
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Standard/Signature.php b/src/Socialbox/Objects/Standard/Signature.php
new file mode 100644
index 0000000..4092cf6
--- /dev/null
+++ b/src/Socialbox/Objects/Standard/Signature.php
@@ -0,0 +1,174 @@
+<?php
+
+    namespace Socialbox\Objects\Standard;
+
+    use DateTime;
+    use InvalidArgumentException;
+    use Socialbox\Enums\SigningKeyState;
+    use Socialbox\Interfaces\SerializableInterface;
+    use Socialbox\Objects\Database\SigningKeyRecord;
+
+    class Signature implements SerializableInterface
+    {
+        private string $uuid;
+        private string $name;
+        private string $publicKey;
+        private SigningKeyState $state;
+        private int $expires;
+        private int $created;
+
+        /**
+         * Constructs a new instance of the class, initializing its properties using the provided data.
+         *
+         * @param array $data An associative array containing initialization data.
+         *                    Expected keys are:
+         *                    - 'uuid' (string): The unique identifier for the instance.
+         *                    - 'name' (string|null): The optional name for the instance.
+         *                    - 'public_key' (string): The public key associated with the instance.
+         *                    - 'state' (string): The state of the signing key.
+         *                    - 'expires' (int|DateTime): The expiration timestamp or DateTime object.
+         *                    - 'created' (int|DateTime): The creation timestamp or DateTime object.
+         *
+         * @return void
+         * @throws InvalidArgumentException If 'expires' or 'created' are not valid integer timestamps or DateTime instances.
+         */
+        public function __construct(array $data)
+        {
+            $this->uuid = $data['uuid'];
+            $this->name = $data['name'];
+            $this->publicKey = $data['public_key'];
+            $this->state = SigningKeyState::from($data['state']);
+
+            if(is_int($data['expires']))
+            {
+                $this->expires = $data['expires'];
+            }
+            elseif($data['expires'] instanceof DateTime)
+            {
+                $this->expires = $data['expires']->getTimestamp();
+            }
+            else
+            {
+                throw new InvalidArgumentException('Invalid expires value');
+            }
+
+            if(is_int($data['created']))
+            {
+                $this->created = $data['created'];
+            }
+            elseif($data['created'] instanceof DateTime)
+            {
+                $this->created = $data['created']->getTimestamp();
+            }
+            else
+            {
+                throw new InvalidArgumentException('Invalid created value');
+            }
+        }
+
+        /**
+         * Retrieves the UUID associated with this instance.
+         *
+         * @return string The UUID as a string.
+         */
+        public function getUuid(): string
+        {
+            return $this->uuid;
+        }
+
+        /**
+         * Retrieves the name associated with this instance.
+         *
+         * @return string|null The name as a string, or null if not set.
+         */
+        public function getName(): ?string
+        {
+            return $this->name;
+        }
+
+        /**
+         *
+         * Retrieves the public key.
+         *
+         * @return string The public key.
+         */
+        public function getPublicKey(): string
+        {
+            return $this->publicKey;
+        }
+
+        /**
+         * Retrieves the current state of the signing key.
+         *
+         * @return SigningKeyState The current state of the signing key.
+         */
+        public function getState(): SigningKeyState
+        {
+            if($this->expires > 0 && time() > $this->expires)
+            {
+                return SigningKeyState::EXPIRED;
+            }
+
+            return $this->state;
+        }
+
+        /**
+         * Retrieves the expiration time.
+         *
+         * @return int The expiration time as an integer.
+         */
+        public function getExpires(): int
+        {
+            return $this->expires;
+        }
+
+        /**
+         *
+         * @return int The timestamp representing the creation time.
+         */
+        public function getCreated(): int
+        {
+            return $this->created;
+        }
+
+        /**
+         * Creates a new SigningKey instance from a SigningKeyRecord.
+         *
+         * @param SigningKeyRecord $record The record containing the signing key data.
+         * @return Signature An instance of SigningKey populated with data from the provided record.
+         */
+        public static function fromSigningKeyRecord(SigningKeyRecord $record): Signature
+        {
+            return new self([
+                'uuid' => $record->getUuid(),
+                'name' => $record->getName(),
+                'public_key' => $record->getPublicKey(),
+                'state' => $record->getState()->value,
+                'expires' => $record->getExpires(),
+                'created' => $record->getCreated()
+            ]);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): Signature
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'uuid' => $this->uuid,
+                'name' => $this->name,
+                'public_key' => $this->publicKey,
+                'state' => $this->getState()->value,
+                'expires' => $this->expires,
+                'created' => $this->created
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Objects/Standard/TextCaptchaVerification.php b/src/Socialbox/Objects/Standard/TextCaptchaVerification.php
new file mode 100644
index 0000000..5795497
--- /dev/null
+++ b/src/Socialbox/Objects/Standard/TextCaptchaVerification.php
@@ -0,0 +1,60 @@
+<?php
+
+    namespace Socialbox\Objects\Standard;
+
+    use Socialbox\Interfaces\SerializableInterface;
+
+    class TextCaptchaVerification implements SerializableInterface
+    {
+        private int $expires;
+        private string $question;
+
+        /**
+         * ImageCaptcha constructor.
+         * @param array $data
+         */
+        public function __construct(array $data)
+        {
+            $this->expires = $data['expires'];
+            $this->question = $data['question'];
+        }
+
+        /**
+         * Returns the expiration time of the captcha
+         *
+         * @return int The expiration time of the captcha in Unix timestamp format
+         */
+        public function getExpires(): int
+        {
+            return $this->expires;
+        }
+
+        /**
+         * Returns the question of the captcha
+         *
+         * @return string The question of the captcha
+         */
+        public function getQuestion(): string
+        {
+            return $this->question;
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public static function fromArray(array $data): TextCaptchaVerification
+        {
+            return new self($data);
+        }
+
+        /**
+         * @inheritDoc
+         */
+        public function toArray(): array
+        {
+            return [
+                'expires' => $this->expires,
+                'question' => $this->question
+            ];
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Program.php b/src/Socialbox/Program.php
index 1a8be43..a73490d 100644
--- a/src/Socialbox/Program.php
+++ b/src/Socialbox/Program.php
@@ -2,11 +2,14 @@
 
     namespace Socialbox;
 
+    use LogLib2\Logger;
     use OptsLib\Parse;
     use Socialbox\Enums\CliCommands;
 
     class Program
     {
+        private static ?Logger $logger=null;
+
         /**
          * Socialbox main entry point
          *
@@ -33,7 +36,7 @@
                     return 0;
                 }
 
-                print($command->getHelpMessage());
+                print($command->getHelpMessage() . "\n");
                 return 0;
             }
 
@@ -42,6 +45,11 @@
                 return CliCommands::INITIALIZE->handle($args);
             }
 
+            if(isset($args[CliCommands::DNS_RECORD->value]))
+            {
+                return CliCommands::DNS_RECORD->handle($args);
+            }
+
             return self::displayHelp();
         }
 
@@ -68,4 +76,20 @@
 
             return 0;
         }
+
+        /**
+         * Retrieves the logger instance for the Socialbox program.
+         *
+         * @return Logger Returns the logger instance.
+         */
+        public static function getLogger(): Logger
+        {
+            if(self::$logger === null)
+            {
+                self::$logger = new Logger('net.nosial.socialbox');
+                Logger::registerHandlers();
+            }
+
+            return self::$logger;
+        }
     }
\ No newline at end of file
diff --git a/src/Socialbox/SocialClient.php b/src/Socialbox/SocialClient.php
new file mode 100644
index 0000000..a530347
--- /dev/null
+++ b/src/Socialbox/SocialClient.php
@@ -0,0 +1,1267 @@
+<?php
+
+    /** @noinspection PhpUnused */
+
+    namespace Socialbox;
+
+    use InvalidArgumentException;
+    use Socialbox\Classes\Cryptography;
+    use Socialbox\Classes\RpcClient;
+    use Socialbox\Enums\PrivacyState;
+    use Socialbox\Enums\StandardMethods;
+    use Socialbox\Enums\Status\SignatureVerificationStatus;
+    use Socialbox\Enums\Types\ContactRelationshipType;
+    use Socialbox\Enums\Types\InformationFieldName;
+    use Socialbox\Exceptions\CryptographyException;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\ResolutionException;
+    use Socialbox\Exceptions\RpcException;
+    use Socialbox\Objects\Client\EncryptionChannelInstance;
+    use Socialbox\Objects\Client\EncryptionChannelSecret;
+    use Socialbox\Objects\Client\ExportedSession;
+    use Socialbox\Objects\Client\SignatureKeyPair;
+    use Socialbox\Objects\PeerAddress;
+    use Socialbox\Objects\RpcRequest;
+    use Socialbox\Objects\Standard\Contact;
+    use Socialbox\Objects\Standard\EncryptionChannel;
+    use Socialbox\Objects\Standard\ImageCaptchaVerification;
+    use Socialbox\Objects\Standard\InformationFieldState;
+    use Socialbox\Objects\Standard\Peer;
+    use Socialbox\Objects\Standard\ServerDocument;
+    use Socialbox\Objects\Standard\SessionState;
+    use Socialbox\Objects\Standard\Signature;
+
+    class SocialClient extends RpcClient
+    {
+        /**
+         * Constructs the object from an array of data.
+         *
+         * @param string|PeerAddress $identifiedAs The address of the peer to connect to.
+         * @param string|null $server Optional. The domain of the server to connect to if different from the identified
+         * @param ExportedSession|null $exportedSession Optional. The exported session to use for communication.
+         * @throws CryptographyException If the public key is invalid.
+         * @throws DatabaseOperationException If the database operation fails.
+         * @throws ResolutionException If the domain cannot be resolved.
+         * @throws RpcException If the RPC request fails.
+         */
+        public function __construct(PeerAddress|string $identifiedAs, ?string $server=null, ?ExportedSession $exportedSession=null)
+        {
+            parent::__construct($identifiedAs, $server, $exportedSession);
+        }
+
+        /**
+         * Create a new signing keypair, sends it to the server, and saves it locally with the session so that the client
+         * can use the SigningKey pair for signing and verifying signatures in the future.
+         *
+         * This is not a server-side operation, the server only stores the public key and associates it with the peer's
+         * profile. The private key is stored locally and is never sent to the server.
+         *
+         * @param string|null $name Optional. The name of the signature
+         * @param int|null $expires Optional. The Unix timestamp of the expiration time
+         * @return string The UUID of the signature
+         * @throws CryptographyException Thrown if there was an error while generating the signing key pair
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function newSignature(?string $name=null, ?int $expires=null): string
+        {
+            $signature = Cryptography::generateSigningKeyPair();
+            $uuid = $this->settingsAddSignature($signature->getPublicKey(), $name, $expires);
+
+            $this->addSigningKey(new SignatureKeyPair([
+                'uuid' => $uuid,
+                'name' => $name,
+                'public_key' => $signature->getPublicKey(),
+                'private_key' => $signature->getPrivateKey(),
+                'expires' => $expires
+            ]));
+
+            return $uuid;
+        }
+
+        /**
+         * Creates a new encryption channel with the given peer, generates a new encryption key pair, and sends the public
+         * key to the receiving peer. The private key is stored locally and is never sent to the server.
+         *
+         * @param PeerAddress|string $receivingPeer The address of the peer to create the channel with
+         * @return string The UUID of the encryption channel
+         * @throws CryptographyException Thrown if there was an error while generating the encryption key pair
+         */
+        public function newEncryptionChannel(string|PeerAddress $receivingPeer): string
+        {
+            if($receivingPeer instanceof PeerAddress)
+            {
+                $receivingPeer = $receivingPeer->getAddress();
+            }
+
+            $encryptionKeyPair = Cryptography::generateEncryptionKeyPair();
+            $encryptionChannelUuid = $this->encryptionCreateChannel($receivingPeer, $encryptionKeyPair->getPublicKey());
+            $this->addEncryptionChannelSecret(new EncryptionChannelSecret([
+                'channel_uuid' => $encryptionChannelUuid,
+                'receiver' => $receivingPeer,
+                'local_public_encryption_key' => $encryptionKeyPair->getPublicKey(),
+                'local_private_encryption_key' => $encryptionKeyPair->getPrivateKey()
+            ]));
+
+            return $encryptionChannelUuid;
+        }
+
+        /**
+         * Waits for the encryption channel to be accepted by the receiving peer, returns True if the channel was accepted
+         * or False if the channel was not accepted within the timeout period.
+         *
+         * @param string $channelUuid The UUID of the encryption channel to wait for
+         * @param int|null $timeout Optional. The timeout period in seconds
+         * @return bool Returns True if the channel was accepted, False if the channel was not accepted within the timeout period
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function waitForEncryptionChannel(string $channelUuid, ?int $timeout=30): bool
+        {
+            if($this->getEncryptionChannelSecret($channelUuid) === null)
+            {
+                throw new InvalidArgumentException('Encryption Channel was not created with newEncryptionChannel() or defined with addEncryptionChannelSecret()');
+            }
+
+            $start = time();
+            while(true)
+            {
+                if($timeout !== null && time() - $start > $timeout)
+                {
+                    break;
+                }
+
+                $encryptionChannel = $this->encryptionGetChannel($channelUuid);
+                if($encryptionChannel->getReceivingPublicEncryptionKey() !== null)
+                {
+                    $this->getEncryptionChannelSecret($channelUuid)->setReceivingPublicEncryptionKey($encryptionChannel->getReceivingPublicEncryptionKey());
+                    return true;
+                }
+
+                sleep(1);
+            }
+
+            return false;
+        }
+
+        /**
+         * Accepts an encryption channel with the given unique universal identifier, generates a new encryption key pair,
+         * and sends the public key to the calling peer. The private key is stored locally and is never sent to the server.
+         *
+         * @param string $channelUuid The UUID of the encryption channel to accept
+         * @return bool Returns True if the channel was accepted
+         * @throws CryptographyException Thrown if there was an error while generating the encryption key pair
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function acceptEncryptionChannel(string $channelUuid): bool
+        {
+            $encryptionChannel = $this->encryptionGetChannel($channelUuid);
+            $encryptionKeyPair = Cryptography::generateEncryptionKeyPair();
+            $this->encryptionAcceptChannel($channelUuid, $encryptionKeyPair->getPublicKey());
+
+            $this->addEncryptionChannelSecret(new EncryptionChannelSecret([
+                'channel_uuid' => $channelUuid,
+                'receiver' => $encryptionChannel->getCallingPeer(),
+                'local_public_encryption_key' => $encryptionKeyPair->getPublicKey(),
+                'local_private_encryption_key' => $encryptionKeyPair->getPrivateKey(),
+                'receiving_public_encryption_key' => $encryptionChannel->getCallingPublicEncryptionKey()
+            ]));
+
+            return true;
+        }
+
+        /**
+         * Creates a new EncryptionChannelInstance object for the given channel UUID.
+         *
+         * @param string $channelUuid The UUID of the encryption channel
+         * @return EncryptionChannelInstance The EncryptionChannelInstance object
+         * @throws InvalidArgumentException Thrown if the encryption channel secret does not exist
+         */
+        public function createEncryptionChannelInstance(string $channelUuid): EncryptionChannelInstance
+        {
+            if($this->getEncryptionChannelSecret($channelUuid) === null)
+            {
+                throw new InvalidArgumentException('Encryption Channel was not created with newEncryptionChannel() or defined with addEncryptionChannelSecret()');
+            }
+
+            $encryptionChannelSecret = $this->getEncryptionChannelSecret($channelUuid);
+            return new EncryptionChannelInstance($this, $encryptionChannelSecret);
+        }
+
+        /**
+         * Adds a new peer to the AddressBook, returns True upon success or False if the contact already exists in
+         * the address book.
+         *
+         * @param PeerAddress|string $peer The address of the peer to add as a contact
+         * @param string|ContactRelationshipType|null $relationship Optional. The relationship for the peer
+         * @return bool Returns True if the contact was created, False if it already exists
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function addressBookAddContact(PeerAddress|string $peer, null|string|ContactRelationshipType $relationship=ContactRelationshipType::MUTUAL): bool
+        {
+            if($peer instanceof PeerAddress)
+            {
+                $peer = $peer->getAddress();
+            }
+
+            if($relationship instanceof ContactRelationshipType)
+            {
+                $relationship = $relationship->value;
+            }
+
+            return (bool)$this->sendRequest(
+                new RpcRequest(StandardMethods::ADDRESS_BOOK_ADD_CONTACT, parameters: [
+                    'peer' => $peer,
+                    'relationship' => $relationship?->value
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Checks if the given Peer Address exists as a contact in the address book, returns True if it exists or
+         * False otherwise.
+         *
+         * @param PeerAddress|string $peer The address of the peer to check
+         * @return bool Returns True if the contact exists, False otherwise
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function addressBookContactExists(PeerAddress|string $peer): bool
+        {
+            if($peer instanceof PeerAddress)
+            {
+                $peer = $peer->getAddress();
+            }
+
+            return (bool)$this->sendRequest(
+                new RpcRequest(StandardMethods::ADDRESS_BOOK_CONTACT_EXISTS, parameters: [
+                    'peer' => $peer
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Deletes a contact from the address book, returns True if the contact was deleted, or False if the contact
+         * does not exist.
+         *
+         * @param PeerAddress|string $peer The address of the peer to delete
+         * @return bool Returns True if the contact was deleted, False if the contact does not exist
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function addressBookDeleteContact(PeerAddress|string $peer): bool
+        {
+            if($peer instanceof PeerAddress)
+            {
+                $peer = $peer->getAddress();
+            }
+
+            return (bool)$this->sendRequest(
+                new RpcRequest(StandardMethods::ADDRESS_BOOK_DELETE_CONTACT, parameters: [
+                    'peer' => $peer
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Retrieves a contact from the address book, returns the contact as a Contact object.
+         *
+         * @param PeerAddress|string $peer The address of the peer to retrieve
+         * @return Contact The contact as a Contact object
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function addressBookGetContact(PeerAddress|string $peer): Contact
+        {
+            if($peer instanceof PeerAddress)
+            {
+                $peer = $peer->getAddress();
+            }
+
+            return new Contact($this->sendRequest(
+                new RpcRequest(StandardMethods::ADDRESS_BOOK_GET_CONTACT, parameters: [
+                    'peer' => $peer
+                ])
+            )->getResponse()->getResult());
+        }
+
+        /**
+         * Retrieves a list of contacts from the address book, returns an array of Contact objects.
+         *
+         * @param int $page Optional. The page number to retrieve
+         * @param int|null $limit Optional. The number of contacts to retrieve
+         * @return Contact[] An array of Contact objects
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function addressBookGetContacts(int $page=0, ?int $limit=null): array
+        {
+            $request = new RpcRequest(StandardMethods::ADDRESS_BOOK_GET_CONTACTS, parameters: [
+                'page' => $page,
+                'limit' => $limit
+            ]);
+
+            return array_map(fn($contact) => new Contact($contact), $this->sendRequest($request)->getResponse()->getResult());
+        }
+
+        /**
+         * Revokes a known signature associated with a peer in the address book, returns True if the signature was
+         * revoked or False if the signature does not exist.
+         *
+         * @param PeerAddress|string $peer The address of the peer to revoke the signature from
+         * @param string $signatureUuid The UUID of the signature to revoke
+         * @return bool Returns True if the signature was revoked, False if the signature does not exist
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function addressBookRevokeSignature(PeerAddress|string $peer, string $signatureUuid): bool
+        {
+            if($peer instanceof PeerAddress)
+            {
+                $peer = $peer->getAddress();
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::ADDRESS_BOOK_REVOKE_SIGNATURE, parameters: [
+                    'peer' => $peer,
+                    'signature_uuid' => $signatureUuid
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Trusts a known signature associated with a peer in the address book, returns True if the signature was trusted
+         * or False if the signature does not exist.
+         *
+         * @param PeerAddress|string $peer The address of the peer to trust the signature from
+         * @param string $signatureUuid The UUID of the signature to trust
+         * @return bool Returns True if the signature was trusted, False if the signature does not exist
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function addressBookTrustSignature(PeerAddress|string $peer, string $signatureUuid): bool
+        {
+            if($peer instanceof PeerAddress)
+            {
+                $peer = $peer->getAddress();
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::ADDRESS_BOOK_TRUST_SIGNATURE, parameters: [
+                    'peer' => $peer,
+                    'signature_uuid' => $signatureUuid
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Updates the relationship of a peer in the address book, returns True if the relationship was updated or False
+         * if the relationship does not exist.
+         *
+         * @param PeerAddress|string $peer The address of the peer to update the relationship for
+         * @param ContactRelationshipType|string $relationship The relationship to update to
+         * @return bool Returns True if the relationship was updated, False if the relationship does not exist
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function addressBookUpdateRelationship(PeerAddress|string $peer, ContactRelationshipType|string $relationship): bool
+        {
+            if($peer instanceof PeerAddress)
+            {
+                $peer = $peer->getAddress();
+            }
+
+            if($relationship instanceof ContactRelationshipType)
+            {
+                $relationship = $relationship->value;
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::ADDRESS_BOOK_UPDATE_RELATIONSHIP, parameters: [
+                    'peer' => $peer,
+                    'relationship' => $relationship
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Retrieves a list of all available methods that can be called on the server, returns an array of method names.
+         *
+         * @return string[] An array of method names
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function getAllowedMethods(): array
+        {
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::GET_ALLOWED_METHODS)
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Retrieves the authenticated peer associated with the session, returns the peer as a Peer object.
+         *
+         * @return Peer The peer as a Peer object
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function getSelf(): Peer
+        {
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::GET_SELF)
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Retrieves the session state from the server, returns the session state as a SessionState object.
+         *
+         * @return SessionState The session state as a SessionState object
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function getSessionState(): SessionState
+        {
+            return new SessionState($this->sendRequest(
+                new RpcRequest(StandardMethods::GET_SESSION_STATE)
+            )->getResponse()->getResult());
+        }
+
+        /**
+         * Pings the server to check if it is online, returns True if the server is online.
+         *
+         * @return true Returns True if the server is online
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function ping(): true
+        {
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::PING)
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Resolves a peer address to a Peer object, returns the peer as a Peer object. This is a decentralized
+         * method, meaning that the peer address can be resolved from any address even if the address doesn't
+         * belong to the server the request is being sent to.
+         *
+         * @param PeerAddress|string $peer The address of the peer to resolve
+         * @param PeerAddress|string|null $identifiedAs Optional. The address of the peer to identify as
+         * @return Peer The peer as a Peer object
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function resolvePeer(PeerAddress|string $peer, null|PeerAddress|string $identifiedAs=null): Peer
+        {
+            if($peer instanceof PeerAddress)
+            {
+                $peer = $peer->getAddress();
+            }
+
+            if($identifiedAs instanceof PeerAddress)
+            {
+                $identifiedAs = $identifiedAs->getAddress();
+            }
+
+            return new Peer($this->sendRequest(
+                new RpcRequest(StandardMethods::RESOLVE_PEER, parameters: [
+                    'peer' => $peer
+                ]), true, $identifiedAs
+            )->getResponse()->getResult());
+        }
+
+        /**
+         * Resolves a peer signature to a Signature object, returns the signature as a Signature object. This is
+         * a decentralized method, meaning that the signature can be resolved from any address even if the address
+         * doesn't belong to the server the request is being sent to.
+         *
+         * @param PeerAddress|string $peer The address of the peer to resolve the signature from
+         * @param string $signatureUuid The UUID of the signature to resolve
+         * @return Signature|null The signature as a Signature object, or null if the signature does not exist
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function resolveSignature(PeerAddress|string $peer, string $signatureUuid): ?Signature
+        {
+            if($peer instanceof PeerAddress)
+            {
+                $peer = $peer->getAddress();
+            }
+
+            $result = $this->sendRequest(
+                new RpcRequest(StandardMethods::RESOLVE_SIGNATURE, parameters: [
+                    'peer' => $peer,
+                    'signature_uuid' => $signatureUuid
+                ])
+            )->getResponse()->getResult();
+
+            if($result === null)
+            {
+                return null;
+            }
+
+            return new Signature($result);
+        }
+
+        /**
+         * Verifies signature authenticity by resolving the signature UUID and comparing the given parameters with the
+         * signature data, returns True if the signature is verified. This is a decentralized method, meaning that any
+         * signature UUID can be verified for as long as the $peer parameter is the address of the peer that created the
+         * signature.
+         *
+         * @param PeerAddress|string $peer The address of the peer to verify the signature for
+         * @param string $signatureUuid The UUID of the signature to verify
+         * @param string $signaturePublicKey The public key that was used to create the signature
+         * @param string $signature The signature to verify
+         * @param string $sha512 The SHA512 hash of the data that was signed
+         * @param int|null $signatureTime Optional. The timestamp of the signature creation time
+         * @return SignatureVerificationStatus the status of the verification
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function verifySignature(PeerAddress|string $peer, string $signatureUuid, string $signaturePublicKey, string $signature, string $sha512, ?int $signatureTime=null): SignatureVerificationStatus
+        {
+            if($peer instanceof PeerAddress)
+            {
+                $peer = $peer->getAddress();
+            }
+
+            return SignatureVerificationStatus::tryFrom($this->sendRequest(
+                new RpcRequest(StandardMethods::VERIFY_SIGNATURE, parameters: [
+                    'peer' => $peer,
+                    'signature_uuid' => $signatureUuid,
+                    'signature' => $signature,
+                    'sha512' => $sha512,
+                    'signature_time' => $signatureTime
+                ])
+            )->getResponse()->getResult()) ?? SignatureVerificationStatus::ERROR;
+        }
+
+        /**
+         * Accepts an encrypted channel using the provided public encryption key.
+         *
+         * @param string $channelUuid The UUID of the channel to accept
+         * @param string $publicEncryptionKey The public encryption key to use for the channel
+         * @param PeerAddress|string|null $identifiedAs Optional identifier for the peer (PeerAddress object, string, or null)
+         *
+         * @return bool Returns true if the channel was successfully accepted, false otherwise
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function encryptionAcceptChannel(string $channelUuid, string $publicEncryptionKey, PeerAddress|string|null $identifiedAs=null): bool
+        {
+            if($identifiedAs instanceof PeerAddress)
+            {
+                $identifiedAs = $identifiedAs->getAddress();
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::ENCRYPTION_ACCEPT_CHANNEL, parameters: [
+                    'channel_uuid' => $channelUuid,
+                    'public_encryption_key' => $publicEncryptionKey
+                ]), true, $identifiedAs
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Checks if an encryption channel exists for the given channel UUID.
+         *
+         * @param string $channelUuid The UUID of the channel to check.
+         *
+         * @return bool True if an encryption channel exists, false otherwise.
+         * @throws RpcException Thrown if there was an error with the RPC request.
+         */
+        public function encryptionChannelExists(string $channelUuid): bool
+        {
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::ENCRYPTION_CHANNEL_EXISTS, parameters: [
+                    'channel_uuid' => $channelUuid
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Acknowledges an encrypted message in a specific channel.
+         *
+         * This method is used to confirm the successful delivery and decryption of a message
+         * within an encrypted communication channel. It allows the client to signal that a
+         * particular message, identified by its UUID, has been successfully processed.
+         *
+         * @param string $channelUuid The UUID of the channel in which the message was sent.
+         * @param string $messageUuid The UUID of the message being acknowledged.
+         * @param PeerAddress|string|null $identifiedAs Optional. The peer address or identifier of the recipient acknowledging the message.
+         *                                             It can be a PeerAddress object, a string representation of the address, or null if not applicable.
+         *
+         * @return bool True if the acknowledgement was successful, false otherwise.
+         * @throws RpcException Thrown if there was an error with the RPC request.
+         */
+        public function encryptionChannelAcknowledgeMessage(string $channelUuid, string $messageUuid, PeerAddress|string|null $identifiedAs=null): bool
+        {
+            if($identifiedAs instanceof PeerAddress)
+            {
+                $identifiedAs = $identifiedAs->getAddress();
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::ENCRYPTION_CHANNEL_ACKNOWLEDGE_MESSAGE, parameters: [
+                    'channel_uuid' => $channelUuid,
+                    'message_uuid' => $messageUuid
+                ]), true, $identifiedAs
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Acknowledges messages in an encryption channel.
+         *
+         * @param string $channelUuid The UUID of the encryption channel.
+         * @param array $messageUuids An array of message UUIDs to acknowledge.
+         * @param PeerAddress|string|null $identifiedAs Optional peer address or identifier.
+         * @return array An array containing the results of the acknowledgement operation.
+         * @throws RpcException Thrown if there was an error with the RPC request.
+         */
+        public function encryptionChannelAcknowledgeMessages(string $channelUuid, array $messageUuids, PeerAddress|string|null $identifiedAs=null): array
+        {
+            if($identifiedAs instanceof PeerAddress)
+            {
+                $identifiedAs = $identifiedAs->getAddress();
+            }
+
+            return $this->sendRequests(array_map(fn($messageUuid) => new RpcRequest(StandardMethods::ENCRYPTION_CHANNEL_ACKNOWLEDGE_MESSAGE, parameters: [
+                'channel_uuid' => $channelUuid,
+                'message_uuid' => $messageUuid
+            ]), $messageUuids), $identifiedAs);
+        }
+
+        /**
+         * Rejects a message from the encryption channel
+         *
+         * @param string $channelUuid The channel UUID used for communication
+         * @param string $messageUuid The Message UUID to reject
+         * @param PeerAddress|string|null $identifiedAs Optional. The requesting peer that's rejecting this
+         * @return bool Returns True on success, False if not applicable
+         * @throws RpcException Thrown when there is an error
+         */
+        public function encryptionChannelRejectMessage(string $channelUuid, string $messageUuid, PeerAddress|string|null $identifiedAs): bool
+        {
+            if($identifiedAs instanceof PeerAddress)
+            {
+                $identifiedAs = $identifiedAs->getAddress();
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::ENCRYPTION_CHANNEL_REJECT_MESSAGE, parameters: [
+                    'channel_uuid' => $channelUuid,
+                    'message_uuid' => $messageUuid,
+                ]), true, $identifiedAs
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Sends an encrypted message to a specific channel.
+         *
+         * @param string $channelUuid The UUID of the channel to send the message to.
+         * @param string $checksum The checksum of the encrypted data for integrity verification.
+         * @param string $data The encrypted data to be sent.
+         * @param PeerAddress|string|null $identifiedAs The peer address or identifier of the sender (optional).
+         * @param string|null $messageUuid The UUID of the message (optional). If null, a UUID will be generated.
+         * @param int|null $timestamp The timestamp of the message (optional). If null, the current timestamp will be used.
+         * @return string The UUID of the sent message.
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function encryptionChannelSend(string $channelUuid, string $checksum, string $data, PeerAddress|string|null $identifiedAs=null, ?string $messageUuid=null, ?int $timestamp=null): string
+        {
+            if($identifiedAs instanceof PeerAddress)
+            {
+                $identifiedAs = $identifiedAs->getAddress();
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::ENCRYPTION_CHANNEL_SEND, parameters: [
+                    'channel_uuid' => $channelUuid,
+                    'checksum' => $checksum,
+                    'data' => $data,
+                    'uuid' => $messageUuid,
+                    'timestamp' => $timestamp
+                ]), true, $identifiedAs
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Closes an encrypted communication channel.
+         *
+         * @param string $channelUuid The UUID of the channel to close.
+         * @param PeerAddress|string|null $identifiedAs Optional identifier for the peer, either a PeerAddress object, a string representation, or null if not applicable.
+         * @return bool True if the channel was successfully closed, false otherwise.
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function encryptionCloseChannel(string $channelUuid, PeerAddress|string|null $identifiedAs=null): bool
+        {
+            if($identifiedAs instanceof PeerAddress)
+            {
+                $identifiedAs = $identifiedAs->getAddress();
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::ENCRYPTION_CLOSE_CHANNEL, parameters: [
+                    'channel_uuid' => $channelUuid
+                ]), true, $identifiedAs
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Creates an encrypted channel with the specified peer.
+         *
+         * @param string|PeerAddress $receivingPeer The peer to create the channel with. Can be a PeerAddress object or a string representation of the peer's address.
+         * @param string $publicEncryptionKey The public encryption key to use for the channel.
+         * @param string|null $channelUuid Optional UUID for the channel. If null, a UUID will be generated.
+         * @param PeerAddress|string|null $identifiedAs Optional peer address or string to identify the channel as.
+         * @return string The UUID of the created channel.
+         * @throws RpcException Thrown if there was an error with the RPC requests
+         */
+        public function encryptionCreateChannel(string|PeerAddress $receivingPeer, string $publicEncryptionKey, ?string $channelUuid=null, PeerAddress|string|null $identifiedAs=null): string
+        {
+            if($receivingPeer instanceof PeerAddress)
+            {
+                $receivingPeer = $receivingPeer->getAddress();
+            }
+
+            if($identifiedAs instanceof PeerAddress)
+            {
+                $identifiedAs = $identifiedAs->getAddress();
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::ENCRYPTION_CREATE_CHANNEL, parameters: [
+                    'receiving_peer' => $receivingPeer,
+                    'public_encryption_key' => $publicEncryptionKey,
+                    'channel_uuid' => $channelUuid
+                ]), true, $identifiedAs
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Declines an encryption channel request.
+         *
+         * @param string $channelUuid The UUID of the channel to decline.
+         * @param PeerAddress|string|null $identifiedAs The peer address or identifier of the peer that initiated the channel request.
+         * @return bool True if the channel decline was successful, false otherwise.
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function encryptionDeclineChannel(string $channelUuid, PeerAddress|string|null $identifiedAs=null): bool
+        {
+            if($identifiedAs instanceof PeerAddress)
+            {
+                $identifiedAs = $identifiedAs->getAddress();
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::ENCRYPTION_DECLINE_CHANNEL, parameters: [
+                    'channel_uuid' => $channelUuid
+                ]), true, $identifiedAs
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Retrieves an encryption channel by its UUID.
+         *
+         * @param string $channelUuid The UUID of the encryption channel to retrieve.
+         * @return EncryptionChannel The EncryptionChannel object associated with the given UUID.
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function encryptionGetChannel(string $channelUuid): EncryptionChannel
+        {
+            return new EncryptionChannel($this->sendRequest(
+                new RpcRequest(StandardMethods::ENCRYPTION_GET_CHANNEL, parameters: [
+                    'channel_uuid' => $channelUuid
+                ])
+            )->getResponse()->getResult());
+        }
+
+        /**
+         * Accepts the community guidelines, returns True if the guidelines were accepted.
+         *
+         * @return true Returns True if the guidelines were accepted
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function acceptCommunityGuidelines(): true
+        {
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::ACCEPT_COMMUNITY_GUIDELINES)
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Accepts the privacy policy, returns True if the privacy policy was accepted.
+         *
+         * @return true Returns True if the privacy policy was accepted
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function acceptPrivacyPolicy(): bool
+        {
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::ACCEPT_PRIVACY_POLICY)
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Accepts the terms of service, returns True if the terms of service were accepted.
+         *
+         * @return true Returns True if the terms of service were accepted
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function acceptTermsOfService(): bool
+        {
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::ACCEPT_TERMS_OF_SERVICE)
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Retrieves the community guidelines, returns the guidelines as a ServerDocument object.
+         *
+         * @return ServerDocument The guidelines as a ServerDocument object
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function getCommunityGuidelines(): ServerDocument
+        {
+            return new ServerDocument($this->sendRequest(
+                new RpcRequest(StandardMethods::GET_COMMUNITY_GUIDELINES)
+            )->getResponse()->getResult());
+        }
+
+        /**
+         * Retrieves the privacy policy, returns the policy as a ServerDocument object.
+         *
+         * @return ServerDocument The policy as a ServerDocument object
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function getPrivacyPolicy(): ServerDocument
+        {
+            return new ServerDocument($this->sendRequest(
+                new RpcRequest(StandardMethods::GET_PRIVACY_POLICY)
+            )->getResponse()->getResult());
+        }
+
+        /**
+         * Retrieves the terms of service, returns the terms as a ServerDocument object.
+         *
+         * @return ServerDocument The terms as a ServerDocument object
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function getTermsOfService(): ServerDocument
+        {
+            return new ServerDocument($this->sendRequest(
+                new RpcRequest(StandardMethods::GET_TERMS_OF_SERVICE)
+            )->getResponse()->getResult());
+        }
+
+        /**
+         * Adds a new information field to the peer's profile, returns True if the field was added.
+         *
+         * @param InformationFieldName|string $field The name of the field to add
+         * @param string $value The value of the field
+         * @param PrivacyState|string|null $privacy Optional. The privacy state of the field
+         * @return bool Returns True if the field was added
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function settingsAddInformationField(InformationFieldName|string $field, string $value, null|PrivacyState|string $privacy): bool
+        {
+            if($field instanceof InformationFieldName)
+            {
+                $field = $field->value;
+            }
+
+            if($privacy instanceof PrivacyState)
+            {
+                $privacy = $privacy->value;
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::SETTINGS_ADD_INFORMATION_FIELD, parameters: [
+                    'field' => $field,
+                    'value' => $value,
+                    'privacy' => $privacy
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Adds a new public signature to the peer's profile, returns the UUID of the signature.
+         *
+         * @param string $publicKey The public key of the signature
+         * @param string|null $name Optional. The name of the signature
+         * @param int|null $expires Optional. The expiration time of the signature
+         * @return string The UUID of the signature
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function settingsAddSignature(string $publicKey, ?string $name=null, ?int $expires=null): string
+        {
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::SETTINGS_ADD_SIGNATURE, parameters: [
+                    'public_key' => $publicKey,
+                    'name' => $name,
+                    'expires' => $expires
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Deletes an information field from the peer's profile, returns True if the field was deleted.
+         *
+         * @param InformationFieldName|string $field The name of the field to delete
+         * @return bool Returns True if the field was deleted
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function settingsDeleteInformationField(InformationFieldName|string $field): bool
+        {
+            if($field instanceof InformationFieldName)
+            {
+                $field = $field->value;
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::SETTINGS_DELETE_INFORMATION_FIELD, parameters: [
+                    'field' => $field
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Deletes the OTP from the peer's profile, returns True if the OTP was deleted.
+         *
+         * @param string|null $password Optional. Required if a password is set, this is used to verify the operation
+         * @param bool $hash Optional. Whether to hash the password
+         * @return bool Returns True if the OTP was deleted
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function settingsDeleteOtp(?string $password=null, bool $hash=true): bool
+        {
+            if($hash && $password != null)
+            {
+                $password = hash('sha512', $password);
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::SETTINGS_DELETE_OTP, parameters: [
+                    'password' => $password
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Deletes the password from the peer's profile, returns True if the password was deleted.
+         *
+         * @return bool Returns True if the password was deleted
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function settingsDeletePassword(): bool
+        {
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::SETTINGS_DELETE_PASSWORD)
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Deletes a signature from the peer's profile, returns True if the signature was deleted.
+         *
+         * @param string $uuid The UUID of the signature to delete
+         * @return bool Returns True if the signature was deleted
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function settingsDeleteSignature(string $uuid): bool
+        {
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::SETTINGS_DELETE_SIGNATURE, parameters: [
+                    'uuid' => $uuid
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Retrieves the value of an information field from the peer's profile, returns the value of the field as an
+         * InformationFieldState object.
+         *
+         * @param InformationFieldName|string $field The name of the field to retrieve
+         * @return InformationFieldState The value of the field as an InformationFieldState object
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function settingsGetInformationField(InformationFieldName|string $field): InformationFieldState
+        {
+            if($field instanceof InformationFieldName)
+            {
+                $field = $field->value;
+            }
+
+            return new InformationFieldState($this->sendRequest(
+                new RpcRequest(StandardMethods::SETTINGS_GET_INFORMATION_FIELD, parameters: [
+                    'field' => $field
+                ])
+            )->getResponse()->getResult());
+        }
+
+        /**
+         * Retrieves a list of information fields from the peer's profile, returns an array of InformationFieldState objects.
+         *
+         * @return InformationFieldState[] An array of InformationFieldState objects
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function settingsGetInformationFields(): array
+        {
+            return array_map(fn($informationFieldState) => new InformationFieldState($informationFieldState), $this->sendRequest(
+                new RpcRequest(StandardMethods::SETTINGS_GET_INFORMATION_FIELDS)
+            )->getResponse()->getResult());
+        }
+
+        /**
+         * Returns the existing Signature of a signature UUID associated with the peer's profile
+         *
+         * @param string $uuid The UUID of the signature to retrieve
+         * @return Signature The Signature object
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function settingsGetSignature(string $uuid): Signature
+        {
+            return new Signature($this->sendRequest(
+                new RpcRequest(StandardMethods::SETTINGS_GET_SIGNATURE, parameters: [
+                    'uuid' => $uuid
+                ])
+            )->getResponse()->getResult());
+        }
+
+        /**
+         * Retrieves a list of public signatures from the peer's profile, returns an array of Signature objects.
+         *
+         * @return Signature[] An array of Signature objects
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function settingsGetSignatures(): array
+        {
+            return array_map(fn($signatures) => new Signature($signatures), $this->sendRequest(
+                new RpcRequest(StandardMethods::SETTINGS_GET_INFORMATION_FIELDS)
+            )->getResponse()->getResult());
+        }
+
+        /**
+         * Checks if an information field exists in the peer's profile, returns True if the field exists.
+         *
+         * @param InformationFieldName|string $field The name of the field to check
+         * @return bool Returns True if the field exists
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function settingsInformationFieldExists(InformationFieldName|string $field): bool
+        {
+            if($field instanceof InformationFieldName)
+            {
+                $field = $field->value;
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::SETTINGS_INFORMATION_FIELD_EXISTS, parameters: [
+                    'field' => $field
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Sets the OTP for the peer's profile, returns True if the OTP was set.
+         *
+         * @param string|null $password Optional. If a password is set to the account, this is used to verify the operation
+         * @param bool $hash Optional. Whether to hash the password
+         * @return string Returns True if the OTP was set
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function settingsSetOtp(?string $password=null, bool $hash=true): string
+        {
+            if($hash && $password != null)
+            {
+                $password = hash('sha512', $password);
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::SETTINGS_SET_OTP, parameters: [
+                    'password' => $password
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Sets the password for the peer's profile, returns True if the password was set.
+         *
+         * @param string $password The password to set
+         * @param bool $hash Optional. Whether to hash the password
+         * @return bool Returns True if the password was set
+         * @throws CryptographyException Thrown if there was an error while hashing the password
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function settingsSetPassword(string $password, bool $hash=true): bool
+        {
+            if($hash)
+            {
+                $password = Cryptography::hashPassword($password);
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::SETTINGS_SET_PASSWORD, parameters: [
+                    'password' => $password
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Checks if a signature exists in the peer's profile, returns True if the signature exists.
+         *
+         * @param string $uuid The UUID of the signature to check for it's existence
+         * @return bool Returns True if the signature exists, False otherwise
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function settingsSignatureExists(string $uuid): bool
+        {
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::SETTINGS_SIGNATURE_EXISTS, parameters: [
+                    'uuid' => $uuid
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Updates the value of an information field in the peer's profile, returns True if the field was updated.
+         *
+         * @param InformationFieldName|string $field The name of the field to update
+         * @param string $value The value to update the field to
+         * @return bool Returns True if the field was updated
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function settingsUpdateInformationField(InformationFieldName|string $field, string $value): bool
+        {
+            if($field instanceof InformationFieldName)
+            {
+                $field = $field->value;
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::SETTINGS_UPDATE_INFORMATION_FIELD, parameters: [
+                    'field' => $field,
+                    'value' => $value,
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Updates the privacy of an information field in the peer's profile, returns True if the field was updated.
+         *
+         * @param InformationFieldName|string $field The name of the field to update
+         * @param PrivacyState|string $privacy The privacy state to update the field to
+         * @return bool Returns True if the field was updated
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function settingsUpdateInformationPrivacy(InformationFieldName|string $field, PrivacyState|string $privacy): bool
+        {
+            if($field instanceof InformationFieldName)
+            {
+                $field = $field->value;
+            }
+
+            if($privacy instanceof PrivacyState)
+            {
+                $privacy = $privacy->value;
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::SETTINGS_UPDATE_INFORMATION_PRIVACY, parameters: [
+                    'field' => $field,
+                    'privacy' => $privacy
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Updates the existing password configuration on the account, requires the existing password to verify
+         * the operation. Returns True upon success
+         *
+         * @param string $password The new password to set
+         * @param string $existingPassword The existing password already tied to the account
+         * @param bool $hash If True, the password inputs will be hashed, false will be sent as is.
+         * @return bool Returns True if the password was updated successfully
+         * @throws CryptographyException Thrown if there was an error while hashing the passwords
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function settingsUpdatePassword(string $password, string $existingPassword, bool $hash=true): bool
+        {
+            if($hash)
+            {
+                $existingPassword = hash('sha512', $password);
+                $password = Cryptography::hashPassword($password);
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::SETTINGS_UPDATE_PASSWORD, parameters: [
+                    'password' => $password,
+                    'existing_password' => $existingPassword
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Submits an answer for an image captcha problem, returns True if the answer is correct, False otherwise
+         *
+         * @param string $answer The answer for the captcha
+         * @return bool Returns True if the answer is correct, False otherwise.
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function verificationAnswerImageCaptcha(string $answer): bool
+        {
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::VERIFICATION_ANSWER_IMAGE_CAPTCHA, parameters: [
+                    'answer' => $answer
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Authenticates the verification process, returns True if the authentication is successful.
+         * This method is usually used for server-to-server communication.
+         *
+         * @return bool Returns True if the authentication is successful
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function verificationAuthenticate(): bool
+        {
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::VERIFICATION_AUTHENTICATE)
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Retrieves an image captcha problem, returns the problem as an ImageCaptchaVerification object.
+         *
+         * @return ImageCaptchaVerification The problem as an ImageCaptchaVerification object
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function verificationGetImageCaptcha(): ImageCaptchaVerification
+        {
+            return new ImageCaptchaVerification($this->sendRequest(
+                new RpcRequest(StandardMethods::VERIFICATION_GET_IMAGE_CAPTCHA)
+            )->getResponse()->getResult());
+        }
+
+        /**
+         * Verifies a one-time password (OTP) authentication code, returns True if the code is correct, False otherwise.
+         *
+         * @param int $code The OTP code to verify
+         * @return bool Returns True if the code is correct, False otherwise
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function verificationOtpAuthentication(int $code): bool
+        {
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::VERIFICATION_OTP_AUTHENTICATION, parameters: [
+                    'code' => $code
+                ])
+            )->getResponse()->getResult();
+        }
+
+        /**
+         * Verifies a password authentication, returns True if the password is correct, False otherwise.
+         *
+         * @param string $password The password to verify
+         * @param bool $hash Optional. Whether to hash the password
+         * @return bool Returns True if the password is correct, False otherwise
+         * @throws RpcException Thrown if there was an error with the RPC request
+         */
+        public function verificationPasswordAuthentication(string $password, bool $hash=true): bool
+        {
+            if($hash)
+            {
+                $password = hash('sha512', $password);
+            }
+
+            return $this->sendRequest(
+                new RpcRequest(StandardMethods::VERIFICATION_PASSWORD_AUTHENTICATION, parameters: [
+                    'password' => $password
+                ])
+            )->getResponse()->getResult();
+        }
+    }
\ No newline at end of file
diff --git a/src/Socialbox/Socialbox.php b/src/Socialbox/Socialbox.php
index 7b4e1b6..4ca8a23 100644
--- a/src/Socialbox/Socialbox.php
+++ b/src/Socialbox/Socialbox.php
@@ -3,80 +3,1216 @@
     namespace Socialbox;
 
     use Exception;
+    use InvalidArgumentException;
     use Socialbox\Classes\Configuration;
-    use Socialbox\Classes\RpcHandler;
+    use Socialbox\Classes\Cryptography;
+    use Socialbox\Classes\DnsHelper;
+    use Socialbox\Classes\Logger;
+    use Socialbox\Classes\ServerResolver;
     use Socialbox\Classes\Utilities;
+    use Socialbox\Classes\Validator;
+    use Socialbox\Enums\Flags\PeerFlags;
+    use Socialbox\Enums\PrivacyState;
+    use Socialbox\Enums\ReservedUsernames;
+    use Socialbox\Enums\SessionState;
     use Socialbox\Enums\StandardError;
+    use Socialbox\Enums\StandardHeaders;
     use Socialbox\Enums\StandardMethods;
+    use Socialbox\Enums\Status\SignatureVerificationStatus;
+    use Socialbox\Enums\Types\ContactRelationshipType;
+    use Socialbox\Enums\Types\InformationFieldName;
+    use Socialbox\Enums\Types\RequestType;
+    use Socialbox\Exceptions\CryptographyException;
+    use Socialbox\Exceptions\DatabaseOperationException;
+    use Socialbox\Exceptions\RequestException;
+    use Socialbox\Exceptions\ResolutionException;
     use Socialbox\Exceptions\RpcException;
-    use Socialbox\Exceptions\StandardException;
+    use Socialbox\Exceptions\Standard\StandardRpcException;
+    use Socialbox\Managers\ContactManager;
+    use Socialbox\Managers\ExternalSessionManager;
+    use Socialbox\Managers\PeerInformationManager;
+    use Socialbox\Managers\RegisteredPeerManager;
+    use Socialbox\Managers\SessionManager;
+    use Socialbox\Managers\SigningKeysManager;
+    use Socialbox\Objects\ClientRequest;
+    use Socialbox\Objects\PeerAddress;
+    use Socialbox\Objects\Standard\InformationField;
+    use Socialbox\Objects\Standard\Peer;
+    use Socialbox\Objects\Standard\ServerInformation;
+    use Socialbox\Objects\Standard\Signature;
+    use Throwable;
 
     class Socialbox
     {
-        public static function handleRpc(): void
+        /**
+         * Handles incoming client requests by parsing request headers, determining the request type,
+         * and routing the request to the appropriate handler method. Implements error handling for
+         * missing or invalid request types.
+         *
+         * @return void
+         */
+        public static function handleRequest(): void
         {
-            try
+            $requestHeaders = Utilities::getRequestHeaders();
+            if(!isset($requestHeaders[StandardHeaders::REQUEST_TYPE->value]))
             {
-                $clientRequest = RpcHandler::getClientRequest();
-            }
-            catch(RpcException $e)
-            {
-                http_response_code($e->getCode());
-                print($e->getMessage());
+                self::returnError(400, StandardError::BAD_REQUEST, 'Missing required header: ' . StandardHeaders::REQUEST_TYPE->value);
                 return;
             }
 
-            $results = [];
-            foreach($clientRequest->getRequests() as $rpcRequest)
+            $clientRequest = new ClientRequest($requestHeaders, file_get_contents('php://input') ?? null);
+
+            // Handle the request type, only `init` and `dhe` are not encrypted using the session's encrypted key
+            // RPC Requests must be encrypted and signed by the client, vice versa for server responses.
+            try
             {
-                $method = StandardMethods::tryFrom($rpcRequest->getMethod());
+                switch($clientRequest->getRequestType())
+                {
+                    case RequestType::PING:
+                        self::handlePingRequest();
+                        break;
 
-                if($method === false)
-                {
-                    $response = $rpcRequest->produceError(StandardError::RPC_METHOD_NOT_FOUND, 'The requested method does not exist');
+                    case RequestType::INFO:
+                        self::handleInformationRequest();
+                        break;
+
+                    case RequestType::INITIATE_SESSION:
+                        self::handleInitiateSession($clientRequest);
+                        break;
+
+                    case RequestType::DHE_EXCHANGE:
+                        self::handleDheExchange($clientRequest);
+                        break;
+
+                    case RequestType::RPC:
+                        self::handleRpc($clientRequest);
+                        break;
+
+                    default:
+                        self::returnError(400, StandardError::BAD_REQUEST, 'Invalid Request-Type header');
                 }
-                else
+            }
+            catch(Exception $e)
+            {
+                self::returnError(500, StandardError::INTERNAL_SERVER_ERROR, 'An internal error occurred while processing the request', $e);
+            }
+
+        }
+
+        /**
+         * Handles an incoming ping request by sending a successful HTTP response.
+         *
+         * @return void
+         */
+        private static function handlePingRequest(): void
+        {
+            http_response_code(200);
+            header('Content-Type: text/plain');
+            print('OK');
+        }
+
+        /**
+         * Handles an information request by setting the appropriate HTTP response code,
+         * content type headers, and printing the server information in JSON format.
+         *
+         * @return void
+         */
+        private static function handleInformationRequest(): void
+        {
+            http_response_code(200);
+            header('Content-Type: application/json');
+            Logger::getLogger()->info(json_encode(self::getServerInformation()->toArray(), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+            print(json_encode(self::getServerInformation()->toArray(), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+        }
+
+        /**
+         * Validates the initial headers of a client request to ensure all required headers exist
+         * and contain valid values. If any validation fails, an error response is returned.
+         *
+         * @param ClientRequest $clientRequest The client request containing headers to be validated.
+         * @return bool Returns true if all required headers are valid, otherwise false.
+         */
+        private static function validateInitHeaders(ClientRequest $clientRequest): bool
+        {
+            if(!$clientRequest->getClientName())
+            {
+                self::returnError(400, StandardError::BAD_REQUEST, 'Missing required header: ' . StandardHeaders::CLIENT_NAME->value);
+                return false;
+            }
+
+            if(!$clientRequest->getClientVersion())
+            {
+                self::returnError(400, StandardError::BAD_REQUEST, 'Missing required header: ' . StandardHeaders::CLIENT_VERSION->value);
+                return false;
+            }
+
+            if(!$clientRequest->headerExists(StandardHeaders::ENCRYPTION_PUBLIC_KEY))
+            {
+                self::returnError(400, StandardError::BAD_REQUEST, 'Missing required header: ' . StandardHeaders::ENCRYPTION_PUBLIC_KEY->value);
+                return false;
+            }
+
+            if(!$clientRequest->headerExists(StandardHeaders::IDENTIFY_AS))
+            {
+                self::returnError(400, StandardError::BAD_REQUEST, 'Missing required header: ' . StandardHeaders::IDENTIFY_AS->value);
+                return false;
+            }
+
+            if(!Validator::validatePeerAddress($clientRequest->getHeader(StandardHeaders::IDENTIFY_AS)))
+            {
+                self::returnError(400, StandardError::BAD_REQUEST, 'Invalid Identify-As header: ' . $clientRequest->getHeader(StandardHeaders::IDENTIFY_AS));
+                return false;
+            }
+
+            if(!$clientRequest->getIdentifyAs()->isExternal() && !$clientRequest->headerExists(StandardHeaders::SIGNING_PUBLIC_KEY))
+            {
+                self::returnError(400, StandardError::BAD_REQUEST, 'Missing required header: ' . StandardHeaders::SIGNING_PUBLIC_KEY->value);
+                return false;
+            }
+
+            return true;
+        }
+
+        /**
+         * Handles the initiation of a session for a client request. This involves validating headers,
+         * verifying peer identities, resolving domains, registering peers if necessary, and finally
+         * creating a session while providing the required session UUID as a response.
+         *
+         * @param ClientRequest $clientRequest The incoming client request containing all necessary headers
+         *                                      and identification information required to initiate the session.
+         * @return void
+         */
+        private static function handleInitiateSession(ClientRequest $clientRequest): void
+        {
+            // This is only called for the `init` request type
+            if(!self::validateInitHeaders($clientRequest))
+            {
+                return;
+            }
+
+            // We always accept the client's public key at first
+            $clientPublicSigningKey = $clientRequest->getHeader(StandardHeaders::SIGNING_PUBLIC_KEY);
+            $clientPublicEncryptionKey = $clientRequest->getHeader(StandardHeaders::ENCRYPTION_PUBLIC_KEY);
+
+            // If the peer is identifying as the same domain
+            if($clientRequest->getIdentifyAs()->getDomain() === Configuration::getInstanceConfiguration()->getDomain())
+            {
+                // Prevent the peer from identifying as the host unless it's coming from an external domain
+               if($clientRequest->getIdentifyAs()->getUsername() === ReservedUsernames::HOST->value)
+               {
+                   self::returnError(403, StandardError::FORBIDDEN, 'Forbidden: Not allowed to identify as the host');
+                   return;
+               }
+            }
+            // If the peer is identifying as an external domain
+            else
+            {
+                // Only allow the host to identify as a host
+                if($clientRequest->getIdentifyAs()->getUsername() !== ReservedUsernames::HOST->value)
                 {
-                    try
-                    {
-                        $response = $method->execute($clientRequest, $rpcRequest);
-                    }
-                    catch(StandardException $e)
-                    {
-                        $response = $e->produceError($rpcRequest);
-                    }
-                    catch(Exception $e)
-                    {
-                        var_dump($e);
-                        if(Configuration::getConfiguration()['security']['display_internal_exceptions'])
-                        {
-                            $response = $rpcRequest->produceError(StandardError::INTERNAL_SERVER_ERROR, Utilities::throwableToString($e));
-                        }
-                        else
-                        {
-                            $response = $rpcRequest->produceError(StandardError::INTERNAL_SERVER_ERROR);
-                        }
-                    }
+                    self::returnError(403, StandardError::FORBIDDEN, 'Forbidden: Any external peer must identify as the host, only the host can preform actions on behalf of it\'s peers');
+                    return;
                 }
 
-                if($response !== null)
+                try
                 {
-                    $results[] = $response->toArray();
+                    // We need to obtain the public key of the host, since we can't trust the client (Use database)
+                    $resolvedServer = ServerResolver::resolveDomain($clientRequest->getIdentifyAs()->getDomain());
+
+                    // Override the public signing key with the resolved server's public key
+                    // Encryption key can be left as is.
+                    $clientPublicSigningKey = $resolvedServer->getPublicSigningKey();
+                }
+                catch (Exception $e)
+                {
+                    self::returnError(502, StandardError::RESOLUTION_FAILED, 'Conflict: Failed to resolve incoming host, ' . $e->getMessage(), $e);
+                    return;
                 }
             }
 
+            try
+            {
+                // Check if we have a registered peer with the same address
+                $registeredPeer = RegisteredPeerManager::getPeerByAddress($clientRequest->getIdentifyAs());
+
+                // If the peer is registered, check if it is enabled
+                if($registeredPeer !== null && !$registeredPeer->isEnabled())
+                {
+                    // Refuse to create a session if the peer is disabled/banned, this usually happens when
+                    // a peer gets banned or more commonly when a client attempts to register as this peer but
+                    // destroyed the session before it was created.
+                    // This is to prevent multiple sessions from being created for the same peer, this is cleaned up
+                    // with a cron job using `socialbox clean-sessions`
+                    self::returnError(403, StandardError::FORBIDDEN, 'Unauthorized: The requested peer is disabled/banned');
+                    return;
+                }
+
+                // If-clause for handling the host peer, host peers are always enabled unless the fist clause is true
+                // in which case the host was blocked by this server.
+                if($clientRequest->getIdentifyAs()->getUsername() === ReservedUsernames::HOST->value)
+                {
+                    // If the host is not registered, register it
+                    if($registeredPeer === null)
+                    {
+                        $peerUuid = RegisteredPeerManager::createPeer(PeerAddress::fromAddress($clientRequest->getHeader(StandardHeaders::IDENTIFY_AS)));
+                        RegisteredPeerManager::enablePeer($peerUuid);
+                        $registeredPeer = RegisteredPeerManager::getPeer($peerUuid);
+                    }
+                }
+
+                if($registeredPeer === null)
+                {
+                    // Check if registration is enabled
+                    if(!Configuration::getRegistrationConfiguration()->isRegistrationEnabled())
+                    {
+                        self::returnError(401, StandardError::UNAUTHORIZED, 'Unauthorized: Registration is disabled');
+                        return;
+                    }
+
+                    // Register the peer if it is not already registered
+                    $peerUuid = RegisteredPeerManager::createPeer(PeerAddress::fromAddress($clientRequest->getHeader(StandardHeaders::IDENTIFY_AS)));
+                    // Retrieve the peer object
+                    $registeredPeer = RegisteredPeerManager::getPeer($peerUuid);
+                }
+
+                // Generate server's encryption keys for this session
+                $serverEncryptionKeyPair = Cryptography::generateEncryptionKeyPair();
+
+                // Create the session passing on the registered peer, client name, version, and public keys
+                $sessionUuid = SessionManager::createSession(
+                    peer: $registeredPeer,
+                    clientName: $clientRequest->getClientName(),
+                    clientVersion: $clientRequest->getClientVersion(),
+                    clientPublicSigningKey: $clientPublicSigningKey,
+                    clientPublicEncryptionKey: $clientPublicEncryptionKey,
+                    serverEncryptionKeyPair: $serverEncryptionKeyPair
+                );
+            }
+            catch(InvalidArgumentException $e)
+            {
+                // This is usually thrown due to an invalid input
+                self::returnError(400, StandardError::BAD_REQUEST, $e->getMessage(), $e);
+                return;
+            }
+            catch(Exception $e)
+            {
+                self::returnError(500, StandardError::INTERNAL_SERVER_ERROR, 'An internal error occurred while initiating the session', $e);
+                return;
+            }
+
+            // The server responds back with the session UUID & The server's public encryption key as the header
+            http_response_code(201); // Created
+            header('Content-Type: text/plain');
+            header(StandardHeaders::ENCRYPTION_PUBLIC_KEY->value . ': ' . $serverEncryptionKeyPair->getPublicKey());
+            print($sessionUuid); // Return the session UUID
+        }
+
+        /**
+         * Handles the Diffie-Hellman Ephemeral (DHE) key exchange process between the client and server,
+         * ensuring secure transport encryption key negotiation. The method validates request headers,
+         * session state, and cryptographic operations, and updates the session with the resulting keys
+         * and state upon successful negotiation.
+         *
+         * @param ClientRequest $clientRequest The request object containing headers, body, and session details
+         *                                     required to perform the DHE exchange.
+         *
+         * @return void
+         * @throws CryptographyException
+         */
+        private static function handleDheExchange(ClientRequest $clientRequest): void
+        {
+            // Check if the session UUID is set in the headers, bad request if not
+            if(!$clientRequest->headerExists(StandardHeaders::SESSION_UUID))
+            {
+                self::returnError(400, StandardError::BAD_REQUEST, 'Missing required header: ' . StandardHeaders::SESSION_UUID->value);
+                return;
+            }
+
+            if(!$clientRequest->headerExists(StandardHeaders::SIGNATURE))
+            {
+                self::returnError(400, StandardError::BAD_REQUEST, 'Missing required header: ' . StandardHeaders::SIGNATURE->value);
+                return;
+            }
+
+            if(empty($clientRequest->getHeader(StandardHeaders::SIGNATURE)))
+            {
+                self::returnError(400, StandardError::BAD_REQUEST, 'Bad request: The signature is empty');
+                return;
+            }
+
+            // Check if the request body is empty, bad request if so
+            if(empty($clientRequest->getRequestBody()))
+            {
+                self::returnError(400, StandardError::BAD_REQUEST, 'Bad request: The key exchange request body is empty');
+                return;
+            }
+
+            try
+            {
+                $session = $clientRequest->getSession();
+            }
+            catch (DatabaseOperationException $e)
+            {
+                self::returnError(500, StandardError::INTERNAL_SERVER_ERROR, 'Failed to retrieve session', $e);
+                return;
+            }
+
+            if($session === null)
+            {
+                self::returnError(404, StandardError::SESSION_NOT_FOUND, 'Session not found');
+                return;
+            }
+
+            // Check if the session is awaiting a DHE exchange, forbidden if not
+            if($session->getState() !== SessionState::AWAITING_DHE)
+            {
+                self::returnError(403, StandardError::FORBIDDEN, 'Bad request: The session is not awaiting a DHE exchange');
+                return;
+            }
+
+
+            // DHE STAGE: CLIENT -> SERVER
+            // Server & Client: Begin the DHE exchange using the exchanged public keys.
+            // On the client's side, same method but with the server's public key & client's private key
+            try
+            {
+                $sharedSecret = Cryptography::performDHE($session->getClientPublicEncryptionKey(), $session->getServerPrivateEncryptionKey());
+            }
+            catch (CryptographyException $e)
+            {
+                Logger::getLogger()->error('Failed to perform DHE exchange', $e);
+                self::returnError(422, StandardError::CRYPTOGRAPHIC_ERROR, 'DHE exchange failed', $e);
+                return;
+            }
+
+            // STAGE 1: CLIENT -> SERVER
+            try
+            {
+                // Attempt to decrypt the encrypted key passed on from the client using the shared secret
+                $clientTransportEncryptionKey = Cryptography::decryptShared($clientRequest->getRequestBody(), $sharedSecret);
+            }
+            catch (CryptographyException $e)
+            {
+                self::returnError(400, StandardError::CRYPTOGRAPHIC_ERROR, 'Failed to decrypt the key', $e);
+                return;
+            }
+
+            // Get the signature from the client and validate it against the decrypted key
+            $clientSignature = $clientRequest->getHeader(StandardHeaders::SIGNATURE);
+            if(!Cryptography::verifyMessage($clientTransportEncryptionKey, $clientSignature, $session->getClientPublicSigningKey()))
+            {
+                self::returnError(401, StandardError::UNAUTHORIZED, 'Invalid signature');
+                return;
+            }
+
+            // Validate the encryption key given by the client
+            if(!Cryptography::validateEncryptionKey($clientTransportEncryptionKey, Configuration::getCryptographyConfiguration()->getTransportEncryptionAlgorithm()))
+            {
+                self::returnError(400, StandardError::BAD_REQUEST, 'The transport encryption key is invalid and does not meet the server\'s requirements');
+                return;
+            }
+
+            // Receive stage complete, now we move on to the server's response
+
+            // STAGE 2: SERVER -> CLIENT
+            try
+            {
+                // Generate the server's transport encryption key (our side)
+                $serverTransportEncryptionKey = Cryptography::generateEncryptionKey(Configuration::getCryptographyConfiguration()->getTransportEncryptionAlgorithm());
+
+                // Sign the shared secret using the server's private key
+                $signature = Cryptography::signMessage($serverTransportEncryptionKey, Configuration::getCryptographyConfiguration()->getHostPrivateKey());
+                // Encrypt the server's transport key using the shared secret
+                $encryptedServerTransportKey = Cryptography::encryptShared($serverTransportEncryptionKey, $sharedSecret);
+            }
+            catch (CryptographyException $e)
+            {
+                Logger::getLogger()->error('Failed to generate the server\'s transport encryption key', $e);
+                self::returnError(500, StandardError::INTERNAL_SERVER_ERROR, 'There was an error while trying to process the DHE exchange', $e);
+                return;
+            }
+
+            // Now update the session details with all the encryption keys and the state
+            try
+            {
+                SessionManager::setEncryptionKeys($clientRequest->getSessionUuid(), $sharedSecret, $clientTransportEncryptionKey, $serverTransportEncryptionKey);
+                SessionManager::updateState($clientRequest->getSessionUuid(), SessionState::ACTIVE);
+            }
+            catch (DatabaseOperationException $e)
+            {
+                Logger::getLogger()->error('Failed to set the encryption key for the session', $e);
+                self::returnError(500, StandardError::INTERNAL_SERVER_ERROR, 'Failed to set the encryption key for the session', $e);
+                return;
+            }
+
+            // Return the encrypted transport key for the server back to the client.
+            http_response_code(200);
+            header('Content-Type: application/octet-stream');
+            header(StandardHeaders::SIGNATURE->value . ': ' . $signature);
+            print($encryptedServerTransportKey);
+        }
+
+        /**
+         * Handles a Remote Procedure Call (RPC) request, ensuring proper decryption,
+         * signature verification, and response encryption, while processing one or more
+         * RPC methods as specified in the request.
+         *
+         * @param ClientRequest $clientRequest The RPC client request containing headers, body, and session information.
+         *
+         * @return void
+         * @throws CryptographyException
+         * @throws DatabaseOperationException
+         * @throws ResolutionException
+         */
+        private static function handleRpc(ClientRequest $clientRequest): void
+        {
+            // Client: Encrypt the request body using the server's encryption key & sign it using the client's private key
+            // Server: Decrypt the request body using the servers's encryption key & verify the signature using the client's public key
+            // Server: Encrypt the response using the client's encryption key & sign it using the server's private key
+
+            if(!$clientRequest->headerExists(StandardHeaders::SESSION_UUID))
+            {
+                self::returnError(400, StandardError::BAD_REQUEST, 'Missing required header: ' . StandardHeaders::SESSION_UUID->value);
+                return;
+            }
+
+            if(!$clientRequest->headerExists(StandardHeaders::SIGNATURE))
+            {
+                self::returnError(400, StandardError::BAD_REQUEST, 'Missing required header: ' . StandardHeaders::SIGNATURE->value);
+                return;
+            }
+
+            // Get the client session
+            $session = $clientRequest->getSession();
+
+            // Verify if the session is active
+            if($session->getState() !== SessionState::ACTIVE)
+            {
+                self::returnError(403, StandardError::FORBIDDEN, 'Session is not active (' . $session->getState()->value . ')');
+                return;
+            }
+
+            try
+            {
+                SessionManager::updateLastRequest($session->getUuid());
+            }
+            catch (DatabaseOperationException $e)
+            {
+                Logger::getLogger()->error('Failed to update the last request time for the session', $e);
+                self::returnError(500, StandardError::INTERNAL_SERVER_ERROR, 'Failed to update the session', $e);
+                return;
+            }
+
+            try
+            {
+                // Attempt to decrypt the request body using the server's encryption key
+                $decryptedContent = Cryptography::decryptMessage($clientRequest->getRequestBody(), $session->getServerTransportEncryptionKey(), Configuration::getCryptographyConfiguration()->getTransportEncryptionAlgorithm());
+            }
+            catch(CryptographyException $e)
+            {
+                self::returnError(400, StandardError::CRYPTOGRAPHIC_ERROR, 'Failed to decrypt request', $e);
+                return;
+            }
+
+            // Attempt to verify the decrypted content using the client's public signing key
+            if(!Cryptography::verifyMessage($decryptedContent, $clientRequest->getSignature(), $session->getClientPublicSigningKey()))
+            {
+                self::returnError(400, StandardError::CRYPTOGRAPHIC_ERROR, 'Signature verification failed');
+                return;
+            }
+
+            // If the client has provided an identification header, further validation and resolution is required
+            if($clientRequest->getIdentifyAs() !== null)
+            {
+                try
+                {
+                    $hostPeer = $clientRequest->getPeer();
+                }
+                catch (DatabaseOperationException $e)
+                {
+                    self::returnError(500, StandardError::INTERNAL_SERVER_ERROR, 'Failed to resolve host peer', $e);
+                    return;
+                }
+
+                // If for some reason the host peer was not found, this shouldn't happen.
+                if($hostPeer === null)
+                {
+                    self::returnError(404, StandardError::INTERNAL_SERVER_ERROR, 'The host peer was not found in the system');
+                    return;
+                }
+                // First check if the client is identifying as the host
+                elseif($hostPeer->getAddress() !== ReservedUsernames::HOST->value)
+                {
+                    self::returnError(403, StandardError::FORBIDDEN, 'Forbidden: External servers must identify as a host');
+                    return;
+                }
+                // Secondly, check if the peer's server belongs to another server than the server is identified as
+                elseif($hostPeer->getServer() !== $clientRequest->getIdentifyAs()->getDomain())
+                {
+                    self::returnError(403, StandardError::FORBIDDEN, 'Forbidden: Not allowed to identify as a peer outside from the host server');
+                    return;
+                }
+
+                // Synchronize the peer
+                try
+                {
+                    self::resolvePeer($clientRequest->getIdentifyAs());
+                }
+                catch (StandardRpcException $e)
+                {
+                    throw new ResolutionException(sprintf('Failed to resolve peer %s: %s', $clientRequest->getIdentifyAs()->getAddress(), $e->getMessage()), $e->getCode(), $e);
+                }
+            }
+
+            try
+            {
+                $clientRequests = $clientRequest->getRpcRequests($decryptedContent);
+            }
+            catch (RequestException $e)
+            {
+                self::returnError($e->getCode(), $e->getStandardError(), $e->getMessage());
+                return;
+            }
+
+            if(count($clientRequests) === 0)
+            {
+                Logger::getLogger()->warning(sprintf('Received no RPC requests from %s', $_SERVER['REMOTE_ADDR']));
+                http_response_code(204);
+                return;
+            }
+
+            Logger::getLogger()->verbose(sprintf('Received %d RPC request(s) from %s', count($clientRequests), $_SERVER['REMOTE_ADDR']));
+
+            $results = [];
+            foreach($clientRequests as $rpcRequest)
+            {
+                $method = StandardMethods::tryFrom($rpcRequest->getMethod());
+                if($method === false)
+                {
+                    Logger::getLogger()->warning('The requested method does not exist');
+                    $results[] = $rpcRequest->produceError(StandardError::RPC_METHOD_NOT_FOUND, 'The requested method does not exist');
+                    continue;
+                }
+
+                try
+                {
+                    if (!$method->checkAccess($clientRequest))
+                    {
+                        $results[] = $rpcRequest->produceError(StandardError::METHOD_NOT_ALLOWED, 'Insufficient access requirements to invoke the session');
+                        continue;
+                    }
+                }
+                catch (DatabaseOperationException $e)
+                {
+                    Logger::getLogger()->error('Failed to check method access', $e);
+                    $results[] = $rpcRequest->produceError(StandardError::INTERNAL_SERVER_ERROR, 'Failed to check method access due to an internal server error');
+                    continue;
+                }
+                catch (StandardRpcException $e)
+                {
+                    $results[] = $e->produceError($rpcRequest);
+                    continue;
+                }
+
+                try
+                {
+                    Logger::getLogger()->debug(sprintf('Processing RPC request for method %s', $rpcRequest->getMethod()));
+                    $results[] = $method->execute($clientRequest, $rpcRequest);
+                    Logger::getLogger()->debug(sprintf('%s method executed successfully', $rpcRequest->getMethod()));
+                }
+                catch(StandardRpcException $e)
+                {
+                    Logger::getLogger()->error('An error occurred while processing the RPC request', $e);
+                    $results[] = $e->produceError($rpcRequest);
+                }
+                catch(InvalidArgumentException $e)
+                {
+                    Logger::getLogger()->error('Caught invalid argument exception', $e);
+                    $results[] = $rpcRequest->produceError(StandardError::RPC_INVALID_ARGUMENTS, $e->getMessage());
+                }
+                catch(Exception $e)
+                {
+                    Logger::getLogger()->error('An internal error occurred while processing the RPC request', $e);
+                    if(Configuration::getSecurityConfiguration()->isDisplayInternalExceptions())
+                    {
+                        $results[] = $rpcRequest->produceError(StandardError::INTERNAL_SERVER_ERROR, Utilities::throwableToString($e));
+                    }
+                    else
+                    {
+                        $results[] = $rpcRequest->produceError(StandardError::INTERNAL_SERVER_ERROR, 'Uncaught Exception');
+                    }
+                }
+            }
+
+            $results = array_map(fn($result) => $result->toArray(), $results);
             if(count($results) == 0)
             {
                 http_response_code(204);
                 return;
             }
-
-            if(count($results) == 1)
+            elseif(count($results) == 1)
             {
-                print(json_encode($results[0]));
+                $response = json_encode($results[0], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+            }
+            else
+            {
+                $response = json_encode($results, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+            }
+
+            $session = $clientRequest->getSession();
+
+            try
+            {
+                $encryptedResponse = Cryptography::encryptMessage(
+                    message: $response,
+                    encryptionKey: $session->getClientTransportEncryptionKey(),
+                    algorithm: Configuration::getCryptographyConfiguration()->getTransportEncryptionAlgorithm()
+                );
+
+                $signature = Cryptography::signMessage(
+                    message: $response,
+                    privateKey: Configuration::getCryptographyConfiguration()->getHostPrivateKey()
+                );
+            }
+            catch (Exception $e)
+            {
+                self::returnError(500, StandardError::INTERNAL_SERVER_ERROR, 'Failed to encrypt the server response', $e);
                 return;
             }
 
-            print(json_encode($results));
+            http_response_code(200);
+            header('Content-Type: application/octet-stream');
+            header(StandardHeaders::SIGNATURE->value . ': ' . $signature);
+            print($encryptedResponse);
+        }
+
+        /**
+         * Sends an error response by setting the HTTP response code, headers, and printing an error message.
+         * Optionally includes exception details in the response if enabled in the configuration.
+         * Logs the error message and any associated exception.
+         *
+         * @param int $responseCode The HTTP response code to send.
+         * @param StandardError $standardError The standard error containing error details.
+         * @param string|null $message An optional error message to display. Defaults to the message from the StandardError instance.
+         * @param Throwable|null $e An optional throwable to include in logs and the response, if enabled.
+         *
+         * @return void
+         */
+        private static function returnError(int $responseCode, StandardError $standardError, ?string $message=null, ?Throwable $e=null): void
+        {
+            if($e !== null)
+            {
+                Logger::getLogger()->error($message, $e);
+            }
+
+            if($message === null)
+            {
+                $message = $standardError->getMessage();
+            }
+
+            http_response_code($responseCode);
+            header('Content-Type: text/plain');
+            header(StandardHeaders::ERROR_CODE->value . ': ' . $standardError->value);
+            print($message);
+
+            if(Configuration::getSecurityConfiguration()->isDisplayInternalExceptions() && $e !== null)
+            {
+                print(PHP_EOL . PHP_EOL . Utilities::throwableToString($e));
+            }
+        }
+
+        /**
+         * Retrieves an external session associated with the given domain.
+         *
+         * If a session already exists for the specified domain, it retrieves and uses the existing session.
+         * Otherwise, it establishes a new connection, creates a session, and stores it for later use.
+         *
+         * @param string $domain The domain for which the external session is to be retrieved.
+         * @return SocialClient The RPC client initialized with the external session for the given domain.
+         * @throws CryptographyException If there was an error in the cryptography
+         * @throws DatabaseOperationException If there was an error while processing the session against the database
+         * @throws ResolutionException If the connection to the remote server fails.
+         * @throws RpcException If there is an RPC exception while connecting to the remote server
+         */
+        public static function getExternalSession(string $domain): SocialClient
+        {
+            if(ExternalSessionManager::sessionExists($domain))
+            {
+                return new SocialClient(self::getServerAddress(), $domain, ExternalSessionManager::getSession($domain));
+            }
+
+            try
+            {
+                $client = new SocialClient(self::getServerAddress(), $domain);
+                $client->verificationAuthenticate();
+            }
+            catch (Exception $e)
+            {
+                throw new ResolutionException(sprintf('Failed to connect to remote server %s: %s', $domain, $e->getMessage()), $e->getCode(), $e);
+            }
+
+            ExternalSessionManager::addSession($client->exportSession());
+            return $client;
+        }
+
+        /**
+         * Retrieves external server information for the specified domain.
+         *
+         * @param string $domain The domain from which the server information is to be retrieved.
+         * @return ServerInformation The server information retrieved from the external session.
+         * @throws ResolutionException If unable to retrieve server information for the given domain.
+         */
+        public static function getExternalServerInformation(string $domain): ServerInformation
+        {
+            try
+            {
+                return self::getExternalSession($domain)->getServerInformation();
+            }
+            catch (Exception $e)
+            {
+                throw new ResolutionException(sprintf('Failed to retrieve server information from %s: %s', $domain, $e->getMessage()), $e->getCode(), $e);
+            }
+        }
+
+        /**
+         * Verifies the signature of a message using the public key of the signing peer both locally and externally.
+         * If the peer is registered locally, the signature is verified using the local public key.
+         * If the peer is external, the signature is verified by resolving the peer's public key from the external server.
+         * The signature is verified against the resolved public key, and the status of the verification is returned.
+         *
+         * @param PeerAddress|string $signingPeer The peer address or string identifier of the signing peer
+         * @param string $signatureUuid The UUID of the signature key to be resolved
+         * @param string $signature  The signature to be verified
+         * @param string $messageHash The SHA-512 hash of the message that was signed
+         * @param int $signatureTime The time at which the message was signed
+         * @return SignatureVerificationStatus The status of the signature verification
+         */
+        public static function verifyTimedSignature(PeerAddress|string $signingPeer, string $signatureUuid, string $signature, string $messageHash, int $signatureTime): SignatureVerificationStatus
+        {
+            // Resolve the peer signature key
+            try
+            {
+                $signingKey = self::resolvePeerSignature($signingPeer, $signatureUuid);
+                if($signingKey === null)
+                {
+                    return SignatureVerificationStatus::NOT_FOUND;
+                }
+            }
+            catch(StandardRpcException)
+            {
+                return SignatureVerificationStatus::RESOLUTION_ERROR;
+            }
+
+            if(time() > $signingKey->getExpires())
+            {
+                return SignatureVerificationStatus::EXPIRED;
+            }
+
+            // Verify the signature with the resolved key
+            try
+            {
+                if (!Cryptography::verifyTimedMessage($messageHash, $signature, $signingKey->getPublicKey(), $signatureTime, false))
+                {
+                    return SignatureVerificationStatus::INVALID;
+                }
+            }
+            catch (CryptographyException)
+            {
+                return SignatureVerificationStatus::ERROR;
+            }
+
+            return SignatureVerificationStatus::VERIFIED;
+        }
+
+        /**
+         * Verifies the signature of a message using the public key of the signing peer both locally and externally.
+         * If the peer is registered locally, the signature is verified using the local public key.
+         * If the peer is external, the signature is verified by resolving the peer's public key from the external server.
+         * The signature is verified against the resolved public key, and the status of the verification is returned.
+         *
+         * @param PeerAddress|string $signingPeer The peer address or string identifier of the signing peer
+         * @param string $signatureUuid The UUID of the signature key to be resolved
+         * @param string $signature The signature to be verified
+         * @param string $messageHash The SHA-512 hash of the message that was signed
+         * @return SignatureVerificationStatus The status of the signature verification
+         */
+        public static function verifySignature(PeerAddress|string $signingPeer, string $signatureUuid, string $signature, string $messageHash): SignatureVerificationStatus
+        {
+            try
+            {
+                $signingKey = self::resolvePeerSignature($signingPeer, $signatureUuid);
+                if($signingKey === null)
+                {
+                    return SignatureVerificationStatus::NOT_FOUND;
+                }
+            }
+            catch(StandardRpcException)
+            {
+                return SignatureVerificationStatus::RESOLUTION_ERROR;
+            }
+
+            // Verify the signature with the resolved key
+            try
+            {
+                if (!Cryptography::verifyMessage($messageHash, $signature, $signingKey->getPublicKey(), false))
+                {
+                    return SignatureVerificationStatus::INVALID;
+                }
+            }
+            catch (CryptographyException)
+            {
+                return SignatureVerificationStatus::ERROR;
+            }
+
+            return SignatureVerificationStatus::VERIFIED;
+        }
+
+
+        /**
+         * Resolves a peer signature key based on the given peer address or string identifier.
+         *
+         * @param PeerAddress|string $peerAddress The peer address or string identifier to be resolved.
+         * @param string $signatureUuid The UUID of the signature key to be resolved.
+         * @return Signature|null The resolved signing key for the peer. Null if not found
+         * @throws StandardRpcException If there was an error while resolving the peer signature key.
+         */
+        public static function resolvePeerSignature(PeerAddress|string $peerAddress, string $signatureUuid): ?Signature
+        {
+            // Convert string peer address to object PeerAddress
+            if(is_string($peerAddress))
+            {
+                try
+                {
+                    $peerAddress = PeerAddress::fromAddress($peerAddress);
+                }
+                catch(InvalidArgumentException $e)
+                {
+                    throw new StandardRpcException($e->getMessage(), StandardError::RPC_INVALID_ARGUMENTS, $e);
+                }
+            }
+
+            // Prevent resolutions against any host
+            if($peerAddress->getUsername() == ReservedUsernames::HOST)
+            {
+                throw new StandardRpcException('Cannot resolve signature for a host peer', StandardError::FORBIDDEN);
+            }
+
+            // If the peer is registered within this server
+            if($peerAddress->getDomain() === Configuration::getInstanceConfiguration()->getDomain())
+            {
+
+                try
+                {
+                    $peer = RegisteredPeerManager::getPeerByAddress($peerAddress);
+                    if($peer === null || !$peer?->isEnabled())
+                    {
+                        // Fail if the peer is not found or enabled
+                        return null;
+                    }
+
+                    $signingKey = SigningKeysManager::getSigningKey($peer->getUuid(), $signatureUuid);
+                    if($signingKey === null)
+                    {
+                        return null;
+                    }
+                }
+                catch(Exception $e)
+                {
+                    throw new StandardRpcException('There was an error while trying to resolve the signature key for the peer locally', StandardError::INTERNAL_SERVER_ERROR, $e);
+                }
+
+                return $signingKey->toStandard();
+            }
+
+            // The requested peer is coming from an external server
+            try
+            {
+                $client = self::getExternalSession($peerAddress->getDomain());
+            }
+            catch(Exception $e)
+            {
+                throw new StandardRpcException(sprintf('There was an error while trying to communicate with %s', $peerAddress->getDomain()), StandardError::RESOLUTION_FAILED, $e);
+            }
+
+            try
+            {
+                return $client->resolveSignature($peerAddress, $signatureUuid);
+            }
+            catch(RpcException $e)
+            {
+                // Reflect the server error to the client
+                throw new StandardRpcException($e->getMessage(), StandardError::tryFrom((int)$e->getCode()) ?? StandardError::UNKNOWN, $e);
+            }
+        }
+
+        /**
+         * Resolves an external peer based on the given peer address or string identifier.
+         *
+         * @param PeerAddress|string $peerAddress The external peer address or string identifier to be resolved.
+         * @param PeerAddress|string|null $identifiedAs Optional. The peer address or string identifier by which the caller is identified
+         * @return Peer The resolved external peer after synchronization.
+         * @throws StandardRpcException Thrown if there was an error with the resolution process
+         */
+        public static function resolvePeer(PeerAddress|string $peerAddress, null|PeerAddress|string $identifiedAs=null): Peer
+        {
+            if($peerAddress->getDomain() !== Configuration::getInstanceConfiguration()->getDomain())
+            {
+                return self::resolveExternalPeer($peerAddress, $identifiedAs);
+            }
+
+            if($peerAddress->getUsername() === ReservedUsernames::HOST->value)
+            {
+                return new Peer([
+                    'address' => sprintf('%s@%s', ReservedUsernames::HOST->value, Configuration::getInstanceConfiguration()->getDomain()),
+                    'information_fields' => [
+                        new InformationField([
+                            'name' => InformationFieldName::DISPLAY_NAME,
+                            'value' => Configuration::getInstanceConfiguration()->getName()
+                        ])
+                    ],
+                    'flags' => [],
+                    // TODO: Should use existed-since field
+                    'registered' => 0
+                ]);
+            }
+
+            return self::resolveLocalPeer($peerAddress, $identifiedAs);
+        }
+
+        /**
+         * Resolves a peer based on the given peer address or string identifier.
+         *
+         * @param PeerAddress|string $peerAddress The peer address or string identifier to be resolved.
+         * @param PeerAddress|string|null $identifiedAs Optional. The peer address or string identifier by which the caller is identified
+         * @return Peer The resolved peer after synchronization.
+         * @throws StandardRpcException Thrown if there was an error with the resolution process
+         */
+        private static function resolveExternalPeer(PeerAddress|string $peerAddress, null|PeerAddress|string $identifiedAs=null): Peer
+        {
+            if(is_string($peerAddress))
+            {
+                $peerAddress = PeerAddress::fromAddress($peerAddress);
+            }
+
+            if(is_string($identifiedAs))
+            {
+                $identifiedAs = PeerAddress::fromAddress($identifiedAs);
+            }
+
+            // Resolve the peer from the local database if it exists
+            try
+            {
+                $existingPeer = RegisteredPeerManager::getPeerByAddress($peerAddress);
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to resolve the peer due to an internal server error', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            if($existingPeer === null)
+            {
+                // if the peer doesn't exist, resolve it externally and synchronize it
+                try
+                {
+                    $peer = self::getExternalSession($peerAddress->getDomain())->resolvePeer($peerAddress, $identifiedAs);
+                }
+                catch(RpcException $e)
+                {
+                    throw StandardRpcException::fromRpcException($e);
+                }
+                catch(Exception $e)
+                {
+                    throw new StandardRpcException('Failed to resolve the peer: ' . $e->getMessage(), StandardError::RESOLUTION_FAILED, $e);
+                }
+
+                // Do not synchronize if this is a personal request, there may be information fields that
+                // the peer does not want to share with the server
+                if($identifiedAs !== null)
+                {
+                    try
+                    {
+                        RegisteredPeerManager::synchronizeExternalPeer($peer);
+                    }
+                    catch(DatabaseOperationException $e)
+                    {
+                        throw new StandardRpcException('Failed to synchronize the external peer due to an internal server error', StandardError::INTERNAL_SERVER_ERROR, $e);
+                    }
+                }
+
+                return $peer;
+            }
+
+            // if we're not identifying as a personal peer and If the peer exists, but it's outdated, synchronize it
+            if($identifiedAs === null && $existingPeer->getUpdated()->getTimestamp() < time() - Configuration::getPoliciesConfiguration()->getPeerSyncInterval())
+            {
+                try
+                {
+                    $peer = self::getExternalSession($peerAddress->getDomain())->resolvePeer($peerAddress, $identifiedAs);
+                }
+                catch(RpcException $e)
+                {
+                    throw StandardRpcException::fromRpcException($e);
+                }
+                catch(Exception $e)
+                {
+                    throw new StandardRpcException('Failed to resolve the peer: ' . $e->getMessage(), StandardError::RESOLUTION_FAILED, $e);
+                }
+
+                try
+                {
+                    RegisteredPeerManager::synchronizeExternalPeer($peer);
+                }
+                catch(DatabaseOperationException $e)
+                {
+                    throw new StandardRpcException('Failed to synchronize the external peer due to an internal server error', StandardError::INTERNAL_SERVER_ERROR, $e);
+                }
+
+                return $peer;
+            }
+
+            // If the peer exists and is up to date, return it from our local database instead. (Quicker)
+            try
+            {
+                $informationFields = PeerInformationManager::getFields($existingPeer);
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to obtain local information fields about an external peer locally due to an internal server error', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            return new Peer([
+                'address' => $existingPeer->getAddress(),
+                'information_fields' => $informationFields,
+                'flags' => $existingPeer->getFlags(),
+                'registered' => $existingPeer->getCreated()->getTimestamp()
+            ]);
+        }
+
+        /**
+         * Resolves a peer locally based on the given peer address or string identifier.
+         *
+         * @param PeerAddress|string $peerAddress The peer address or string identifier to be resolved.
+         * @param PeerAddress|string|null $identifiedAs Optional. The peer address or string identifier by which the caller is identified
+         * @return Peer The resolved peer after synchronization.
+         * @throws StandardRpcException Thrown if there was an error with the resolution process
+         */
+        private static function resolveLocalPeer(PeerAddress|string $peerAddress, null|PeerAddress|string $identifiedAs=null): Peer
+        {
+            if(is_string($peerAddress))
+            {
+                $peerAddress = PeerAddress::fromAddress($peerAddress);
+            }
+
+            if(is_string($identifiedAs))
+            {
+                $identifiedAs = PeerAddress::fromAddress($identifiedAs);
+            }
+
+            // Resolve the peer
+            try
+            {
+                $peer = RegisteredPeerManager::getPeerByAddress($peerAddress);
+                if($peer === null)
+                {
+                    throw new StandardRpcException('The requested peer was not found', StandardError::PEER_NOT_FOUND);
+                }
+            }
+            catch(DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to resolve the peer: ' . $e->getMessage(), StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            try
+            {
+                // Get the initial peer information fields, public always
+                $peerInformationFields = PeerInformationManager::getFilteredFields($peer, [PrivacyState::PUBLIC]);
+            }
+            catch (DatabaseOperationException $e)
+            {
+                throw new StandardRpcException('Failed to resolve local peer information', StandardError::INTERNAL_SERVER_ERROR, $e);
+            }
+
+            // If there's an identifier, we can resolve more information fields if the target peer has added the caller
+            // as a contact or if the caller is a trusted contact
+            if($identifiedAs !== null)
+            {
+                try
+                {
+                    $peerContact = ContactManager::getContact($peer->getUuid(), $identifiedAs);
+                }
+                catch (DatabaseOperationException $e)
+                {
+                    throw new StandardRpcException('Failed to resolve peer because there was an error while trying to retrieve contact information for the peer', StandardError::INTERNAL_SERVER_ERROR, $e);
+                }
+
+                // If it is a contact, what sort of contact? retrieve depending on the contact type
+                if($peerContact !== null)
+                {
+                    try
+                    {
+                        if($peerContact->getRelationship() === ContactRelationshipType::MUTUAL)
+                        {
+                            // Retrieve the mutual information fields
+                            array_merge($peerInformationFields, PeerInformationManager::getFilteredFields($peer, [PrivacyState::CONTACTS]));
+                        }
+                        elseif($peerContact->getRelationship() === ContactRelationshipType::TRUSTED)
+                        {
+                            // Retrieve the mutual and trusted information fields
+                            array_merge($peerInformationFields, PeerInformationManager::getFilteredFields($peer, [PrivacyState::CONTACTS, PrivacyState::TRUSTED]));
+                        }
+                    }
+                    catch (DatabaseOperationException $e)
+                    {
+                        throw new StandardRpcException('Failed to resolve local peer information', StandardError::INTERNAL_SERVER_ERROR, $e);
+                    }
+                }
+            }
+
+            return new Peer([
+                'address' => $peer->getAddress(),
+                'information_fields' => $peerInformationFields,
+                'flags' => PeerFlags::toString($peer->getFlags()),
+                'registered' => $peer->getCreated()->getTimestamp()
+            ]);
+        }
+
+        /**
+         * Retrieves the server information by assembling data from the configuration settings.
+         *
+         * @return ServerInformation An instance of ServerInformation containing details such as server name, hashing algorithm,
+         * transport AES mode, and AES key length.
+         */
+        public static function getServerInformation(): ServerInformation
+        {
+            return ServerInformation::fromArray([
+                'server_name' => Configuration::getInstanceConfiguration()->getName(),
+                'server_keypair_expires' => Configuration::getCryptographyConfiguration()->getHostKeyPairExpires(),
+                'transport_encryption_algorithm' => Configuration::getCryptographyConfiguration()->getTransportEncryptionAlgorithm()
+            ]);
+        }
+
+        /**
+         * Retrieves the server address.
+         *
+         * @return PeerAddress The constructed server address containing the host and domain information.
+         */
+        public static function getServerAddress(): PeerAddress
+        {
+            return new PeerAddress(ReservedUsernames::HOST->value, Configuration::getInstanceConfiguration()->getDomain());
+        }
+
+        /**
+         * Retrieves the DNS record by generating a TXT record using the RPC endpoint,
+         * host public key, and host key pair expiration from the configuration.
+         *
+         * @return string The generated DNS TXT record.
+         */
+        public static function getDnsRecord(): string
+        {
+            return DnsHelper::generateTxt(
+                Configuration::getInstanceConfiguration()->getRpcEndpoint(),
+                Configuration::getCryptographyConfiguration()->getHostPublicKey(),
+                Configuration::getCryptographyConfiguration()->getHostKeyPairExpires()
+            );
         }
     }
\ No newline at end of file
diff --git a/src/Socialbox/Socialbox/Socialbox.php b/src/Socialbox/Socialbox/Socialbox.php
deleted file mode 100644
index f0ca775..0000000
--- a/src/Socialbox/Socialbox/Socialbox.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-    namespace Socialbox;
-
-    class Socialbox
-    {
-
-    }
\ No newline at end of file
diff --git a/teapot_socialbox/config/socialbox.conf b/teapot_socialbox/config/socialbox.conf
new file mode 100755
index 0000000..bf3b757
--- /dev/null
+++ b/teapot_socialbox/config/socialbox.conf
@@ -0,0 +1,117 @@
+{
+    "instance": {
+        "enabled": true,
+        "name": "teapot",
+        "domain": "teapot.com",
+        "rpc_endpoint": "http://teapot_socialbox:8085/",
+        "dns_mocks": {
+            "teapot.com": "v=socialbox;sb-rpc=http://teapot_socialbox:8085/;sb-key=sig:MDXUuripAo_IAv-EZTEoFhpIdhsXxfMLNunSnQzxYiY;sb-exp=0",
+            "coffee.com": "v=socialbox;sb-rpc=http://coffee_socialbox:8085/;sb-key=sig:g59Cf8j1wmQmRg1MkveYbpdiZ-1-_hFU9eRRJmQAwmc;sb-exp=0"
+        }
+    },
+    "security": {
+        "display_internal_exceptions": true,
+        "resolved_servers_ttl": 600,
+        "captcha_ttl": 200,
+        "otp_secret_key_length": 32,
+        "otp_time_step": 30,
+        "otp_digits": 6,
+        "otp_hash_algorithm": "sha512",
+        "otp_window": 1
+    },
+    "cryptography": {
+        "host_keypair_expires": 0,
+        "host_public_key": "sig:MDXUuripAo_IAv-EZTEoFhpIdhsXxfMLNunSnQzxYiY",
+        "host_private_key": "sig:kPfGxpsnisJIp5pKuD1AI7-T1bLk1S-EGOr7jBq5AO4wNdS6uKkCj8gC_4RlMSgWGkh2GxfF8ws26dKdDPFiJg",
+        "internal_encryption_keys": [
+            "ql5xP8OmKbSm_Fj4uz28aJ2Dpxdpg994Ker9Yp6eWVc",
+            "1mbn_MrV_XlPG7bqTrLXHd8H9bBUN27Rm-oIZmldOYQ",
+            "PL5YB2_C3I3gZAzrA2AP37tZKPsM5BQg0RH7LAgREGs",
+            "VEU4sF9v3AzDKEBLEJCbhirERouNdvMjGBoLLn0A9M4",
+            "5HeBwyDdUh8rbF5EKM9rQ0uU8PyzMIljoGKnn9CPk1U",
+            "YOGrfjs2dYnf7OL6FLhCMmfig-xCHNjGF7Gny7DisEQ",
+            "N-ouk7GBRqn1wLXtJ7BCcE5kPh4X0kgHuKzgOJ6i3Oo",
+            "bTo0YnNOVB4XtqiFpSx9kRaufDRDoYt6or-MRodngWQ",
+            "HTAvX3Nnf61-UOFQYcJOqfGcJVps_EOxo7KUf5Z0Zk0",
+            "UelTVnfWENEZEt6a7j5jxWq_pXWZ4X9pF8lOrdb6PKc"
+        ],
+        "encryption_keys_count": 10,
+        "encryption_keys_algorithm": "xchacha20",
+        "transport_encryption_algorithm": "chacha20"
+    },
+    "database": {
+        "host": "teapot_mariadb",
+        "port": 0,
+        "username": "socialbox",
+        "password": "socialbox",
+        "name": "socialbox"
+    },
+    "logging": {
+        "console_logging_enabled": true,
+        "console_logging_level": "info",
+        "file_logging_enabled": true,
+        "file_logging_level": "debug"
+    },
+    "cache": {
+        "enabled": true,
+        "engine": "redis",
+        "host": "teapot_redis",
+        "port": 6379,
+        "username": "root",
+        "password": "root",
+        "database": "0",
+        "sessions": {
+            "enabled": true,
+            "ttl": 3600,
+            "max": 1000
+        }
+    },
+    "registration": {
+        "enabled": true,
+        "privacy_policy_document": null,
+        "privacy_policy_date": 1734985525,
+        "accept_privacy_policy": false,
+        "terms_of_service_document": null,
+        "terms_of_service_date": 1734985525,
+        "accept_terms_of_service": false,
+        "community_guidelines_document": null,
+        "community_guidelines_date": 1734985525,
+        "accept_community_guidelines": false,
+        "password_required": true,
+        "otp_required": false,
+        "display_name_required": true,
+        "display_picture_required": false,
+        "email_address_required": false,
+        "phone_number_required": false,
+        "birthday_required": false,
+        "image_captcha_verification_required": false,
+        "first_name_required": false,
+        "middle_name_required": false,
+        "last_name_required": false,
+        "url_required": false
+    },
+    "authentication": {
+        "enabled": true,
+        "image_captcha_verification_required": true
+    },
+    "policies": {
+        "max_signing_keys": 20,
+        "session_inactivity_expires": 43200,
+        "image_captcha_expires": 300,
+        "peer_sync_interval": 3600,
+        "get_contacts_limit": 100,
+        "default_display_picture_privacy": "PUBLIC",
+        "default_first_name_privacy": "CONTACTS",
+        "default_middle_name_privacy": "PRIVATE",
+        "default_last_name_privacy": "PRIVATE",
+        "default_email_address_privacy": "CONTACTS",
+        "default_phone_number_privacy": "CONTACTS",
+        "default_birthday_privacy": "PRIVATE",
+        "default_url_privacy": "PUBLIC"
+    },
+    "storage": {
+        "path": "/etc/socialbox",
+        "user_display_images_path": "user_profiles",
+        "user_display_images_max_size": 3145728
+    }
+}
\ No newline at end of file
diff --git a/tests/Socialbox/Classes/ConfigurationTest.php b/tests/Socialbox/Classes/ConfigurationTest.php
deleted file mode 100644
index 028e3e3..0000000
--- a/tests/Socialbox/Classes/ConfigurationTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Socialbox\Classes;
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Socialbox's Configuration Test Class
- *
- * This is a test suite for testing the "getConfiguration" method in the "Configuration" class.
- */
-class ConfigurationTest extends TestCase
-{
-    /**
-     * Test the "getConfiguration" method in "Configuration" class.
-     */
-    public function testGetConfiguration(): void
-    {
-        $config = Configuration::getConfiguration();
-        $this->assertIsArray($config, "Configuration should be an array.");
-
-        //Assert that all the default configuration exists
-        $this->assertArrayHasKey('host', $config['database']);
-        $this->assertIsString($config['database']['host']);
-
-        $this->assertArrayHasKey('port', $config['database']);
-        $this->assertIsInt($config['database']['port'], 3306);
-
-        $this->assertArrayHasKey('username', $config['database']);
-        $this->assertIsString($config['database']['username']);
-
-        $this->assertArrayHasKey('password', $config['database']);
-        $this->assertIsString($config['database']['password']);
-
-        $this->assertArrayHasKey('name', $config['database']);
-        $this->assertIsString($config['database']['name']);
-    }
-}
\ No newline at end of file
diff --git a/tests/Socialbox/Classes/CryptographyTest.php b/tests/Socialbox/Classes/CryptographyTest.php
index 483ba13..425af15 100644
--- a/tests/Socialbox/Classes/CryptographyTest.php
+++ b/tests/Socialbox/Classes/CryptographyTest.php
@@ -1,203 +1,436 @@
 <?php
 
-namespace Socialbox\Classes;
+    namespace Socialbox\Classes;
 
-use PHPUnit\Framework\TestCase;
-use Socialbox\Exceptions\CryptographyException;
+    use Exception;
+    use PHPUnit\Framework\TestCase;
+    use Socialbox\Exceptions\CryptographyException;
+    use Socialbox\Objects\KeyPair;
 
-class CryptographyTest extends TestCase
-{
-    /**
-     * Testing `Cryptography::generateKeyPair` method
-     * @throws CryptographyException
-     */
-    public function testGenerateKeyPair()
+    class CryptographyTest extends TestCase
     {
-        $keyPair = Cryptography::generateKeyPair();
-
-        $this->assertIsObject($keyPair);
-        $this->assertObjectHasProperty('publicKey', $keyPair);
-        $this->assertObjectHasProperty('privateKey', $keyPair);
-        $this->assertIsString($keyPair->getPublicKey());
-        $this->assertIsString($keyPair->getPrivateKey());
-
-        print_r($keyPair);
-    }
-
-    /**
-     * Testing `Cryptography::signContent` method
-     * @throws CryptographyException
-     */
-    public function testSignContent()
-    {
-        $content = "My secret content";
-        $keyPair = Cryptography::generateKeyPair();
-
-        $signature = Cryptography::signContent($content, $keyPair->getPrivateKey());
-
-        $this->assertIsString($signature);
-    }
-
-    /**
-     * Testing `Cryptography::verifyContent` method
-     * @throws CryptographyException
-     */
-    public function testVerifyContent()
-    {
-        $content = "My secret content";
-        $keyPair = Cryptography::generateKeyPair();
-
-        // Sign the content
-        $signature = Cryptography::signContent($content, $keyPair->getPrivateKey());
-
-        // Verify the content
-        $result = Cryptography::verifyContent($content, $signature, $keyPair->getPublicKey());
-
-        $this->assertTrue($result);
-    }
-
-    /**
-     * Testing `Cryptography::temporarySignature` method
-     * @throws CryptographyException
-     */
-    public function testTemporarySignature()
-    {
-        $content = "Test Content";
-        $keyPair = Cryptography::generateKeyPair();
-
-        $tempSignature = Cryptography::temporarySignContent($content, $keyPair->getPrivateKey());
-
-        $this->assertIsString($tempSignature);
-    }
-
-    /**
-     * Testing `Cryptography::verifyTemporarySignature` method
-     * @throws CryptographyException
-     */
-    public
-    function testVerifyTemporarySignature()
-    {
-        $content = "Test Content";
-        $keyPair = Cryptography::generateKeyPair();
-        $frames = 2;
-
-        // Generate a temporary signature
-        $tempSignature = Cryptography::temporarySignContent($content, $keyPair->getPrivateKey());
-
-        // Verify the temporary signature
-        $result = Cryptography::verifyTemporarySignature($content, $tempSignature, $keyPair->getPublicKey(), $frames);
-
-        $this->assertTrue($result);
-    }
-
-    /**
-     * Testing `Cryptography::encrypt` method
-     * @throws CryptographyException
-     */
-    public function testEncrypt()
-    {
-        $content = "Test Content";
-        $keyPair = Cryptography::generateKeyPair();
-
-        // Encrypt the content
-        $encryptedContent = Cryptography::encryptContent($content, $keyPair->getPublicKey());
-
-        $this->assertIsString($encryptedContent);
-    }
-
-    /**
-     * Testing `Cryptography::decrypt` method
-     * @throws CryptographyException
-     */
-    public function testDecrypt()
-    {
-        $content = "Test Content";
-        $keyPair = Cryptography::generateKeyPair();
-
-        // Encrypt the content
-        $encryptedContent = Cryptography::encryptContent($content, $keyPair->getPublicKey());
-
-        // Decrypt the content
-        $decryptedContent = Cryptography::decryptContent($encryptedContent, $keyPair->getPrivateKey());
-
-        $this->assertIsString($decryptedContent);
-        $this->assertEquals($content, $decryptedContent);
-    }
-
-    public function testEncryptFromFile()
-    {
-        $file_path = __DIR__ . DIRECTORY_SEPARATOR . 'public.der';
-        $content = "Test Content";
-
-        $encryptedContent = Cryptography::encryptContent($content, file_get_contents($file_path));
-
-        $this->assertIsString($encryptedContent);
-        $this->assertNotEquals($content, $encryptedContent);
-
-        print_r($encryptedContent);
-    }
-
-    public function testDecryptFromFile()
-    {
-        $private_key_file = __DIR__ . DIRECTORY_SEPARATOR . 'private.der';
-        $content = file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'secret.txt');
-
-        try
+        /**
+         * Test that generateEncryptionKeyPair generates a KeyPair with valid keys.
+         */
+        public function testGenerateEncryptionKeyPairProducesValidKeyPair(): void
         {
-            $decryptedContent = Cryptography::decryptContent($content, file_get_contents($private_key_file));
-        }
-        catch(CryptographyException $e)
-        {
-            $this->fail($e->getMessage());
+            $keyPair = Cryptography::generateEncryptionKeyPair();
+
+            $this->assertInstanceOf(KeyPair::class, $keyPair);
+            $this->assertNotEmpty($keyPair->getPublicKey());
+            $this->assertNotEmpty($keyPair->getPrivateKey());
         }
 
-        $this->assertIsString($decryptedContent);
-        $this->assertEquals($decryptedContent, 'Test Content');
-    }
+        /**
+         * Test that the generated public key starts with the defined encryption key type prefix.
+         */
+        public function testGeneratedPublicKeyHasEncryptionPrefix(): void
+        {
+            $keyPair = Cryptography::generateEncryptionKeyPair();
 
-    /**
-     * Testing `Cryptography::validatePublicKey` method
-     */
-    public function testValidatePublicKey()
-    {
-        $keyPair = Cryptography::generateKeyPair();
+            $this->assertStringStartsWith('enc:', $keyPair->getPublicKey());
+        }
 
-        $result = Cryptography::validatePublicKey($keyPair->getPublicKey());
-        $this->assertTrue($result);
+        /**
+         * Test that the generated private key starts with the defined encryption key type prefix.
+         */
+        public function testGeneratedPrivateKeyHasEncryptionPrefix(): void
+        {
+            $keyPair = Cryptography::generateEncryptionKeyPair();
 
-        $resultWithInValidKey = Cryptography::validatePublicKey('invalidKey');
+            $this->assertStringStartsWith('enc:', $keyPair->getPrivateKey());
+        }
 
-        $this->assertFalse($resultWithInValidKey);
-    }
+        /**
+         * Test that the generated keys are of different base64-encoded string values.
+         */
+        public function testPublicAndPrivateKeysAreDifferent(): void
+        {
+            $keyPair = Cryptography::generateEncryptionKeyPair();
 
-    public function testValidateInvalidPublicKey()
-    {
-        $result = Cryptography::validatePublicKey('Bogus Key');
-        $this->assertFalse($result);
+            $this->assertNotEquals($keyPair->getPublicKey(), $keyPair->getPrivateKey());
+        }
 
-        $result = Cryptography::validatePublicKey(Utilities::base64encode('Bogus Key'));
-        $this->assertFalse($result);
-    }
 
-    public function testValidatePrivateKey()
-    {
-        $keyPair = Cryptography::generateKeyPair();
+        /**
+         * Test that generateSigningKeyPair generates a KeyPair with valid keys.
+         */
+        public function testGenerateSigningKeyPairProducesValidKeyPair(): void
+        {
+            $keyPair = Cryptography::generateSigningKeyPair();
 
-        $result = Cryptography::validatePrivateKey($keyPair->getPrivateKey());
-        $this->assertTrue($result);
+            $this->assertInstanceOf(KeyPair::class, $keyPair);
+            $this->assertNotEmpty($keyPair->getPublicKey());
+            $this->assertNotEmpty($keyPair->getPrivateKey());
+        }
 
-        $resultWithInValidKey = Cryptography::validatePublicKey('invalidKey');
+        /**
+         * Test that the generated public key starts with the defined signing key type prefix.
+         */
+        public function testGeneratedPublicKeyHasSigningPrefix(): void
+        {
+            $keyPair = Cryptography::generateSigningKeyPair();
 
-        $this->assertFalse($resultWithInValidKey);
-    }
+            $this->assertStringStartsWith('sig:', $keyPair->getPublicKey());
+        }
 
-    public function testValidateInvalidPrivateKey()
-    {
-        $result = Cryptography::validatePublicKey('Bogus Key');
-        $this->assertFalse($result);
+        /**
+         * Test that the generated private key starts with the defined signing key type prefix.
+         */
+        public function testGeneratedPrivateKeyHasSigningPrefix(): void
+        {
+            $keyPair = Cryptography::generateSigningKeyPair();
 
-        $result = Cryptography::validatePrivateKey(Utilities::base64encode('Bogus Key'));
-        $this->assertFalse($result);
-    }
+            $this->assertStringStartsWith('sig:', $keyPair->getPrivateKey());
+        }
 
-}
+        /**
+         * Test that performDHE successfully calculates a shared secret with valid keys.
+         */
+        public function testPerformDHESuccessfullyCalculatesSharedSecret(): void
+        {
+            $aliceKeyPair = Cryptography::generateEncryptionKeyPair();
+            $aliceSigningKeyPair = Cryptography::generateSigningKeyPair();
+            $bobKeyPair = Cryptography::generateEncryptionKeyPair();
+            $bobSigningKeyPair = Cryptography::generateSigningKeyPair();
+
+            // Alice performs DHE with Bob
+            $aliceSharedSecret = Cryptography::performDHE($bobKeyPair->getPublicKey(), $aliceKeyPair->getPrivateKey());
+            // Bob performs DHE with Alice
+            $bobSharedSecret = Cryptography::performDHE($aliceKeyPair->getPublicKey(), $bobKeyPair->getPrivateKey());
+            $this->assertEquals($aliceSharedSecret, $bobSharedSecret);
+
+            // Alice sends "Hello, Bob!" to Bob, signing the message and encrypting it with the shared secret
+            $message = "Hello, Bob!";
+            $aliceSignature = Cryptography::signMessage($message, $aliceSigningKeyPair->getPrivateKey());
+            $encryptedMessage = Cryptography::encryptShared($message, $aliceSharedSecret);
+
+            // Bob decrypts the message and verifies the signature
+            $decryptedMessage = Cryptography::decryptShared($encryptedMessage, $bobSharedSecret);
+            $isValid = Cryptography::verifyMessage($decryptedMessage, $aliceSignature, $aliceSigningKeyPair->getPublicKey());
+            $this->assertEquals($message, $decryptedMessage);
+            $this->assertTrue($isValid);
+
+            // Bob sends "Hello, Alice!" to Alice, signing the message and encrypting it with the shared secret
+            $message = "Hello, Alice!";
+            $bobSignature = Cryptography::signMessage($message, $bobSigningKeyPair->getPrivateKey());
+            $encryptedMessage = Cryptography::encryptShared($message, $bobSharedSecret);
+
+            // Alice decrypts the message and verifies the signature
+            $decryptedMessage = Cryptography::decryptShared($encryptedMessage, $aliceSharedSecret);
+            $isValid = Cryptography::verifyMessage($decryptedMessage, $bobSignature, $bobSigningKeyPair->getPublicKey());
+            $this->assertEquals($message, $decryptedMessage);
+            $this->assertTrue($isValid);
+        }
+
+        /**
+         * Test that performDHE throws an exception when an invalid public key is used.
+         */
+        public function testPerformDHEThrowsExceptionForInvalidPublicKey(): void
+        {
+            $encryptionKeyPair = Cryptography::generateEncryptionKeyPair();
+            $invalidPublicKey = 'invalid_key';
+
+            $this->expectException(CryptographyException::class);
+            $this->expectExceptionMessage('Invalid key type. Expected enc:');
+
+            Cryptography::performDHE($invalidPublicKey, $encryptionKeyPair->getPrivateKey());
+        }
+
+        /**
+         * Test that performDHE throws an exception when an invalid private key is used.
+         */
+        public function testPerformDHEThrowsExceptionForInvalidPrivateKey(): void
+        {
+            $encryptionKeyPair = Cryptography::generateEncryptionKeyPair();
+            $invalidPrivateKey = 'invalid_key';
+
+            $this->expectException(CryptographyException::class);
+            $this->expectExceptionMessage('Invalid key type. Expected enc:');
+
+            Cryptography::performDHE($encryptionKeyPair->getPublicKey(), $invalidPrivateKey);
+        }
+
+
+        /**
+         * Test that encrypt correctly encrypts a message with a valid shared secret.
+         */
+        public function testEncryptSuccessfullyEncryptsMessage(): void
+        {
+            $sharedSecret = Cryptography::performDHE(
+                Cryptography::generateEncryptionKeyPair()->getPublicKey(),
+                Cryptography::generateEncryptionKeyPair()->getPrivateKey()
+            );
+            $message = "Test message";
+
+            $encryptedMessage = Cryptography::encryptShared($message, $sharedSecret);
+
+            $this->assertNotEmpty($encryptedMessage);
+            $this->assertNotEquals($message, $encryptedMessage);
+        }
+
+        /**
+         * Test that encrypt throws an exception when given an invalid shared secret.
+         */
+        public function testEncryptThrowsExceptionForInvalidSharedSecret(): void
+        {
+            $invalidSharedSecret = "invalid_secret";
+            $message = "Test message";
+
+            $this->expectException(CryptographyException::class);
+            $this->expectExceptionMessage("Encryption failed");
+
+            Cryptography::encryptShared($message, $invalidSharedSecret);
+        }
+
+        /**
+         * Test that the encrypted message is different from the original message.
+         */
+        public function testEncryptProducesDifferentMessage(): void
+        {
+            $sharedSecret = Cryptography::performDHE(
+                Cryptography::generateEncryptionKeyPair()->getPublicKey(),
+                Cryptography::generateEncryptionKeyPair()->getPrivateKey()
+            );
+            $message = "Another test message";
+
+            $encryptedMessage = Cryptography::encryptShared($message, $sharedSecret);
+
+            $this->assertNotEquals($message, $encryptedMessage);
+        }
+
+        /**
+         * Test that decrypt successfully decrypts an encrypted message with a valid shared secret.
+         */
+        public function testDecryptSuccessfullyDecryptsMessage(): void
+        {
+            $sharedSecret = Cryptography::performDHE(
+                Cryptography::generateEncryptionKeyPair()->getPublicKey(),
+                Cryptography::generateEncryptionKeyPair()->getPrivateKey()
+            );
+            $message = "Decryption test message";
+
+            $encryptedMessage = Cryptography::encryptShared($message, $sharedSecret);
+            $decryptedMessage = Cryptography::decryptShared($encryptedMessage, $sharedSecret);
+
+            $this->assertEquals($message, $decryptedMessage);
+        }
+
+        /**
+         * Test that decrypt throws an exception when given an invalid shared secret.
+         */
+        public function testDecryptThrowsExceptionForInvalidSharedSecret(): void
+        {
+            $sharedSecret = Cryptography::performDHE(
+                Cryptography::generateEncryptionKeyPair()->getPublicKey(),
+                Cryptography::generateEncryptionKeyPair()->getPrivateKey()
+            );
+            $invalidSharedSecret = "invalid_shared_secret";
+            $message = "Decryption failure case";
+
+            $encryptedMessage = Cryptography::encryptShared($message, $sharedSecret);
+
+            $this->expectException(CryptographyException::class);
+            $this->expectExceptionMessage("Decryption failed");
+
+            Cryptography::decryptShared($encryptedMessage, $invalidSharedSecret);
+        }
+
+        /**
+         * Test that decrypt throws an exception when the encrypted data is tampered with.
+         */
+        public function testDecryptThrowsExceptionForTamperedEncryptedMessage(): void
+        {
+            $sharedSecret = Cryptography::performDHE(
+                Cryptography::generateEncryptionKeyPair()->getPublicKey(),
+                Cryptography::generateEncryptionKeyPair()->getPrivateKey()
+            );
+            $message = "Tampered message";
+
+            $encryptedMessage = Cryptography::encryptShared($message, $sharedSecret);
+            $tamperedMessage = $encryptedMessage . "tampered_data";
+
+            $this->expectException(CryptographyException::class);
+            $this->expectExceptionMessage("Decryption failed");
+
+            Cryptography::decryptShared($tamperedMessage, $sharedSecret);
+        }
+
+        /**
+         * Test that sign successfully signs a message with a valid private key.
+         */
+        public function testSignSuccessfullySignsMessage(): void
+        {
+            $keyPair = Cryptography::generateSigningKeyPair();
+            $message = "Message to sign";
+
+            $signature = Cryptography::signMessage($message, $keyPair->getPrivateKey());
+
+            $this->assertNotEmpty($signature);
+        }
+
+        /**
+         * Test that sign throws an exception when an invalid private key is used.
+         */
+        public function testSignThrowsExceptionForInvalidPrivateKey(): void
+        {
+            $invalidPrivateKey = "invalid_key";
+            $message = "Message to sign";
+
+            $this->expectException(CryptographyException::class);
+            $this->expectExceptionMessage("Failed to sign message");
+
+            Cryptography::signMessage($message, $invalidPrivateKey);
+        }
+
+        /**
+         * Test that verify successfully validates a correct signature with a valid message and public key.
+         */
+        public function testVerifySuccessfullyValidatesSignature(): void
+        {
+            $keyPair = Cryptography::generateSigningKeyPair();
+            $message = "Message to verify";
+            $signature = Cryptography::signMessage($message, $keyPair->getPrivateKey());
+
+            $isValid = Cryptography::verifyMessage($message, $signature, $keyPair->getPublicKey());
+
+            $this->assertTrue($isValid);
+        }
+
+        /**
+         * Test that verify fails for an invalid signature.
+         */
+        public function testVerifyFailsForInvalidSignature(): void
+        {
+            $keyPair = Cryptography::generateSigningKeyPair();
+            $message = "Message to verify";
+            $signature = "invalid_signature";
+
+            $this->expectException(Exception::class);
+
+            Cryptography::verifyMessage($message, $signature, $keyPair->getPublicKey());
+        }
+
+        /**
+         * Test that verify throws an exception for an invalid public key.
+         */
+        public function testVerifyThrowsExceptionForInvalidPublicKey(): void
+        {
+            $keyPair = Cryptography::generateSigningKeyPair();
+            $message = "Message to verify";
+            $signature = Cryptography::signMessage($message, $keyPair->getPrivateKey());
+            $invalidPublicKey = "invalid_public_key";
+
+            $this->expectException(CryptographyException::class);
+
+            Cryptography::verifyMessage($message, $signature, $invalidPublicKey);
+        }
+
+        /**
+         * Test that verify throws an exception for a public key with the wrong type prefix.
+         */
+        public function testVerifyThrowsExceptionForInvalidKeyType(): void
+        {
+            $encryptionKeyPair = Cryptography::generateEncryptionKeyPair();
+            $message = "Message to verify";
+            $signature = "invalid_signature";
+
+            $this->expectException(CryptographyException::class);
+            $this->expectExceptionMessage("Invalid key type. Expected sig:");
+
+            Cryptography::verifyMessage($message, $signature, $encryptionKeyPair->getPublicKey());
+        }
+
+        /**
+         * Test that generateTransportKey creates a valid transport key for the default algorithm.
+         */
+        public function testGenerateTransportKeyCreatesValidKeyForDefaultAlgo(): void
+        {
+            $transportKey = Cryptography::generateEncryptionKey('xchacha20');
+            $decodedKey = sodium_base642bin($transportKey, SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING, true);
+
+            $this->assertNotEmpty($transportKey);
+            $this->assertEquals(SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES, strlen($decodedKey));
+        }
+
+        /**
+         * Test that generateTransportKey creates valid keys for specific supported algorithms.
+         */
+        public function testGenerateTransportKeyCreatesValidKeysForAlgorithms(): void
+        {
+            $algorithms = [
+                'xchacha20' => SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES,
+                'chacha20' => SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES,
+                'aes256gcm' => SODIUM_CRYPTO_AEAD_AES256GCM_KEYBYTES
+            ];
+
+            foreach ($algorithms as $algorithm => $expectedKeyLength) {
+                $transportKey = Cryptography::generateEncryptionKey($algorithm);
+                $decodedKey = sodium_base642bin($transportKey, SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING, true);
+
+                $this->assertNotEmpty($transportKey);
+                $this->assertEquals($expectedKeyLength, strlen($decodedKey));
+            }
+        }
+
+        /**
+         * Test that generateTransportKey throws an exception when given an invalid algorithm.
+         */
+        public function testGenerateTransportKeyThrowsExceptionForInvalidAlgorithm(): void
+        {
+            $this->expectException(CryptographyException::class);
+
+            Cryptography::generateEncryptionKey("invalid_algorithm");
+        }
+
+        /**
+         * Test that generateTransportKey creates valid keys for other supported algorithms.
+         */
+        public function testGenerateTransportKeyCreatesValidKeyForOtherSupportedAlgorithms(): void
+        {
+            $algorithms = [
+                'xchacha20' => SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES,
+                'chacha20' => SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES,
+                'aes256gcm' => SODIUM_CRYPTO_AEAD_AES256GCM_KEYBYTES
+            ];
+
+            foreach ($algorithms as $algorithm => $expectedKeyLength) {
+                $transportKey = Cryptography::generateEncryptionKey($algorithm);
+                $decodedKey = sodium_base642bin($transportKey, SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING, true);
+
+                $this->assertNotEmpty($transportKey);
+                $this->assertEquals($expectedKeyLength, strlen($decodedKey));
+            }
+        }
+
+        /**
+         * Test that generateTransportKey throws an exception for unsupported algorithms.
+         */
+        public function testGenerateTransportKeyThrowsExceptionForUnsupportedAlgorithm(): void
+        {
+            $this->expectException(CryptographyException::class);
+
+            Cryptography::generateEncryptionKey('invalid_algo');
+        }
+
+        public function testEncryptTransportMessageSuccessfullyEncryptsMessage(): void
+        {
+            $algorithms = [
+                'xchacha20' => SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES,
+                'chacha20' => SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES,
+                'aes256gcm' => SODIUM_CRYPTO_AEAD_AES256GCM_KEYBYTES
+            ];
+
+            foreach ($algorithms as $algorithm => $keyLength) {
+                $transportKey = Cryptography::generateEncryptionKey($algorithm);
+                $this->assertNotEmpty($transportKey);
+                $this->assertEquals($keyLength, strlen(sodium_base642bin($transportKey, SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING, true)));
+                $message = "Test message";
+
+                $encryptedMessage = Cryptography::encryptMessage($message, $transportKey, $algorithm);
+                $decryptedMessage = Cryptography::decryptMessage($encryptedMessage, $transportKey, $algorithm);
+
+                $this->assertEquals($message, $decryptedMessage);
+            }
+        }
+    }
\ No newline at end of file
diff --git a/tests/Socialbox/Classes/OtpCryptographyTest.php b/tests/Socialbox/Classes/OtpCryptographyTest.php
new file mode 100644
index 0000000..dcbbce9
--- /dev/null
+++ b/tests/Socialbox/Classes/OtpCryptographyTest.php
@@ -0,0 +1,183 @@
+<?php
+
+    namespace Socialbox\Classes;
+
+    use PHPUnit\Framework\TestCase;
+    use Socialbox\Exceptions\CryptographyException;
+
+    class OtpCryptographyTest extends TestCase
+    {
+        /**
+         * Test that generateSecretKey generates a key of default length.
+         */
+        public function testGenerateSecretKeyDefaultLength()
+        {
+            $result = OtpCryptography::generateSecretKey();
+            $this->assertEquals(64, strlen($result), 'Default secret key length (32 bytes) should produce 64 hex characters.');
+        }
+
+        /**
+         * Test generateOTP with valid parameters to ensure a correct OTP.
+         */
+        public function testGenerateOTPValidParameters()
+        {
+            $secretKey = '12345678901234567890';
+            $timeStep = 30;
+            $digits = 6;
+            $counter = 1;
+            $otp = OtpCryptography::generateOTP($secretKey, $timeStep, $digits, $counter, 'sha1');
+            $this->assertEquals(6, strlen($otp), 'OTP should have the correct number of digits.');
+        }
+
+        /**
+         * Test generateOTP produces consistent results for the same inputs.
+         */
+        public function testGenerateOTPConsistency()
+        {
+            $secretKey = '12345678901234567890';
+            $timeStep = 30;
+            $digits = 6;
+            $counter = 1;
+            $otp1 = OtpCryptography::generateOTP($secretKey, $timeStep, $digits, $counter, 'sha1');
+            $otp2 = OtpCryptography::generateOTP($secretKey, $timeStep, $digits, $counter, 'sha1');
+            $this->assertEquals($otp1, $otp2, 'OTP should be consistent for the same secret key, counter, and configuration.');
+        }
+
+        /**
+         * Test generateOTP produces different OTPs for the same secret key but different counters.
+         */
+        public function testGenerateOTPDifferentCounters()
+        {
+            $secretKey = '12345678901234567890';
+            $timeStep = 30;
+            $digits = 6;
+            $otp1 = OtpCryptography::generateOTP($secretKey, $timeStep, $digits, 1, 'sha1');
+            $otp2 = OtpCryptography::generateOTP($secretKey, $timeStep, $digits, 2, 'sha1');
+            $this->assertNotEquals($otp1, $otp2, 'OTP should differ for the same secret key but different counters.');
+        }
+
+        /**
+         * Test generateOTP throws an exception if hash length is invalid.
+         */
+        public function testGenerateOTPInvalidHashLength()
+        {
+            $secretKey = 'shortkey';
+            $timeStep = 30;
+            $digits = 6;
+            $this->expectException(CryptographyException::class);
+            OtpCryptography::generateOTP($secretKey, $timeStep, $digits, 1, 'sha1');
+        }
+
+        /**
+         * Test generateOTP correctly handles different digit lengths.
+         */
+        public function testGenerateOTPDigitLength()
+        {
+            $secretKey = '12345678901234567890';
+            $timeStep = 30;
+            $otp6Digits = OtpCryptography::generateOTP($secretKey, $timeStep, 6, 1, 'sha1');
+            $otp8Digits = OtpCryptography::generateOTP($secretKey, $timeStep, 8, 1, 'sha1');
+            $this->assertEquals(6, strlen($otp6Digits), 'OTP with 6 digits should be generated.');
+            $this->assertEquals(8, strlen($otp8Digits), 'OTP with 8 digits should be generated.');
+        }
+
+        /**
+         * Test that generateSecretKey generates a key of custom length.
+         */
+        public function testGenerateSecretKeyCustomLength()
+        {
+            $customLength = 16; // 16 bytes
+            $result = OtpCryptography::generateSecretKey($customLength);
+            $this->assertEquals(32, strlen($result), "A secret key of $customLength bytes should produce 32 hex characters.");
+        }
+
+        /**
+         * Test that generateSecretKey with a length of 0 results in a valid empty key.
+         */
+        public function testGenerateSecretKeyZeroLength()
+        {
+            $this->expectException(CryptographyException::class);
+            OtpCryptography::generateSecretKey(0);
+        }
+
+        /**
+         * Test that generateSecretKey with negative length throws an exception.
+         */
+        public function testGenerateSecretKeyNegativeLength()
+        {
+            $this->expectException(CryptographyException::class);
+            OtpCryptography::generateSecretKey(-1);
+        }
+
+        /**
+         * Test that generateSecretKey produces unique keys for multiple calls.
+         */
+        public function testGenerateSecretKeyUniqueKeys()
+        {
+            $key1 = OtpCryptography::generateSecretKey();
+            $key2 = OtpCryptography::generateSecretKey();
+            $this->assertNotEquals($key1, $key2, 'Generated secret keys should be unique.');
+        }
+
+        /**
+         * Test verifyOTP with a valid OTP to ensure it returns true.
+         */
+        public function testVerifyOTPValid()
+        {
+            $secretKey = '12345678901234567890';
+            $timeStep = 30;
+            $digits = 6;
+            // Generate the OTP to test validity
+            $otp = OtpCryptography::generateOTP($secretKey, $timeStep, $digits, null, 'sha512');
+            $this->assertTrue(OtpCryptography::verifyOTP($secretKey, $otp, $timeStep, 1, $digits, 'sha512'), 'verifyOTP should return true for a valid OTP.');
+        }
+
+        /**
+         * Test verifyOTP with an invalid OTP to ensure it returns false.
+         */
+        public function testVerifyOTPInvalid()
+        {
+            $secretKey = '12345678901234567890';
+            $timeStep = 30;
+            $digits = 6;
+            $invalidOtp = '999999'; // Arbitrary invalid OTP
+            $this->assertFalse(OtpCryptography::verifyOTP($secretKey, $invalidOtp, $timeStep, 1, $digits, 'sha512'), 'verifyOTP should return false for an invalid OTP.');
+        }
+
+        /**
+         * Test verifyOTP with an expired OTP window to ensure it returns false.
+         */
+        public function testVerifyOTPEExpiredWindow()
+        {
+            $secretKey = '12345678901234567890';
+            $timeStep = 30;
+            $digits = 6;
+            $pastCounter = floor(time() / $timeStep) - 10; // Simulate OTP generated far in the past
+            $expiredOtp = OtpCryptography::generateOTP($secretKey, $timeStep, $digits, $pastCounter, 'sha512');
+            $this->assertFalse(OtpCryptography::verifyOTP($secretKey, $expiredOtp, $timeStep, 1, $digits, 'sha512'), 'verifyOTP should return false for an OTP outside the valid window.');
+        }
+
+        /**
+         * Test verifyOTP with an invalid secret key to ensure it throws an exception.
+         */
+        public function testVerifyOTPInvalidSecretKey()
+        {
+            $this->expectException(CryptographyException::class);
+            $invalidSecretKey = 'invalidkey';
+            $otp = '123456';
+            OtpCryptography::verifyOTP($invalidSecretKey, $otp, 30, 1, 6, 'sha512');
+        }
+
+        /**
+         * Test verifyOTP with an incorrect digit length to ensure it returns false.
+         */
+        public function testVerifyOTPInvalidDigitLength()
+        {
+            $secretKey = '12345678901234567890';
+            $timeStep = 30;
+            $digits = 8; // Generate an 8-digit OTP
+            $validOtp = OtpCryptography::generateOTP($secretKey, $timeStep, $digits, null, 'sha512');
+            // Verifying with a 6-digit configuration instead
+            $this->assertFalse(OtpCryptography::verifyOTP($secretKey, $validOtp, $timeStep, 1, 6, 'sha512'), 'verifyOTP should return false if the digit length does not match.');
+        }
+    }
\ No newline at end of file
diff --git a/tests/Socialbox/Classes/ServerResolverTest.php b/tests/Socialbox/Classes/ServerResolverTest.php
deleted file mode 100644
index ef7e8a1..0000000
--- a/tests/Socialbox/Classes/ServerResolverTest.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Socialbox\Classes;
-
-use PHPUnit\Framework\TestCase;
-use Socialbox\Exceptions\ResolutionException;
-use Socialbox\Objects\ResolvedServer;
-
-class ServerResolverTest extends TestCase
-{
-    /**
-     * Test for the function resolveDomain of the class ServerResolver
-     */
-    public function testResolveDomain(): void
-    {
-        // successful resolution
-        $resolvedServer = ServerResolver::resolveDomain('n64.cc');
-        self::assertNotEmpty($resolvedServer->getEndpoint());
-        self::assertNotEmpty($resolvedServer->getPublicKey());
-    }
-}
\ No newline at end of file
diff --git a/tests/Socialbox/Classes/private.der b/tests/Socialbox/Classes/private.der
deleted file mode 100644
index 62d8d46..0000000
--- a/tests/Socialbox/Classes/private.der
+++ /dev/null
@@ -1 +0,0 @@
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDxcYLVvKYHpxJQe49Z7boilJfmp/uYAr4rQNN2El9nPG3hVRYIsmhzIeByU7ZJLn0EG5D2G6T4SlydfbHbHK3NMciTgmyAZRJl10z/KIlPG1n6DaK5Oo6VT9ty+uI7JKFdQQwzSrPP2u4KNERqK4vtfsxdiAcMXS/hUncID4ARvmigmcTOTcosdH57axSqf1xfJJ12zl3QPb6wppsBAJrZ811Ll8eZYhFoQwe0oE3T5Q0aqK0Ecgh4cYhF63nEAKkcPOMxkhcZWpr3YzqD7Rj9VAzk7xRM/QJ1SjsVwdB+YCQK1tbTloTY3BqtEib9ErZvjlaB26GZbV32kNsPnwHXAgMBAAECggEAJBVtUskzXRBsjcexmGSNfW6MtyWi1ciPKEKzd8FuLa0b1OHU/a7AKnjFJQD6zLwcZflCtG1UPeFLLyRiaNdD6FdI3TbQRW4Vjk/bi4TA5Kg3TcYs7BbiyVDagLgbCHDEhv3aN24yKl3TVoYSNXXVn0RkgZP7Ta89oSSkcnlyj/QFOA8RfIm5q+qiAPvOqFf8NKlm0hZDrxWHG/OduYHq25S9ohNzymyM+1CYTrVFZCTfscDvLBDd2MVpNRyxoQquiMlfIEUBGlu9uFWy9Hovv8Sd3irgvcBtjL8iPaMzJe3p6T83KL2AgXHcYT7r9Vlvqib5x1iTYvlid25zzQ19IQKBgQD1BISfPugEp+fAdoGHOygG+gzNE8/1ldhnA9bTCZZ3FQBTI2lPRZBFDKuirc6glbCHiWrd8HoJ3BO3kbGzq4EDBf0VDFby/7nkrroTW+RIn+THlfciWgjSATGgCPOHmvM6JmIpuYsbKkdmV4ITVWwvLPxDAwlMnHyJOuYTj8xJ4QKBgQD8Q/rdWoRBSVCrDb0QO/Or5FAJELmYFtFWBBCEpadr9ci0e/mSbbZlXjP98m4XesIIRpcpG3gU8P3hKB7H60ynPN6Jyw33YhIlJHaEjYISN/h5Vw0ybQkyFR9CBRjOp59CBcb8AsdA/OQjxFz8h46PbPLCWCR5kM3tKbuNobBytwKBgQC4Rr+gLWW/KrEolXhxxtIh/SpniwEbSanKQJ7vdgSOZ2MpJDbuAfmxlQf5gBMpv6tXJMkVRuniRH0n0RH/eXu8VGK10+QJOsAK+EbGjJQy8t7UJTwLv/9mQrOaE2FlmepYz8mAbCXtNm0g0avo8pQ9Hu5TUBNMZV1csMmd6MbSwQKBgQDit+X6kqNSWaXaVdqZgIga8HLN8u4aNkelWrnNvWOer6LWMqW2aEwJBoULsponF/jSnz6zfzCJAZ3qgbhITLzzgM0wYgIHV2ifYQnzT4qa/RqfUxFVRJGDJWCWYSZOdG+5Up/nVkflrGMNkilP/DSvymbTK4x8hRvODje1rp96OQKBgFmXLpHPN8WAXP7VVyb3RqYYRgtxXjY2yj/CYwnXl0k4Uji08S9Ke2AqljiSzmZs1Wh1UBLap90F0smRVHmYgwl2rPjNiXbyKd4W9R4vEVYgEmcnvzba107o76qFmEbyW/K7a7K/jKaH8KAytgR/cHd+SIBctcDv8uKmZ1MJT9p8
\ No newline at end of file
diff --git a/tests/Socialbox/Classes/public.der b/tests/Socialbox/Classes/public.der
deleted file mode 100644
index 4bc983c..0000000
--- a/tests/Socialbox/Classes/public.der
+++ /dev/null
@@ -1 +0,0 @@
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8XGC1bymB6cSUHuPWe26IpSX5qf7mAK+K0DTdhJfZzxt4VUWCLJocyHgclO2SS59BBuQ9huk+EpcnX2x2xytzTHIk4JsgGUSZddM/yiJTxtZ+g2iuTqOlU/bcvriOyShXUEMM0qzz9ruCjREaiuL7X7MXYgHDF0v4VJ3CA+AEb5ooJnEzk3KLHR+e2sUqn9cXySdds5d0D2+sKabAQCa2fNdS5fHmWIRaEMHtKBN0+UNGqitBHIIeHGIRet5xACpHDzjMZIXGVqa92M6g+0Y/VQM5O8UTP0CdUo7FcHQfmAkCtbW05aE2NwarRIm/RK2b45WgduhmW1d9pDbD58B1wIDAQAB
\ No newline at end of file
diff --git a/tests/Socialbox/Classes/secret.txt b/tests/Socialbox/Classes/secret.txt
deleted file mode 100644
index 01baad6..0000000
--- a/tests/Socialbox/Classes/secret.txt
+++ /dev/null
@@ -1 +0,0 @@
-HHxV3e+igdTJIaBOT4340WBcJjBgjUPoP2SifAq0xuS1EjnTCWXeg6jr1pUX9HkUlMwTrZNFwye6gUIowGqsc1QrC4PReoZfBmTGR3dWXWvW01KHXbTodlnRjUFcHBUzNPpMDsE6d2J5+Mb+HGAsxXR9i4eN2jRGfO5YZ1It40vS4PCdbCtdQJ21bwnNnvHWq9+tMJRTnJ1M+niFjil9MKgS0fCLpwpG+fumnh0iRlS7wyN+y12IDSalvGEAJaX7iSN/tcWfLaQMXjIbYEsi9RMEXUibZWYQV7pkllqM5wqZpmNv52GeUPEbowtdnczA1IpsSyaj5MV4Q8DNqCoaXg==
\ No newline at end of file
diff --git a/tests/Socialbox/Enums/Flags/SessionFlagsTest.php b/tests/Socialbox/Enums/Flags/SessionFlagsTest.php
new file mode 100644
index 0000000..46f4974
--- /dev/null
+++ b/tests/Socialbox/Enums/Flags/SessionFlagsTest.php
@@ -0,0 +1,180 @@
+<?php
+
+    namespace Socialbox\Enums\Flags;
+
+    use PHPUnit\Framework\TestCase;
+
+    class SessionFlagsTest extends TestCase
+    {
+
+        /**
+         * Test that fromString correctly converts a valid comma-separated string to an array of SessionFlags.
+         */
+        public function testFromStringWithValidString()
+        {
+            $flagString = 'SET_PASSWORD,SET_EMAIL,VER_SMS';
+            $expectedFlags = [
+                SessionFlags::SET_PASSWORD,
+                SessionFlags::SET_EMAIL,
+                SessionFlags::VER_SMS,
+            ];
+
+            $result = SessionFlags::fromString($flagString);
+
+            $this->assertEquals($expectedFlags, $result);
+        }
+
+        /**
+         * Test that fromString handles an empty string correctly by returning an empty array.
+         */
+        public function testFromStringWithEmptyString()
+        {
+            $flagString = '';
+            $result = SessionFlags::fromString($flagString);
+
+            $this->assertEquals([], $result);
+        }
+
+        /**
+         * Test that fromString correctly trims whitespace from flag values.
+         */
+        public function testFromStringWithWhitespace()
+        {
+            $flagString = ' SET_PASSWORD , SET_EMAIL , VER_SMS ';
+            $expectedFlags = [
+                SessionFlags::SET_PASSWORD,
+                SessionFlags::SET_EMAIL,
+                SessionFlags::VER_SMS,
+            ];
+
+            $result = SessionFlags::fromString($flagString);
+
+            $this->assertEquals($expectedFlags, $result);
+        }
+
+        /**
+         * Test that fromString throws an error for invalid values.
+         */
+        public function testFromStringWithInvalidValues()
+        {
+            $this->expectException(\ValueError::class);
+
+            $flagString = 'INVALID_FLAG';
+            SessionFlags::fromString($flagString);
+        }
+
+        /**
+         * Test that fromString works for a single valid flag.
+         */
+        public function testFromStringWithSingleValue()
+        {
+            $flagString = 'SET_PASSWORD';
+            $expectedFlags = [SessionFlags::SET_PASSWORD];
+
+            $result = SessionFlags::fromString($flagString);
+
+            $this->assertEquals($expectedFlags, $result);
+        }
+
+        /**
+         * Test that fromString correctly handles duplicate flag values in the input string.
+         */
+        public function testFromStringWithDuplicateValues()
+        {
+            $flagString = 'SET_EMAIL,SET_EMAIL,VER_SMS';
+            $expectedFlags = [
+                SessionFlags::SET_EMAIL,
+                SessionFlags::SET_EMAIL,
+                SessionFlags::VER_SMS,
+            ];
+
+            $result = SessionFlags::fromString($flagString);
+
+            $this->assertEquals($expectedFlags, $result);
+        }
+
+        /**
+         * Test that isComplete returns true for an empty array of flags.
+         */
+        public function testIsCompleteWithEmptyFlags()
+        {
+            $flags = [];
+
+            $result = SessionFlags::isComplete($flags);
+
+            $this->assertTrue($result);
+        }
+
+        /**
+         * Test that isComplete returns false when registration flags are incomplete.
+         */
+        public function testIsCompleteWithIncompleteRegistrationFlags()
+        {
+            $flags = [
+                SessionFlags::REGISTRATION_REQUIRED,
+                SessionFlags::SET_PASSWORD,
+            ];
+
+            $result = SessionFlags::isComplete($flags);
+
+            $this->assertFalse($result);
+        }
+
+        /**
+         * Test that isComplete returns false when authentication flags are incomplete.
+         */
+        public function testIsCompleteWithIncompleteAuthenticationFlags()
+        {
+            $flags = [
+                SessionFlags::AUTHENTICATION_REQUIRED,
+                SessionFlags::VER_PASSWORD,
+            ];
+
+            $result = SessionFlags::isComplete($flags);
+
+            $this->assertFalse($result);
+        }
+
+        /**
+         * Test that isComplete returns true when registration flags are complete.
+         */
+        public function testIsCompleteWithCompleteRegistrationFlags()
+        {
+            $flags = [
+                SessionFlags::REGISTRATION_REQUIRED,
+            ];
+
+            $result = SessionFlags::isComplete($flags);
+
+            $this->assertTrue($result);
+        }
+
+        /**
+         * Test that isComplete returns true when authentication flags are complete.
+         */
+        public function testIsCompleteWithCompleteAuthenticationFlags()
+        {
+            $flags = [
+                SessionFlags::AUTHENTICATION_REQUIRED,
+            ];
+
+            $result = SessionFlags::isComplete($flags);
+
+            $this->assertTrue($result);
+        }
+
+        /**
+         * Test that isComplete ignores non-relevant flags while processing.
+         */
+        public function testIsCompleteIgnoringNonRelevantFlags()
+        {
+            $flags = [
+                SessionFlags::RATE_LIMITED,
+                SessionFlags::AUTHENTICATION_REQUIRED,
+            ];
+
+            $result = SessionFlags::isComplete($flags);
+
+            $this->assertTrue($result);
+        }
+    }
diff --git a/tests/Socialbox/Managers/SessionManagerTest.php b/tests/Socialbox/Managers/SessionManagerTest.php
deleted file mode 100644
index 1da708c..0000000
--- a/tests/Socialbox/Managers/SessionManagerTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Socialbox\Managers;
-
-use InvalidArgumentException;
-use PHPUnit\Framework\TestCase;
-use Socialbox\Classes\Cryptography;
-use Socialbox\Classes\Utilities;
-use Socialbox\Objects\SessionRecord;
-
-class SessionManagerTest extends TestCase
-{
-    public function testCreateSessionWithEmptyPublicKey(): void
-    {
-        $publicKey = '';
-
-        $this->expectException(InvalidArgumentException::class);
-        SessionManager::createSession($publicKey);
-    }
-
-    public function testCreateSession(): void
-    {
-        $keyPair = Cryptography::generateKeyPair();
-        $uuid = SessionManager::createSession($keyPair->getPublicKey());
-
-        $this->assertTrue(SessionManager::sessionExists($uuid));
-    }
-
-    public function testGetSessionWithValidUuid(): void
-    {
-        $keyPair = Cryptography::generateKeyPair();
-        $uuid = SessionManager::createSession($keyPair->getPublicKey());
-
-        $session = SessionManager::getSession($uuid);
-
-        $this->assertInstanceOf(SessionRecord::class, $session);
-        $this->assertEquals($uuid, $session->getUuid());
-        $this->assertEquals($keyPair->getPublicKey(), Utilities::base64encode($session->getPublicKey()));
-    }
-}
diff --git a/tests/Socialbox/Managers/VariableManagerTest.php b/tests/Socialbox/Managers/VariableManagerTest.php
deleted file mode 100644
index d1060f3..0000000
--- a/tests/Socialbox/Managers/VariableManagerTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Socialbox\Managers;
-
-use PDOException;
-use PHPUnit\Framework\TestCase;
-use Socialbox\Abstracts\CacheLayer;
-use Socialbox\Exceptions\DatabaseOperationException;
-use Socialbox\Managers\VariableManager;
-
-class VariableManagerTest extends TestCase
-{
-    /**
-     * Test the setter method for a variable in the VariableManager class.
-     *
-     */
-    public function testSetVariable(): void
-    {
-        CacheLayer::getInstance()->clear();
-
-        VariableManager::deleteVariable('test_name');
-        VariableManager::setVariable('test_name', 'test_value');
-        $this->assertTrue(VariableManager::variableExists('test_name'));
-        $this->assertEquals('test_value', VariableManager::getVariable('test_name'));
-        VariableManager::deleteVariable('test_name');
-
-        VariableManager::deleteVariable('test_name2');
-        VariableManager::setVariable('test_name2', 'test_value2');
-        $this->assertTrue(VariableManager::variableExists('test_name2'));
-        $this->assertEquals('test_value2', VariableManager::getVariable('test_name2'));
-        VariableManager::deleteVariable('test_name2');
-    }
-
-}
\ No newline at end of file
diff --git a/tests/Socialbox/SocialClientTest.php b/tests/Socialbox/SocialClientTest.php
new file mode 100644
index 0000000..992ec53
--- /dev/null
+++ b/tests/Socialbox/SocialClientTest.php
@@ -0,0 +1,82 @@
+<?php
+
+    namespace Socialbox;
+
+    use PHPUnit\Framework\TestCase;
+    use Socialbox\Classes\ServerResolver;
+    use Socialbox\Enums\Flags\SessionFlags;
+    use Socialbox\Enums\Types\InformationFieldName;
+
+    class SocialClientTest extends TestCase
+    {
+        private const string COFFEE_DOMAIN = 'coffee.com';
+        private const string TEAPOT_DOMAIN = 'teapot.com';
+
+
+        protected function setUp(): void
+        {
+            putenv('LOG_LEVEL=debug');
+
+            // Add mocked records for the test domains
+            ServerResolver::addMock('coffee.com', 'v=socialbox;sb-rpc=http://127.0.0.0:8086/;sb-key=sig:g59Cf8j1wmQmRg1MkveYbpdiZ-1-_hFU9eRRJmQAwmc;sb-exp=0');
+            ServerResolver::addMock('teapot.com', 'v=socialbox;sb-rpc=http://127.0.0.0:8087/;sb-key=sig:MDXUuripAo_IAv-EZTEoFhpIdhsXxfMLNunSnQzxYiY;sb-exp=0');
+        }
+
+        /**
+         * Generates a random username based on the given domain.
+         *
+         * @param string $domain The domain to be appended to the generated username.
+         * @return string Returns a randomly generated username in the format 'user<randomString>@<domain>'.
+         */
+        private static function generateUsername(string $domain): string
+        {
+            $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+            $charactersLength = strlen($characters);
+            $randomString = '';
+
+            for ($i = 0; $i < 16; $i++)
+            {
+                $randomString .= $characters[rand(0, $charactersLength - 1)];
+            }
+
+            return 'user' . $randomString . '@' . $domain;
+        }
+
+        private static function registerUser(string $domain, string $displayName): SocialClient
+        {
+            $client = new SocialClient(self::generateUsername($domain));
+            $client->settingsSetPassword("password");
+            $client->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, $displayName);
+            return $client;
+        }
+
+        public function testRegistration(): void
+        {
+            $coffeeClient = new SocialClient(self::generateUsername(self::COFFEE_DOMAIN));
+
+            // Check initial session state
+            $this->assertFalse($coffeeClient->getSessionState()->isAuthenticated());
+            $this->assertTrue($coffeeClient->getSessionState()->containsFlag(SessionFlags::REGISTRATION_REQUIRED));
+            $this->assertTrue($coffeeClient->getSessionState()->containsFlag(SessionFlags::SET_PASSWORD));
+            $this->assertTrue($coffeeClient->getSessionState()->containsFlag(SessionFlags::SET_DISPLAY_NAME));
+
+            // Check progressive session state
+            $this->assertTrue($coffeeClient->settingsSetPassword('coffeePassword'));
+            $this->assertFalse($coffeeClient->getSessionState()->containsFlag(SessionFlags::SET_PASSWORD));
+            $this->assertTrue($coffeeClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, 'Coffee User'));
+            $this->assertFalse($coffeeClient->getSessionState()->containsFlag(SessionFlags::SET_DISPLAY_NAME));
+
+            $this->assertFalse($coffeeClient->getSessionState()->containsFlag(SessionFlags::REGISTRATION_REQUIRED));
+            $this->assertTrue($coffeeClient->getSessionState()->isAuthenticated());
+        }
+
+        public function testResolveDecentralizedPeer(): void
+        {
+            $coffeeUser = self::registerUser(self::COFFEE_DOMAIN, "Coffee Lover");
+            $this->assertTrue($coffeeUser->getSessionState()->isAuthenticated());
+            $teapotUser = self::registerUser(self::TEAPOT_DOMAIN, "Tea & Biscuits");
+            $this->assertTrue($teapotUser->getSessionState()->isAuthenticated());
+
+            $coffeePeer = $coffeeUser->resolvePeer($teapotUser->getIdentifiedAs());
+        }
+    }
diff --git a/tests/test.php b/tests/test.php
new file mode 100644
index 0000000..f3734d2
--- /dev/null
+++ b/tests/test.php
@@ -0,0 +1,25 @@
+<?php
+
+    require 'ncc';
+    import('net.nosial.socialbox');
+
+    \Socialbox\Classes\ServerResolver::addMock('coffee.com', 'v=socialbox;sb-rpc=http://127.0.0.0:8086/;sb-key=sig:g59Cf8j1wmQmRg1MkveYbpdiZ-1-_hFU9eRRJmQAwmc;sb-exp=0');
+    \Socialbox\Classes\ServerResolver::addMock('teapot.com', 'v=socialbox;sb-rpc=http://127.0.0.0:8087/;sb-key=sig:MDXUuripAo_IAv-EZTEoFhpIdhsXxfMLNunSnQzxYiY;sb-exp=0');
+
+    $client = new \Socialbox\SocialClient(generateRandomPeer());
+    var_dump($client->getSessionState());
+
+
+    function generateRandomPeer()
+    {
+        $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        $charactersLength = strlen($characters);
+        $randomString = '';
+
+        for ($i = 0; $i < 16; $i++)
+        {
+            $randomString .= $characters[rand(0, $charactersLength - 1)];
+        }
+
+        return 'userTest' . $randomString . '@coffee.com';
+    }
\ No newline at end of file